summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac4
-rw-r--r--include/X11/extensions/XInput2.h47
-rw-r--r--man/Makefile.am3
-rw-r--r--man/XIBarrierReleasePointer.txt76
-rw-r--r--src/Makefile.am3
-rw-r--r--src/XExtInt.c62
-rw-r--r--src/XIBarrier.c81
-rw-r--r--src/XIint.h1
8 files changed, 274 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 2d3a46a..e79fe12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.6.1],
+AC_INIT([libXi], [1.6.99],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
@@ -28,7 +28,7 @@ XORG_WITH_ASCIIDOC(8.4.5)
XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for dependencies
-PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.6])
+PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1])
# Check for xmlto and asciidoc for man page conversion
# (only needed by people building tarballs)
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 26de695..a746012 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -169,6 +169,16 @@ typedef struct
int status;
} XIGrabModifiers;
+typedef XID PointerBarrier;
+typedef unsigned int BarrierEventID;
+
+typedef struct
+{
+ int deviceid;
+ PointerBarrier barrier;
+ BarrierEventID eventid;
+} XIBarrierReleasePointerInfo;
+
/**
* Generic XI2 event. All XI2 events have the same header.
*/
@@ -328,6 +338,28 @@ typedef struct {
int flags;
} XITouchOwnershipEvent;
+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 event;
+ Window root;
+ double root_x;
+ double root_y;
+ double dx;
+ double dy;
+ int dtime;
+ int flags;
+ PointerBarrier barrier;
+ BarrierEventID eventid;
+} XIBarrierEvent;
+
_XFUNCPROTOBEGIN
extern Bool XIQueryPointer(
@@ -603,6 +635,21 @@ XIGetProperty(
unsigned char **data
);
+extern void
+XIBarrierReleasePointers(
+ Display* display,
+ XIBarrierReleasePointerInfo *barriers,
+ int num_barriers
+);
+
+extern void
+XIBarrierReleasePointer(
+ Display* display,
+ int deviceid,
+ PointerBarrier barrier,
+ BarrierEventID eventid
+);
+
extern void XIFreeDeviceInfo(XIDeviceInfo *info);
_XFUNCPROTOEND
diff --git a/man/Makefile.am b/man/Makefile.am
index af63952..b92d486 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,6 +25,7 @@ libmandir = $(LIB_MAN_DIR)
# Source files for X Input v2 man pages
XI2_txt = \
+ XIBarrierReleasePointer.txt \
XIChangeHierarchy.txt \
XIDefineCursor.txt \
XIGrabButton.txt \
@@ -76,6 +77,7 @@ libman_xml = $(libman_txt:.txt=.xml)
# They are created by the xmlto command when generating man pages from DocBook
# The shadow man page contains a gtroff .so request to include the main man page
XI2_shadows = \
+ XIBarrierReleasePointers.man \
XIUndefineCursor.man \
XIUngrabButton.man \
XIGrabKeycode.man \
@@ -152,6 +154,7 @@ XIDeleteProperty.man: XIChangeProperty.man
XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man
XIGetSelectedEvents.man: XISelectEvents.man
XIFreeDeviceInfo.man: XIQueryDevice.man
+XIBarrierReleasePointers.man: XIBarrierReleasePointer.man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
# Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion
diff --git a/man/XIBarrierReleasePointer.txt b/man/XIBarrierReleasePointer.txt
new file mode 100644
index 0000000..4fa48fe
--- /dev/null
+++ b/man/XIBarrierReleasePointer.txt
@@ -0,0 +1,76 @@
+XIBARRIERRELEASEPOINTER(libmansuffix)
+=====================================
+
+NAME
+----
+
+ XIBarrierReleasePointer, XIBarrierReleasePointers - allow pointer movement across a pointer barrier
+
+SYNOPSIS
+--------
+
+ #include <X11/extensions/XInput2.h>
+
+ int XIBarrierReleasePointer( Display *display,
+ int deviceid,
+ PointerBarrier barrier,
+ BarrierEventID eventid);
+
+ int XIBarrierReleasePointers( Display *display,
+ XIBarrierReleasePointerInfo *barriers,
+ int num_barriers);
+
+ display
+ Specifies the connection to the X server.
+
+ deviceid
+ Specifies the device allowed to move across the barrier.
+
+ barrier
+ Specifies the barrier.
+
+ eventid
+ Specifies the unique event ID for this barrier event sequence.
+
+ barriers
+ List of deviceid, barrier, eventid triplets.
+
+ num_barriers
+ Number of elements in barriers.
+
+DESCRIPTION
+-----------
+
+ If a pointer is constrained by a pointer barrier, release the pointer
+ from the barrier and allow it to cross the barrier with the next motion.
+ If the pointer moves away from the barrier, this request does nothing.
+
+ This request only releases the pointer for the given barrier event
+ sequence. If the pointer moves away from or through the barrier, a
+ XI_BarrierLeave event is generated. Future pointer movement constrained
+ by this barrier will assign a new eventid and require a new
+ XIBarrierReleasePointer request.
+
+ If the pointer is not currently blocked by the barrier or the barrier
+ event sequence has ended, this request does nothing.
+
+ XIBarrierReleasePointer and XIBarrierReleasePointers can generate a
+ BadDevice or BadValue error.
+
+DIAGNOSTICS
+-----------
+
+ BadDevice
+ An invalid device was specified. The device does not
+ exist or is not a master pointer device.
+
+ BadValue
+ A value for a PointerBarrier argument does not name a defined
+ pointer barrier.
+
+See also
+--------
+
+ XFixesCreatePointerBarrier(libmansuffix)
+
+
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..57d071d 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
+wireToBarrierEvent(xXIBarrierEvent *in,
+ XGenericEventCookie *cookie);
static /* const */ XEvent emptyevent;
@@ -1022,6 +1025,16 @@ XInputWireToCookie(
break;
}
return ENQUEUE_EVENT;
+ case XI_BarrierHit:
+ case XI_BarrierLeave:
+ *cookie = *(XGenericEventCookie*)save;
+ if (!wireToBarrierEvent((xXIBarrierEvent*)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
+copyBarrierEvent(XGenericEventCookie *in_cookie,
+ XGenericEventCookie *out_cookie)
+{
+ XIBarrierEvent *in, *out;
+
+ in = in_cookie->data;
+
+ out = out_cookie->data = calloc(1, sizeof(XIBarrierEvent));
+ 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_BarrierHit:
+ case XI_BarrierLeave:
+ ret = copyBarrierEvent(in, out);
+ break;
default:
printf("XInputCopyCookie: unknown evtype %d\n", in->evtype);
ret = False;
@@ -1958,3 +1989,34 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
return 1;
}
+
+#define FP3232_TO_DOUBLE(x) ((double) (x).integral + (x).frac / (1ULL << 32))
+
+static int
+wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie)
+{
+ XIBarrierEvent *out = malloc(sizeof(XIBarrierEvent));
+
+ cookie->data = out;
+
+ out->display = cookie->display;
+ out->type = in->type;
+ out->extension = in->extension;
+ out->evtype = in->evtype;
+ out->send_event = ((in->type & 0x80) != 0);
+ out->time = in->time;
+ out->deviceid = in->deviceid;
+ out->sourceid = in->sourceid;
+ out->event = in->event;
+ out->root = in->root;
+ out->root_x = FP1616toDBL(in->root_x);
+ out->root_y = FP1616toDBL(in->root_y);
+ out->dx = FP3232_TO_DOUBLE (in->dx);
+ out->dy = FP3232_TO_DOUBLE (in->dy);
+ out->dtime = in->dtime;
+ out->flags = in->flags;
+ out->barrier = in->barrier;
+ out->eventid = in->eventid;
+
+ return 1;
+}
diff --git a/src/XIBarrier.c b/src/XIBarrier.c
new file mode 100644
index 0000000..155b98b
--- /dev/null
+++ b/src/XIBarrier.c
@@ -0,0 +1,81 @@
+/*
+ * 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
+XIBarrierReleasePointers(Display *dpy,
+ XIBarrierReleasePointerInfo *barriers,
+ int num_barriers)
+{
+ XExtDisplayInfo *info = XInput_find_display(dpy);
+ xXIBarrierReleasePointerReq *req;
+ int extra = 0;
+ int i;
+ xXIBarrierReleasePointerInfo *b;
+
+ if (!num_barriers)
+ return;
+
+ extra = (num_barriers * sizeof(xXIBarrierReleasePointerInfo));
+
+ LockDisplay (dpy);
+ GetReqExtra (XIBarrierReleasePointer, extra, req);
+ req->reqType = info->codes->major_opcode;
+ req->ReqType = X_XIBarrierReleasePointer;
+ req->num_barriers = num_barriers;
+
+ b = (xXIBarrierReleasePointerInfo *) &req[1];
+ for (i = 0; i < num_barriers; i++, b++) {
+ b->deviceid = barriers[i].deviceid;
+ b->eventid = barriers[i].eventid;
+ b->barrier = barriers[i].barrier;
+ }
+
+ UnlockDisplay (dpy);
+ SyncHandle ();
+}
+
+void
+XIBarrierReleasePointer(Display *dpy,
+ int deviceid,
+ PointerBarrier barrier,
+ BarrierEventID eventid)
+{
+ XIBarrierReleasePointerInfo info;
+ info.deviceid = deviceid;
+ info.barrier = barrier;
+ info.eventid = eventid;
+
+ XIBarrierReleasePointers(dpy, &info, 1);
+}
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 *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 02:38:27 +0000