xi2.3

5 files changed, 178 insertions, 1 deletions

diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 26de695..c852593 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -328,6 +328,31 @@ typedef struct {
     int           flags;
 } XITouchOwnershipEvent;
 
+typedef XID PointerBarrier;
+typedef int32_t BarrierEventID;
+
+typedef struct {
+    int           type;         /* GenericEvent */
+    unsigned long serial;       /* # of last request processed by server */
+    Bool          send_event;   /* true if this came from a SendEvent request */
+    Display       *display;     /* Display the event was read from */
+    int           extension;    /* XI extension offset */
+    int           evtype;
+    Time          time;
+    int           deviceid;
+    int           sourceid;
+    Window        window;
+    int           x;
+    int           y;
+    double        dx;
+    double        dy;
+    double        raw_dx;
+    double        raw_dy;
+    int           dt;
+    PointerBarrier barrier;
+    BarrierEventID event_id;
+} XIBarrierNotifyEvent;
+
 _XFUNCPROTOBEGIN
 
 extern Bool     XIQueryPointer(
@@ -603,6 +628,21 @@ XIGetProperty(
     unsigned char       **data
 );
 
+extern void
+XIBarrierReleasePointerFull(
+    Display*            display,
+    int                 num_barriers,
+    PointerBarrier      *barriers,
+    unsigned long       *eventIDs
+);
+
+extern void
+XIBarrierReleasePointer(
+    Display*            display,
+    PointerBarrier      barrier,
+    unsigned long       eventID
+);
+
 extern void XIFreeDeviceInfo(XIDeviceInfo       *info);
 
 _XFUNCPROTOEND
diff --git a/src/Makefile.am b/src/Makefile.am
index 806265c..ee40753 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,8 @@ XI2_sources = XIAllowEvents.c \
 		  XIWarpPointer.c \
 		  XIHierarchy.c \
 		  XIDefineCursor.c \
-		  XIQueryPointer.c
+		  XIQueryPointer.c \
+		  XIBarrier.c
 
 libXi_la_SOURCES = \
 		  XAllowDv.c \
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 1c668c7..9ebedab 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -124,6 +124,9 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie);
 static int
 wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
                           XGenericEventCookie *cookie);
+static int
+wireToBarrierNotifyEvent(xXIBarrierNotifyEvent *in,
+                         XGenericEventCookie *cookie);
 
 static /* const */ XEvent emptyevent;
 
@@ -1022,6 +1025,16 @@ XInputWireToCookie(
                 break;
             }
             return ENQUEUE_EVENT;
+        case XI_BarrierHitNotify:
+        case XI_BarrierPointerReleasedNotify:
+            *cookie = *(XGenericEventCookie*)save;
+            if (!wireToBarrierNotifyEvent((xXIBarrierNotifyEvent*)event, cookie))
+            {
+                printf("XInputWireToCookie: CONVERSION FAILURE!  evtype=%d\n",
+                        ge->evtype);
+                break;
+            }
+            return ENQUEUE_EVENT;
         default:
             printf("XInputWireToCookie: Unknown generic event. type %d\n", ge->evtype);
 
@@ -1403,7 +1416,21 @@ copyRawEvent(XGenericEventCookie *cookie_in,
     return True;
 }
 
+static Bool
+copyBarrierNotifyEvent(XGenericEventCookie *in_cookie,
+                       XGenericEventCookie *out_cookie)
+{
+    XIBarrierNotifyEvent *in, *out;
+
+    in = in_cookie->data;
 
+    out = out_cookie->data = calloc(1, sizeof(XIBarrierNotifyEvent));
+    if (!out)
+        return False;
+    *out = *in;
+
+    return True;
+}
 
 static Bool
 XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out)
@@ -1459,6 +1486,10 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out
         case XI_RawMotion:
             ret = copyRawEvent(in, out);
             break;
+        case XI_BarrierHitNotify:
+        case XI_BarrierPointerReleasedNotify:
+            ret = copyBarrierNotifyEvent(in, out);
+            break;
         default:
             printf("XInputCopyCookie: unknown evtype %d\n", in->evtype);
             ret = False;
@@ -1958,3 +1989,32 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
 
     return 1;
 }
+
+#define FP3232_TO_DOUBLE(x) ((double) (x).integral + (x).frac / (1 << 16) / (1 << 16))
+
+static int
+wireToBarrierNotifyEvent(xXIBarrierNotifyEvent *in, XGenericEventCookie *cookie)
+{
+    XIBarrierNotifyEvent *out = malloc(sizeof(XIBarrierNotifyEvent));
+
+    out = cookie->data = calloc(1, sizeof(XIBarrierNotifyEvent));
+
+    out->display = cookie->display;
+    out->type = in->type;
+    out->extension = in->extension;
+    out->evtype = in->evtype;
+
+    out->x = in->x;
+    out->y = in->y;
+
+    out->dx = FP3232_TO_DOUBLE (in->dx);
+    out->dy = FP3232_TO_DOUBLE (in->dy);
+    out->raw_dx = FP3232_TO_DOUBLE (in->raw_dx);
+    out->raw_dy = FP3232_TO_DOUBLE (in->raw_dy);
+    out->dt = in->dt;
+    out->barrier = in->barrier;
+    out->event_id = in->event_id;
+    out->time = in->time;
+
+    return 1;
+}
diff --git a/src/XIBarrier.c b/src/XIBarrier.c
new file mode 100644
index 0000000..d736501
--- /dev/null
+++ b/src/XIBarrier.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2009 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XI2proto.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
+
+void
+XIBarrierReleasePointerFull (Display *dpy,
+                             int num_barriers,
+                             PointerBarrier *barriers,
+                             unsigned long  *eventIDs)
+{
+    XExtDisplayInfo	        *info = XInput_find_display (dpy);
+    xXIBarrierReleasePointerReq *req;
+    int extra = 0;
+    int i;
+    uint32_t *p;
+
+    if (!num_barriers)
+        return;
+
+    extra = (num_barriers * (sizeof(*eventIDs) + sizeof(PointerBarrier)));
+
+    LockDisplay (dpy);
+    GetReqExtra (XIBarrierReleasePointer, extra, req);
+    req->reqType = info->codes->major_opcode;
+    req->ReqType = X_XIBarrierReleasePointer;
+    req->num_barriers = num_barriers;
+
+    p = (uint32_t *) &req[1];
+    for (i = 0; i < num_barriers; i++) {
+        *(p++) = barriers[i];
+        *(p++) = eventIDs[i];
+    }
+
+    UnlockDisplay (dpy);
+    SyncHandle ();
+}
+
+void
+XIBarrierReleasePointer (Display *dpy,
+                         PointerBarrier barrier,
+                         unsigned long  eventID)
+{
+    XIBarrierReleasePointerFull (dpy, 1, &barrier, &eventID);
+}
diff --git a/src/XIint.h b/src/XIint.h
index be4eafb..571bb23 100644
--- a/src/XIint.h
+++ b/src/XIint.h
@@ -22,6 +22,7 @@
 #endif
 #define XInput_2_1			8
 #define XInput_2_2			9
+#define XInput_2_3			10
 
 extern XExtDisplayInfo *XInput_find_display(Display *);