summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-13 15:37:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-13 15:39:17 +1000
commit94bfb0cc3ebbefe548b440f8c5e14154c3a76440 (patch)
tree9511cd4af715650791e6e65ab8806231561125fd /src
parente600e6cf47abd61bd3554967c4fdb0f78cc68f41 (diff)
Cater for new event-specific raw event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/XExtInt.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 87bbaf4..9eec866 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -893,7 +893,11 @@ XInputWireToCookie(
}
return ENQUEUE_EVENT;
- case XI_RawEvent:
+ case XI_RawKeyPress:
+ case XI_RawKeyRelease:
+ case XI_RawButtonPress:
+ case XI_RawButtonRelease:
+ case XI_RawMotion:
*cookie = *(XGenericEventCookie*)save;
if (!wireToRawEvent((xXIRawEvent*)event, cookie))
{
@@ -1252,7 +1256,11 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out
case XI_PropertyEvent:
ret = copyPropertyEvent(in, out);
break;
- case XI_RawEvent:
+ case XI_RawKeyPress:
+ case XI_RawKeyRelease:
+ case XI_RawButtonPress:
+ case XI_RawButtonRelease:
+ case XI_RawMotion:
ret = copyRawEvent(in, out);
break;
default:
@@ -1552,7 +1560,6 @@ wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie)
out->time = in->time;
out->detail = in->detail;
out->deviceid = in->deviceid;
- out->eventtype = in->eventtype;
out->valuators.mask_len = in->valuators_len * 4;
out->valuators.mask = next_block(&ptr, out->valuators.mask_len);