XLibre/xf86-input-joystick
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-joystick.git synced 2026-03-24 01:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use InitKeyboardDeviceStruct instead of nonexistant XkbInitKeyboardDeviceStruct

Browse Source 
Realizing XkbInitKeyboardDeviceStruct has been removed, we do need to use InitKeyboardDeviceStruct.
This breaks custom keymaps on ABI_XINPUT_VERSION >= 5.

Hopefully this can be reimplemented later.
This commit is contained in:
Sascha Hlusiak
2009-02-02 00:10:42 +01:00
parent 3984947ada
commit 4671904035
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/jstk_key.c
View File

@@ -109,11 +109,26 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
}
}
XkbInitKeyboardDeviceStruct (pJstk, &xkbnames, &keySyms, modMap,
NULL, jstkKbdCtrl);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
{
XkbRMLVOSet rmlvo;
XkbGetRulesDflts(&rmlvo);
/* FIXME */
#warning KEYMAP FOR ABI_XINPUT_VERSION >= 5 BROKEN RIGHT NOW
if (!InitKeyboardDeviceStruct(pJstk, &rmlvo, NULL, jstkKbdCtrl))
{
ErrorF("unable to init keyboard device\n");
return !Success;
}
}
#else
if (InitKeyboardDeviceStruct((DevicePtr)pJstk, &keySyms, modMap, NULL, jstkKbdCtrl) == FALSE) {
ErrorF("unable to init keyboard device\n");
return !Success;
}
#endif
/* Set Autorepeat and Delay */
if ((priv->repeat_delay || priv->repeat_interval) &&
pJstk->key &&
pJstk->key->xkbInfo)