merge ^/branches/released .

3 files changed, 233 insertions, 227 deletions

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 34dd80ff6..0ae4f8888 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -79,6 +79,7 @@ SOFTWARE.
 #include "xiquerydevice.h" /* For List*Info */

 #include "eventconvert.h"

 #include "eventstr.h"

+#include "inpututils.h"

 

 #include <X11/extensions/XKBproto.h>

 #include "xkbsrv.h"

@@ -923,7 +924,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
     DeviceIntPtr mouse = NULL, kbd = NULL;

     DeviceEvent *event = &ev->device_event;

 

-    CHECKEVENT(ev);

+    verify_internal_event(ev);

 

     if (ev->any.type == ET_RawKeyPress ||

         ev->any.type == ET_RawKeyRelease ||

@@ -1193,6 +1194,108 @@ FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,
     first += ev->num_valuators;

 }

 

+static void

+DeliverStateNotifyEvent(DeviceIntPtr dev, WindowPtr win)

+{

+    int evcount = 1;

+    deviceStateNotify *ev, *sev;

+    deviceKeyStateNotify *kev;

+    deviceButtonStateNotify *bev;

+

+    KeyClassPtr k;

+    ButtonClassPtr b;

+    ValuatorClassPtr v;

+    int nval = 0, nkeys = 0, nbuttons = 0, first = 0;

+

+    if (!(wOtherInputMasks(win)) ||

+        !(wOtherInputMasks(win)->inputEvents[dev->id] & DeviceStateNotifyMask))

+        return;

+

+    if ((b = dev->button) != NULL) {

+        nbuttons = b->numButtons;

+        if (nbuttons > 32)

+            evcount++;

+    }

+    if ((k = dev->key) != NULL) {

+        nkeys = k->xkbInfo->desc->max_key_code -

+            k->xkbInfo->desc->min_key_code;

+        if (nkeys > 32)

+            evcount++;

+        if (nbuttons > 0) {

+            evcount++;

+        }

+    }

+    if ((v = dev->valuator) != NULL) {

+        nval = v->numAxes;

+

+        if (nval > 3)

+            evcount++;

+        if (nval > 6) {

+            if (!(k && b))

+                evcount++;

+            if (nval > 9)

+                evcount += ((nval - 7) / 3);

+        }

+    }

+

+    sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent));

+    FixDeviceStateNotify(dev, ev, NULL, NULL, NULL, first);

+

+    if (b != NULL) {

+        FixDeviceStateNotify(dev, ev++, NULL, b, v, first);

+        first += 3;

+        nval -= 3;

+        if (nbuttons > 32) {

+            (ev - 1)->deviceid |= MORE_EVENTS;

+            bev = (deviceButtonStateNotify *) ev++;

+            bev->type = DeviceButtonStateNotify;

+            bev->deviceid = dev->id;

+            memcpy((char*)&bev->buttons[4], (char*)&b->down[4], DOWN_LENGTH - 4);

+        }

+        if (nval > 0) {

+            (ev - 1)->deviceid |= MORE_EVENTS;

+            FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+            first += 3;

+            nval -= 3;

+        }

+    }

+

+    if (k != NULL) {

+        FixDeviceStateNotify(dev, ev++, k, NULL, v, first);

+        first += 3;

+        nval -= 3;

+        if (nkeys > 32) {

+            (ev - 1)->deviceid |= MORE_EVENTS;

+            kev = (deviceKeyStateNotify *) ev++;

+            kev->type = DeviceKeyStateNotify;

+            kev->deviceid = dev->id;

+            memmove((char *)&kev->keys[0], (char *)&k->down[4], 28);

+        }

+        if (nval > 0) {

+            (ev - 1)->deviceid |= MORE_EVENTS;

+            FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+            first += 3;

+            nval -= 3;

+        }

+    }

+

+    while (nval > 0) {

+        FixDeviceStateNotify(dev, ev++, NULL, NULL, v, first);

+        first += 3;

+        nval -= 3;

+        if (nval > 0) {

+            (ev - 1)->deviceid |= MORE_EVENTS;

+            FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

+            first += 3;

+            nval -= 3;

+        }

+    }

+

+    DeliverEventsToWindow(dev, win, (xEvent *) sev, evcount,

+                          DeviceStateNotifyMask, NullGrab);

+    free(sev);

+}

+

 void

 DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,

 		 WindowPtr pWin)

@@ -1259,104 +1362,8 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
     DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1,

 				DeviceFocusChangeMask, NullGrab);

 

-    if ((event.type == DeviceFocusIn) &&

-	(wOtherInputMasks(pWin)) &&

-	(wOtherInputMasks(pWin)->inputEvents[dev->id] & DeviceStateNotifyMask))

