diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-15 10:39:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-15 10:39:59 +0000 |
| commit | a233ed27754bb0d373d63569d9a28aeb8fee5b82 (patch) | |
| tree | 2732a9434bbc102653dc22df9887d94e19570836 /xorg-server/hw/dmx/input/dmxinputinit.c | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-a233ed27754bb0d373d63569d9a28aeb8fee5b82.tar.gz vcxsrv-a233ed27754bb0d373d63569d9a28aeb8fee5b82.tar.bz2 vcxsrv-a233ed27754bb0d373d63569d9a28aeb8fee5b82.zip | |
Checked in xorg-server-1.6.99.901
Diffstat (limited to 'xorg-server/hw/dmx/input/dmxinputinit.c')
| -rw-r--r-- | xorg-server/hw/dmx/input/dmxinputinit.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c index 666db2138..d8402e87f 100644 --- a/xorg-server/hw/dmx/input/dmxinputinit.c +++ b/xorg-server/hw/dmx/input/dmxinputinit.c @@ -51,7 +51,6 @@ #include "dmxcommon.h" #include "dmxevents.h" #include "dmxmotion.h" -#include "dmxeq.h" #include "dmxprop.h" #include "config/dmxconfig.h" #include "dmxcursor.h" @@ -72,6 +71,7 @@ #include "mipointer.h" #include "windowstr.h" #include "mi.h" +#include "xkbsrv.h" #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> @@ -361,7 +361,6 @@ void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice, static void dmxKeyboardFreeNames(XkbComponentNamesPtr names) { - if (names->keymap) XFree(names->keymap); if (names->keycodes) XFree(names->keycodes); if (names->types) XFree(names->types); if (names->compat) XFree(names->compat); @@ -418,9 +417,7 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) dmxConfigGetXkbOptions() ? dmxConfigGetXkbOptions() : ""); } - XkbInitKeyboardDeviceStruct(pDevice, - &info->names, - &info->keySyms, + InitKeyboardDeviceStruct(pDevice, &rmlvo, dmxKeyboardBellProc, dmxKeyboardKbdCtrlProc); @@ -453,9 +450,16 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) break; } if (info.keyClass) { - DevicePtr pDev = (DevicePtr) pDevice; - InitKeyboardDeviceStruct(pDev, - &info.keySyms, + XkbRMLVOSet rmlvo; + + rmlvo.rules = dmxConfigGetXkbRules(); + rmlvo.model = dmxConfigGetXkbModel(); + rmlvo.layout = dmxConfigGetXkbLayout(); + rmlvo.variant = dmxConfigGetXkbVariant(); + rmlvo.options = dmxConfigGetXkbOptions(); + + InitKeyboardDeviceStruct(pDevice, + &rmlvo, dmxBell, dmxKbdCtrl); } if (info.buttonClass) { @@ -540,7 +544,7 @@ static void dmxProcessInputEvents(DMXInputInfo *dmxInput) { int i; - dmxeqProcessInputEvents(); + mieqProcessInputEvents(); #if 00 /*BP*/ miPointerUpdate(); #endif @@ -600,8 +604,7 @@ static void dmxCollectAll(DMXInputInfo *dmxInput) return; for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding) if (dmxInput->devs[i]->collect_events) - dmxInput->devs[i]->collect_events(&dmxInput->devs[i] - ->pDevice->public, + dmxInput->devs[i]->collect_events(&dmxInput->devs[i]->pDevice->public, dmxMotion, dmxEnqueue, dmxCheckSpecialKeys, DMX_BLOCK); @@ -1066,12 +1069,6 @@ void dmxInputInit(DMXInputInfo *dmxInput) } } - if (pPointer && pKeyboard) { - if (dmxeqInit(&pKeyboard->public, &pPointer->public)) - dmxLogInput(dmxInput, "Using %s and %s as true core devices\n", - pKeyboard->name, pPointer->name); - } - dmxInput->processInputEvents = dmxProcessInputEvents; dmxInput->detached = False; |