diff options
| author | Sascha Hlusiak <saschahlusiak@arcor.de> | 2008-09-06 12:38:16 +0200 |
|---|---|---|
| committer | Sascha Hlusiak <saschahlusiak@arcor.de> | 2008-09-06 12:38:16 +0200 |
| commit | 17c4f79d50ab69f954fec5a8daa327c4a1a64597 (patch) | |
| tree | 20f226f2eb752173c0fc50c01829644210d6150f | |
| parent | 5e91f0bdd4fa529d1d5f0f8ffc87aaf9fbec2a88 (diff) | |
Adding empty ctrlProc to prevent crashing of X when running without XKB
X calls ctrlProc without checks for NULL in some places, especially when running "X -kb". Adding
that function back to be safe.
| -rw-r--r-- | src/jstk_key.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/jstk_key.c b/src/jstk_key.c index a9a6e0d..24b074f 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -44,6 +44,16 @@ #define KanaMask Mod4Mask #define ScrollLockMask Mod5Mask + + + +static void +jstkKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl) +{ +} + + + int jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) { @@ -101,7 +111,7 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) XkbSetRulesDflts(__XKBDEFRULES__, "evdev", "us", "nodeadkeys", NULL); XkbInitKeyboardDeviceStruct (pJstk, &xkbnames, &keySyms, modMap, - NULL, NULL); + NULL, jstkKbdCtrl); /* Set Autorepeat and Delay */ |