diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2012-11-26 20:25:53 -0500 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-07 15:24:56 +1000 |
| commit | f58fa035bb503167decca0c541dff386b7181f02 (patch) | |
| tree | 81fe012d1aaf9ac5668134cb6cd132c53c234003 | |
| parent | 9b048477593f551701f78d8509a544881418d10f (diff) | |
rev: add deviceid to barrierreleasepointer
| -rw-r--r-- | include/X11/extensions/XInput2.h | 6 | ||||
| -rw-r--r-- | src/XIBarrier.c | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 99e794c..ffefe1c 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -633,14 +633,16 @@ XIBarrierReleasePointerFull( Display* display, int num_barriers, PointerBarrier *barriers, - unsigned long *eventids + unsigned long *eventids, + int *deviceids ); extern void XIBarrierReleasePointer( Display* display, PointerBarrier barrier, - unsigned long eventid + unsigned long eventid, + int deviceid ); extern void XIFreeDeviceInfo(XIDeviceInfo *info); diff --git a/src/XIBarrier.c b/src/XIBarrier.c index caed0c7..34375b6 100644 --- a/src/XIBarrier.c +++ b/src/XIBarrier.c @@ -37,7 +37,8 @@ void XIBarrierReleasePointerFull (Display *dpy, int num_barriers, PointerBarrier *barriers, - unsigned long *eventids) + unsigned long *eventids, + int *deviceids) { XExtDisplayInfo *info = XInput_find_display (dpy); xXIBarrierReleasePointerReq *req; @@ -48,7 +49,7 @@ XIBarrierReleasePointerFull (Display *dpy, if (!num_barriers) return; - extra = (num_barriers * 8); + extra = (num_barriers * 12); LockDisplay (dpy); GetReqExtra (XIBarrierReleasePointer, extra, req); @@ -60,6 +61,7 @@ XIBarrierReleasePointerFull (Display *dpy, for (i = 0; i < num_barriers; i++) { *(p++) = barriers[i]; *(p++) = eventids[i]; + *(p++) = deviceids[i]; } UnlockDisplay (dpy); @@ -69,7 +71,8 @@ XIBarrierReleasePointerFull (Display *dpy, void XIBarrierReleasePointer (Display *dpy, PointerBarrier barrier, - unsigned long eventid) + unsigned long eventid, + int deviceid) { - XIBarrierReleasePointerFull (dpy, 1, &barrier, &eventid); + XIBarrierReleasePointerFull (dpy, 1, &barrier, &eventid, &deviceid); } |