-    {

-	int evcount = 1;

-	deviceStateNotify *ev, *sev;

-	deviceKeyStateNotify *kev;

-	deviceButtonStateNotify *bev;

-

-	KeyClassPtr k;

-	ButtonClassPtr b;

-	ValuatorClassPtr v;

-	int nval = 0, nkeys = 0, nbuttons = 0, first = 0;

-

-	if ((b = dev->button) != NULL) {

-	    nbuttons = b->numButtons;

-	    if (nbuttons > 32)

-		evcount++;

-	}

-	if ((k = dev->key) != NULL) {

-	    nkeys = k->xkbInfo->desc->max_key_code -

-                    k->xkbInfo->desc->min_key_code;

-	    if (nkeys > 32)

-		evcount++;

-	    if (nbuttons > 0) {

-		evcount++;

-	    }

-	}

-	if ((v = dev->valuator) != NULL) {

-	    nval = v->numAxes;

-

-	    if (nval > 3)

-		evcount++;

-	    if (nval > 6) {

-		if (!(k && b))

-		    evcount++;

-		if (nval > 9)

-		    evcount += ((nval - 7) / 3);

-	    }

-	}

-

-	sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent));

-	FixDeviceStateNotify(dev, ev, NULL, NULL, NULL, first);

-

-	if (b != NULL) {

-	    FixDeviceStateNotify(dev, ev++, NULL, b, v, first);

-	    first += 3;

-	    nval -= 3;

-	    if (nbuttons > 32) {

-		(ev - 1)->deviceid |= MORE_EVENTS;

-		bev = (deviceButtonStateNotify *) ev++;

-		bev->type = DeviceButtonStateNotify;

-		bev->deviceid = dev->id;

-		memcpy((char*)&bev->buttons[4], (char*)&b->down[4], DOWN_LENGTH - 4);

-	    }

-	    if (nval > 0) {

-		(ev - 1)->deviceid |= MORE_EVENTS;

-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

-		first += 3;

-		nval -= 3;

-	    }

-	}

-

-	if (k != NULL) {

-	    FixDeviceStateNotify(dev, ev++, k, NULL, v, first);

-	    first += 3;

-	    nval -= 3;

-	    if (nkeys > 32) {

-		(ev - 1)->deviceid |= MORE_EVENTS;

-		kev = (deviceKeyStateNotify *) ev++;

-		kev->type = DeviceKeyStateNotify;

-		kev->deviceid = dev->id;

-		memmove((char *)&kev->keys[0], (char *)&k->down[4], 28);

-	    }

-	    if (nval > 0) {

-		(ev - 1)->deviceid |= MORE_EVENTS;

-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

-		first += 3;

-		nval -= 3;

-	    }

-	}

-

-	while (nval > 0) {

-	    FixDeviceStateNotify(dev, ev++, NULL, NULL, v, first);

-	    first += 3;

-	    nval -= 3;

-	    if (nval > 0) {

-		(ev - 1)->deviceid |= MORE_EVENTS;

-		FixDeviceValuator(dev, (deviceValuator *) ev++, v, first);

-		first += 3;

-		nval -= 3;

-	    }

-	}

-

-	DeliverEventsToWindow(dev, pWin, (xEvent *) sev, evcount,

-				    DeviceStateNotifyMask, NullGrab);

-	free(sev);

-    }

+    if (event.type == DeviceFocusIn)

+        DeliverStateNotifyEvent(dev, pWin);

 }

 

 int

diff --git a/xorg-server/Xi/xichangehierarchy.c b/xorg-server/Xi/xichangehierarchy.c
index 94edf6623..f83af77c3 100644
--- a/xorg-server/Xi/xichangehierarchy.c
+++ b/xorg-server/Xi/xichangehierarchy.c
@@ -355,6 +355,7 @@ detach_slave(ClientPtr client, xXIDetachSlaveInfo *c, int flags[MAXDEVICES])
         goto unwind;

     }

 

+    ReleaseButtonsAndKeys(dev);

     AttachDevice(client, dev, NULL);

     flags[dev->id] |= XISlaveDetached;

 

@@ -406,6 +407,7 @@ attach_slave(ClientPtr client, xXIAttachSlaveInfo *c,
         goto unwind;

     }

 

+    ReleaseButtonsAndKeys(dev);

     AttachDevice(client, dev, newmaster);

     flags[dev->id] |= XISlaveAttached;

 

