summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hlusiak <saschahlusiak@arcor.de>2008-09-30 19:02:17 +0200
committerSascha Hlusiak <saschahlusiak@arcor.de>2008-10-01 21:59:16 +0200
commit4e16c39c0eb06eb96ee699a905fe1a1d490e2c69 (patch)
tree13ef9acdcfafe9b0883be5bc75a67bd7a98d0533
parent5a3ecea272a980df0ac4c40826cf095399e7b022 (diff)
Remove XKB calls since we don't make use of it anyway.
No error messages because of missing xkb rules, yay.
-rw-r--r--src/jstk_key.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/jstk_key.c b/src/jstk_key.c
index c154fbc..ba57dc1 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -30,8 +30,6 @@
#include <xf86.h>
#include <xf86Xinput.h>
-#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
#include <X11/extensions/XKBsrv.h>
#include <X11/keysym.h>
#include <X11/XF86keysym.h>
@@ -61,7 +59,6 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
CARD8 modMap[MAP_LENGTH];
KeySym sym;
int i, j;
- static XkbComponentNamesRec xkbnames;
XkbSrvInfoPtr xkbi;
XkbControlsPtr ctrls;
@@ -102,8 +99,7 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
}
}
- XkbSetRulesDflts(__XKBDEFRULES__, "evdev", "us", "nodeadkeys", NULL);
- XkbInitKeyboardDeviceStruct (pJstk, &xkbnames, &keySyms, modMap,
+ InitKeyboardDeviceStruct ((DevicePtr)pJstk, &keySyms, modMap,
NULL, jstkKbdCtrl);
/* Set Autorepeat and Delay */