frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput

This commit is contained in:
Carlos Romero 2004-07-07 19:21:07 +00:00
parent a5c9b3229c
commit f96ef08d48
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/kdrive/src/kinput.c
View File

@ -38,6 +38,11 @@
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#ifdef XKB
#define XKB_IN_SERVER
#include <X11/extensions/XKBsrv.h>
#endif
static DeviceIntPtr pKdKeyboard, pKdPointer; static DeviceIntPtr pKdKeyboard, pKdPointer;
static KdMouseFuncs *kdMouseFuncs; static KdMouseFuncs *kdMouseFuncs;
@ -431,6 +436,9 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
{ {
Bool ret; Bool ret;
DevicePtr pDev = (DevicePtr)pDevice; DevicePtr pDev = (DevicePtr)pDevice;
#ifdef XKB
XkbComponentNamesRec names;
#endif
if (!pDev) if (!pDev)
return BadImplementation; return BadImplementation;
@ -442,10 +450,24 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
{ {
return !Success; return !Success;
} }
#ifndef XKB
ret = InitKeyboardDeviceStruct(pDev, ret = InitKeyboardDeviceStruct(pDev,
&kdKeySyms, &kdKeySyms,
kdModMap, kdModMap,
KdBell, KdKbdCtrl); KdBell, KdKbdCtrl);
#else
memset(&names, 0, sizeof(XkbComponentNamesRec));
if (XkbInitialMap)
names.keymap = XkbInitialMap;
XkbSetRulesDflts ("base", "pc101", "us", NULL, NULL);
ret = XkbInitKeyboardDeviceStruct (pDev,
&names,
&kdKeySyms,
kdModMap,
KdBell, KdKbdCtrl);
#endif
if (!ret) if (!ret)
return BadImplementation; return BadImplementation;
break; break;
@ -597,7 +619,7 @@ KdInitInput(KdMouseFuncs *pMouseFuncs,
static long zero1, zero2; static long zero1, zero2;
//SetExtInputCheck (&zero1, &zero2); //SetExtInputCheck (&zero1, &zero2);
ErrorF("Extended Input Devices not yet supported. Impelement it at line %d in %s", ErrorF("Extended Input Devices not yet supported. Impelement it at line %d in %s\n",
__LINE__, __FILE__); __LINE__, __FILE__);
} }
#endif #endif