Add XISetDeviceFocus and XIGetDeviceFocus

4 files changed, 128 insertions, 0 deletions

diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index cdfd0a5..f7ffba3 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -340,6 +340,18 @@ extern XIDeviceInfo* XIQueryDevice(
      int*               ndevices_return
 );
 
+extern Status XISetDeviceFocus(
+     Display*           dpy,
+     int                deviceid,
+     Window             focus,
+     Time               time
+);
+
+extern Status XIGetDeviceFocus(
+     Display*           dpy,
+     int                deviceid,
+     Window             *focus_return);
+
 extern void XIFreeDeviceInfo(XIDeviceInfo       *info);
 extern void XIFreeEventData(XIEvent *ev);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b1ad736..a9b1480 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,8 +55,11 @@ libXi_la_SOURCES = \
 		  XIint.h \
 		  XIQueryVersion.c \
 		  XIQueryDevice.c \
+		  XISetDevFocus.c \
+		  XIGetDevFocus.c \
 		  XIFreeEvent.c
 
+
 libXi_la_LIBADD = $(XI_LIBS)
 
 AM_CFLAGS = -I$(top_srcdir)/include \
diff --git a/src/XIGetDevFocus.c b/src/XIGetDevFocus.c
new file mode 100644
index 0000000..32adfde
--- /dev/null
+++ b/src/XIGetDevFocus.c
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ *
+ */
+
+#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"
+
+Status
+XIGetDeviceFocus(Display *dpy, int deviceid, Window *focus_return)
+{
+    xXIGetDeviceFocusReq   *req;
+    xXIGetDeviceFocusReply reply;
+
+    XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+    if (_XiCheckExtInit(dpy, Dont_Check, extinfo) == -1)
+	return (NoSuchExtension);
+
+    GetReq(XIGetDeviceFocus, req);
+    req->reqType  = extinfo->codes->major_opcode;
+    req->ReqType  = X_XIGetDeviceFocus;
+    req->deviceid = deviceid;
+
+    if (!_XReply(dpy, (xReply*) &reply, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return False;
+    }
+
+    *focus_return = reply.focus;
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return Success;
+
+}
+
diff --git a/src/XISetDevFocus.c b/src/XISetDevFocus.c
new file mode 100644
index 0000000..fe08c1f
--- /dev/null
+++ b/src/XISetDevFocus.c
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ *
+ */
+
+#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"
+
+Status
+XISetDeviceFocus(Display *dpy, int deviceid, Window focus, Time time)
+{
+    xXISetDeviceFocusReq   *req;
+
+    XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+    if (_XiCheckExtInit(dpy, Dont_Check, extinfo) == -1)
+	return (NoSuchExtension);
+
+    GetReq(XISetDeviceFocus, req);
+    req->reqType  = extinfo->codes->major_opcode;
+    req->ReqType  = X_XISetDeviceFocus;
+    req->deviceid = deviceid;
+    req->focus    = focus;
+    req->time     = time;
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return Success;
+
+}
+