XLibre/xf86-input-void
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-void.git synced 2026-04-14 10:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Janitor: update for ABI_XINPUT_VERSION >= 5

Browse Source 
This driver should be seen as the simplest possible input
driver, and somewhat as a skeleton/model for newer ones.
  Having it at least compiling with current xorg sdk is a plus.

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Paulo Cesar Pereira de Andrade
2009-02-05 17:30:18 -02:00
committed by Peter Hutterer
parent 48295279ac
commit 2154cf5b31
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/void.c
View File

@@ -57,6 +57,7 @@
/******************************************************************************
* Function/Macro keys variables
*****************************************************************************/
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
static KeySym void_map[] =
{
NoSymbol, NoSymbol, NoSymbol, NoSymbol,
@@ -130,6 +131,7 @@ static KeySymsRec void_keysyms = {
/* map minKeyCode maxKeyCode width */
void_map, 8, 255, 1
};
#endif /* GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 */
static const char *DEFAULTS[] = {
NULL
@@ -172,6 +174,10 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
InputInfoPtr pInfo;
unsigned char map[MAXBUTTONS + 1];
int i;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
XkbRMLVOSet rmlvo;
#endif
Bool result;
pInfo = device->public.devicePrivate;
@@ -202,7 +208,16 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
return !Success;
}
*/
if (InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, NULL, BellProc, KeyControlProc) == FALSE) {
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
result = InitKeyboardDeviceStruct(device, &rmlvo,
BellProc, KeyControlProc);
#else
result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms,
NULL, BellProc, KeyControlProc);
#endif
if (!result) {
ErrorF("unable to init keyboard device\n");
return !Success;
}