hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-16 00:19:55 +00:00
Code Issues Projects Releases Wiki Activity

Xi: process raw touch events

Browse source 
No-one can generated them yet, but if they could, we'd be processing them
like there was no tomorrow.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-14 13:21:59 +10:00
commit 3390d3fc03
8 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dix/eventconvert.c
View file

@ -158,6 +158,9 @@ EventToCore(InternalEvent *event, xEvent **core_out, int *count_out)
case ET_RawButtonPress:
case ET_RawButtonRelease:
case ET_RawMotion:
case ET_RawTouchBegin:
case ET_RawTouchUpdate:
case ET_RawTouchEnd:
case ET_TouchBegin:
case ET_TouchUpdate:
case ET_TouchEnd:
@ -211,6 +214,9 @@ EventToXI(InternalEvent *ev, xEvent **xi, int *count)
case ET_RawButtonPress:
case ET_RawButtonRelease:
case ET_RawMotion:
case ET_RawTouchBegin:
case ET_RawTouchUpdate:
case ET_RawTouchEnd:
case ET_TouchBegin:
case ET_TouchUpdate:
case ET_TouchEnd:
@ -270,6 +276,9 @@ EventToXI2(InternalEvent *ev, xEvent **xi)
case ET_RawButtonPress:
case ET_RawButtonRelease:
case ET_RawMotion:
case ET_RawTouchBegin:
case ET_RawTouchUpdate:
case ET_RawTouchEnd:
return eventToRawEvent(&ev->raw_event, xi);
default:
break;
@ -827,6 +836,9 @@ GetXI2Type(enum EventType type)
case ET_RawButtonPress: xi2type = XI_RawButtonPress; break;
case ET_RawButtonRelease: xi2type = XI_RawButtonRelease; break;
case ET_RawMotion: xi2type = XI_RawMotion; break;
case ET_RawTouchBegin: xi2type = XI_RawTouchBegin; break;
case ET_RawTouchUpdate: xi2type = XI_RawTouchUpdate; break;
case ET_RawTouchEnd: xi2type = XI_RawTouchEnd; break;
case ET_FocusIn: xi2type = XI_FocusIn; break;
case ET_FocusOut: xi2type = XI_FocusOut; break;
case ET_TouchBegin: xi2type = XI_TouchBegin; break;

3
dix/events.c
View file

@ -2463,6 +2463,9 @@ FixUpEventFromWindow(
case XI_RawButtonPress:
case XI_RawButtonRelease:
case XI_RawMotion:
case XI_RawTouchBegin:
case XI_RawTouchUpdate:
case XI_RawTouchEnd:
case XI_DeviceChanged:
case XI_HierarchyChanged:
case XI_PropertyEvent:

11
dix/getevents.c
View file

@ -161,7 +161,16 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
memset(event, 0, sizeof(RawDeviceEvent));
event->header = ET_Internal;
event->length = sizeof(RawDeviceEvent);
event->type = ET_RawKeyPress - ET_KeyPress + type;
switch(type) {
case MotionNotify: event->type = ET_RawMotion; break;
case ButtonPress: event->type = ET_RawButtonPress; break;
case ButtonRelease: event->type = ET_RawButtonRelease; break;
case KeyPress: event->type = ET_RawKeyPress; break;
case KeyRelease: event->type = ET_RawKeyRelease; break;
case XI_TouchBegin: event->type = ET_RawTouchBegin; break;
case XI_TouchUpdate: event->type = ET_RawTouchUpdate; break;
case XI_TouchEnd: event->type = ET_RawTouchEnd; break;
}
event->time = ms;
event->deviceid = dev->id;
event->sourceid = dev->id;