Add XGetClientPointer call.

Add XGetPairedPointer call.

3 files changed, 143 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 2dc93c6..d25fb2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,10 +19,12 @@ libXi_la_SOURCES = \
 		  XDevBell.c \
 		  XExtToWire.c \
 		  XGetBMap.c \
+		  XGetCPtr.c \
 		  XGetDCtl.c \
 		  XGetFCtl.c \
 		  XGetKMap.c \
 		  XGetMMap.c \
+		  XGetPairP.c \
 		  XGetProp.c \
 		  XGetVers.c \
 		  XGMotion.c \
diff --git a/src/XGetCPtr.c b/src/XGetCPtr.c
new file mode 100644
index 0000000..33bd30b
--- /dev/null
+++ b/src/XGetCPtr.c
@@ -0,0 +1,70 @@
+/************************************************************
+
+Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice 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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+/***********************************************************************
+ *
+ * XGetClientPointer - Get the clientPointer setting for a client.
+ *
+ */
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
+
+Bool
+XGetClientPointer(dpy, win, deviceid)
+    Display* dpy;
+    Window win;
+    int* deviceid;
+{
+    xGetClientPointerReq *req;
+    xGetClientPointerReply rep;
+    XExtDisplayInfo *info = XInput_find_display(dpy);
+
+    LockDisplay(dpy);
+    if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
+	return (NoSuchExtension);
+
+    GetReq(GetClientPointer, req);
+    req->reqType = info->codes->major_opcode;
+    req->ReqType = X_GetClientPointer;
+    req->win = win;
+
+    if (!_XReply(dpy, (xReply*) &rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return False;
+    }
+
+    *deviceid = rep.deviceid;
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return rep.set;
+}
diff --git a/src/XGetPairP.c b/src/XGetPairP.c
new file mode 100644
index 0000000..6d0475d
--- /dev/null
+++ b/src/XGetPairP.c
@@ -0,0 +1,71 @@
+/************************************************************
+
+Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice 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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+/***********************************************************************
+ *
+ * XGetPairedPointer - Get the pointer that is pared with the given keyboard
+ * device.
+ */
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
+
+Bool
+XGetPairedPointer(dpy, keyboard, deviceid)
+    Display* dpy;
+    XDevice* keyboard;
+    int* deviceid;
+{
+    xGetPairedPointerReq *req;
+    xGetPairedPointerReply rep;
+
+    XExtDisplayInfo *info = XInput_find_display(dpy);
+
+    LockDisplay(dpy);
+    if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
+	return (NoSuchExtension);
+
+    GetReq(GetPairedPointer, req);
+    req->reqType = info->codes->major_opcode;
+    req->ReqType = X_GetPairedPointer;
+    req->deviceid = keyboard->device_id;
+
+    if (!_XReply(dpy, (xReply*) &rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return False;
+    }
+
+    *deviceid = rep.deviceid;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return rep.paired;
+}
+