diff --git a/xorg-server/Xi/xiqueryversion.c b/xorg-server/Xi/xiqueryversion.c
index ae63297da..a84c07279 100644
--- a/xorg-server/Xi/xiqueryversion.c
+++ b/xorg-server/Xi/xiqueryversion.c
@@ -1,128 +1,125 @@
-/*
- * 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.
- *
- * Authors: Peter Hutterer
- *
- */
-
-/**
- * @file xiqueryversion.c
- * Protocol handling for the XIQueryVersion request/reply.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-
-#include "inputstr.h"
-
-#include <X11/Xmd.h>
-#include <X11/X.h>
-#include <X11/extensions/XI2proto.h>
-
-#include "exglobals.h"
-#include "exevents.h"
-#include "xiqueryversion.h"
-#include "misc.h"
-
-extern XExtensionVersion XIVersion; /* defined in getvers.c */
-/**
- * Return the supported XI version.
- *
- * Saves the version the client claims to support as well, for future
- * reference.
- */
-int
-ProcXIQueryVersion(ClientPtr client)
-{
-    xXIQueryVersionReply rep;
-    XIClientPtr pXIClient;
-    int major, minor;
-    unsigned int sversion, cversion;
-
-    REQUEST(xXIQueryVersionReq);
-    REQUEST_SIZE_MATCH(xXIQueryVersionReq);
-
-    /* This request only exists after XI2 */
-    if (stuff->major_version < 2)
-    {
-        client->errorValue = stuff->major_version;
-        return BadValue;
-    }
-
-    pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
-
-    sversion = XIVersion.major_version * 1000 + XIVersion.minor_version;
-    cversion = stuff->major_version * 1000 + stuff->minor_version;
-
-    if (sversion > cversion)
-    {
-        major = stuff->major_version;
-        minor = stuff->minor_version;
-    } else
-    {
-        major = XIVersion.major_version;
-        minor = XIVersion.minor_version;
-    }
-
-    pXIClient->major_version = major;
-    pXIClient->minor_version = minor;
-
-    memset(&rep, 0, sizeof(xXIQueryVersionReply));
-    rep.repType = X_Reply;
-    rep.RepType = X_XIQueryVersion;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.major_version = major;
-    rep.minor_version = minor;
-
-    WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);
-
-    return Success;
-}
-
-/* Swapping routines */
-
-int
-SProcXIQueryVersion(ClientPtr client)
-{
-    char n;
-
-    REQUEST(xXIQueryVersionReq);
-    swaps(&stuff->length, n);
-    REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
-    swaps(&stuff->major_version, n);
-    swaps(&stuff->minor_version, n);
-    return (ProcXIQueryVersion(client));
-}
-
-void
-SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply *rep)
-{
-    char n;
-    swaps(&rep->sequenceNumber, n);
-    swapl(&rep->length, n);
-    swaps(&rep->major_version, n);
-    swaps(&rep->minor_version, n);
-    WriteToClient(client, size, (char *)rep);
-}
+/*

+ * 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.

+ *

+ * Authors: Peter Hutterer

+ *

+ */

+

+/**

+ * @file xiqueryversion.c

+ * Protocol handling for the XIQueryVersion request/reply.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+

+#include "inputstr.h"

+

+#include <X11/Xmd.h>

+#include <X11/X.h>

+#include <X11/extensions/XI2proto.h>

+

+#include "exglobals.h"

+#include "exevents.h"

+#include "xiqueryversion.h"

+#include "misc.h"

+

+extern XExtensionVersion XIVersion; /* defined in getvers.c */

+/**

+ * Return the supported XI version.

+ *

+ * Saves the version the client claims to support as well, for future

+ * reference.

+ */

+int

+ProcXIQueryVersion(ClientPtr client)

+{

+    xXIQueryVersionReply rep;

+    XIClientPtr pXIClient;

+    int major, minor;

+

+    REQUEST(xXIQueryVersionReq);

+    REQUEST_SIZE_MATCH(xXIQueryVersionReq);

+

+    /* This request only exists after XI2 */

+    if (stuff->major_version < 2)

+    {

+        client->errorValue = stuff->major_version;

+        return BadValue;

+    }

+

+    pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);

+

+    if (version_compare(XIVersion.major_version, XIVersion.minor_version,

+                        stuff->major_version, stuff->minor_version) > 0)

+    {

+        major = stuff->major_version;

+        minor = stuff->minor_version;

+    } else

+    {

+        major = XIVersion.major_version;

+        minor = XIVersion.minor_version;

+    }

+

+    pXIClient->major_version = major;

+    pXIClient->minor_version = minor;

+

+    memset(&rep, 0, sizeof(xXIQueryVersionReply));

+    rep.repType = X_Reply;

+    rep.RepType = X_XIQueryVersion;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.major_version = major;

+    rep.minor_version = minor;

+

+    WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);

+

+    return Success;

+}

+

+/* Swapping routines */

+

+int

+SProcXIQueryVersion(ClientPtr client)

+{

+    char n;

+

+    REQUEST(xXIQueryVersionReq);

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);

+    swaps(&stuff->major_version, n);

+    swaps(&stuff->minor_version, n);

+    return (ProcXIQueryVersion(client));

+}

+

+void

+SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply *rep)

+{

+    char n;

+    swaps(&rep->sequenceNumber, n);

+    swapl(&rep->length, n);

+    swaps(&rep->major_version, n);

+    swaps(&rep->minor_version, n);

+    WriteToClient(client, size, (char *)rep);

+}