diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
| commit | 100633b3e7619842f345cb7603b0db6b5761dd11 (patch) | |
| tree | 3c3af754c7e801c07263269837d6a05072ff834c /xorg-server/hw/dmx | |
| parent | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (diff) | |
| parent | 96d6df5da9cddedf4931bf8e17f96e242467c661 (diff) | |
| download | vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.gz vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.bz2 vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx')
| -rw-r--r-- | xorg-server/hw/dmx/input/dmxevents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c index efcd07da3..c8dd92e47 100644 --- a/xorg-server/hw/dmx/input/dmxevents.c +++ b/xorg-server/hw/dmx/input/dmxevents.c @@ -453,8 +453,8 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, if (block)
dmxSigioBlock();
GetEventList(&events);
- nevents = GetKeyboardValuatorEvents(events, pDevice, event,
- ke->keycode, &mask);
+ nevents = GetKeyboardEvents(events, pDevice, event,
+ ke->keycode, &mask);
for (i = 0; i < nevents; i++)
mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);
@@ -685,7 +685,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, GetEventList(&events);
/*ErrorF("KEY %d sym %d\n", detail, (int) keySym);*/
- nevents = GetKeyboardEvents(events, p, type, detail);
+ nevents = GetKeyboardEvents(events, p, type, detail, NULL);
for (i = 0; i < nevents; i++)
mieqEnqueue(p, (InternalEvent*)(events + i)->event);
return;
|