Add Get/SetDeviceFocus handling.

5 files changed, 166 insertions, 4 deletions

diff --git a/Xi/Makefile.am b/Xi/Makefile.am
index 548300024..cbec13ed3 100644
--- a/Xi/Makefile.am
+++ b/Xi/Makefile.am
@@ -95,6 +95,8 @@ libXi_la_SOURCES =	\
 	xiproperty.c \
 	xiproperty.h \
 	xiselectev.c \
-	xiselectev.h
+	xiselectev.h \
+	xisetdevfocus.c \
+	xisetdevfocus.h
 
 EXTRA_DIST = stubs.c
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 5dae990c6..697080913 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1241,7 +1241,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
     FixUpEventFromWindow(dev, (xEvent*)xi2event, pWin, None, FALSE);
 
     DeliverEventsToWindow(dev, pWin, (xEvent*)xi2event, 1,
-                          GetWindowXI2Mask(dev, pWin, xi2event), NullGrab,
+                          GetEventFilter(dev, (xEvent*)xi2event), NullGrab,
                           dev->id);
 
     xfree(xi2event);
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 8c9f9e111..23e41ca13 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -120,6 +120,7 @@ SOFTWARE.
 #include "ungrdevk.h"
 #include "warpdevp.h"
 #include "xiselectev.h"
+#include "xisetdevfocus.h"
 #include "xiproperty.h"
 
 
@@ -239,7 +240,9 @@ static int (*ProcIVector[])(ClientPtr) = {
         ProcXIGetClientPointer,                 /* 45 */
         ProcXISelectEvent,                      /* 46 */
         ProcXIQueryVersion,                     /* 47 */
-        ProcXIQueryDevice                       /* 48 */
+        ProcXIQueryDevice,                      /* 48 */
+        ProcXISetDeviceFocus,                   /* 49 */
+        ProcXIGetDeviceFocus                    /* 50 */
 };
 
 /* For swapped clients */
@@ -292,7 +295,9 @@ static int (*SProcIVector[])(ClientPtr) = {
         SProcXIGetClientPointer,                 /* 45 */
         SProcXISelectEvent,                      /* 46 */
         SProcXIQueryVersion,                     /* 47 */
-        SProcXIQueryDevice                       /* 48 */
+        SProcXIQueryDevice,                      /* 48 */
+        SProcXISetDeviceFocus,                   /* 49 */
+        SProcXIGetDeviceFocus                    /* 50 */
 };
 
 /*****************************************************************
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
new file mode 100644
index 000000000..5945abd7b
--- /dev/null
+++ b/Xi/xisetdevfocus.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2008 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.
+ *
+ * Author: Peter Hutterer
+ */
+/***********************************************************************
+ *
+ * Request to set and get an input device's focus.
+ *
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "inputstr.h"	/* DeviceIntPtr      */
+#include "windowstr.h"	/* window structure  */
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "exglobals.h" /* BadDevice */
+#include "xisetdevfocus.h"
+
+int
+SProcXISetDeviceFocus(ClientPtr client)
+{
+    char n;
+
+    REQUEST(xXISetDeviceFocusReq);
+    swaps(&stuff->length, n);
+    swaps(&stuff->deviceid, n);
+    swapl(&stuff->focus, n);
+    swapl(&stuff->time, n);
+
+    return ProcXISetDeviceFocus(client);
+}
+
+int
+SProcXIGetDeviceFocus(ClientPtr client)
+{
+    char n;
+
+    REQUEST(xXIGetDeviceFocusReq);
+    swaps(&stuff->length, n);
+    swaps(&stuff->deviceid, n);
+
+    return ProcXIGetDeviceFocus(client);
+}
+
+int
+ProcXISetDeviceFocus(ClientPtr client)
+{
+    DeviceIntPtr dev;
+    int ret;
+
+    REQUEST(xXISetDeviceFocusReq);
+    REQUEST_AT_LEAST_SIZE(xXISetDeviceFocusReq);
+
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
+    if (ret != Success)
+	return ret;
+    if (!dev->focus)
+	return BadDevice;
+
+    return SetInputFocus(client, dev, stuff->focus, RevertToParent,
+                        stuff->time, TRUE);
+}
+
+int
+ProcXIGetDeviceFocus(ClientPtr client)
+{
+    xXIGetDeviceFocusReply rep;
+    DeviceIntPtr dev;
+    int ret;
+
+    REQUEST(xXIGetDeviceFocusReq);
+    REQUEST_AT_LEAST_SIZE(xXIGetDeviceFocusReq);
+
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
+    if (ret != Success)
+	return ret;
+    if (!dev->focus)
+	return BadDevice;
+
+    rep.repType = X_Reply;
+    rep.RepType = X_XIGetDeviceFocus;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (dev->focus->win == NoneWin)
+	rep.focus = None;
+    else if (dev->focus->win == PointerRootWin)
+	rep.focus = PointerRoot;
+    else if (dev->focus->win == FollowKeyboardWin)
+	rep.focus = FollowKeyboard;
+    else
+	rep.focus = dev->focus->win->drawable.id;
+
+    WriteReplyToClient(client, sizeof(xXIGetDeviceFocusReply), &rep);
+    return Success;
+}
diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h
new file mode 100644
index 000000000..9bdeb7781
--- /dev/null
+++ b/Xi/xisetdevfocus.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 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.
+ *
+ * Author: Peter Hutterer
+ */
+
+#ifndef XISETDEVFOCUS_H
+#define XISETDEVFOCUS_H 1
+
+int SProcXISetDeviceFocus(ClientPtr client);
+int ProcXISetDeviceFocus(ClientPtr client);
+
+int SProcXIGetDeviceFocus(ClientPtr client);
+int ProcXIGetDeviceFocus(ClientPtr client);
+
+#endif /* XISETDEVFOCUS_H */