diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-17 11:50:06 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-17 12:16:11 +1000 |
| commit | 305d356e43462834a2fdd2cf59d47b055c2416fd (patch) | |
| tree | 4b361614f368805ace0718b2110eebca22a5d3d5 /src/XExtInt.c | |
| parent | 45b73dc157f326785e1022f5476bfc1f9f514d6e (diff) | |
Add support for XI 1.5 device properties.libXi-1.2-branch
This is a manual merge from master onto libXi 1.1.4. The branches have
diverged too much to make cherry-picking reasonable and readable.
This patch includes the property support provided by the combination of the
following patches:
- 7d5bb99ffce3200f82420c5a5ebac3b445aac633
- 0211e3e8277c590349903989f1676f6af4baa44b
- bfd2e08f3530091fbcd8c078f684e9aab9057df0
- bec02767629ed795582ba3f645299d7036093511
- f9a5371d43b2c6023745f766d0e8ceff2acdff60
- e179b124aac13387c6f730197b8852c1f69eb9e3
Man pages are copied from the parsed docbook output from master.
Diffstat (limited to 'src/XExtInt.c')
| -rw-r--r-- | src/XExtInt.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c index 10f728d..d448406 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -121,7 +121,9 @@ XEXT_GENERATE_FIND_DISPLAY(XInput_find_display, xinput_info, {XI_Present, XI_Add_XChangeDeviceControl_Major, XI_Add_XChangeDeviceControl_Minor}, {XI_Present, XI_Add_DevicePresenceNotify_Major, - XI_Add_DevicePresenceNotify_Minor} + XI_Add_DevicePresenceNotify_Minor}, + {XI_Present, XI_Add_DeviceProperties_Major, + XI_Add_DeviceProperties_Minor}, }; /*********************************************************************** @@ -697,6 +699,21 @@ XInputWireToEvent(dpy, re, event) } break; + case XI_DevicePropertyNotify: + + { + XDevicePropertyNotifyEvent* ev = (XDevicePropertyNotifyEvent*)re; + devicePropertyNotify *ev2 = (devicePropertyNotify*)event; + + *ev = *(XDevicePropertyNotifyEvent*)save; + ev->time = ev2->time; + ev->deviceid = ev2->deviceid; + ev->atom = ev2->atom; + ev->state = ev2->state; + return ENQUEUE_EVENT; + } + break; + default: printf("XInputWireToEvent: UNKNOWN WIRE EVENT! type=%d\n", type); break; |