xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 dix/events.c                |   13 -------------
 hw/kdrive/ephyr/ephyrinit.c |    2 ++
 hw/kdrive/src/kinput.c      |    6 +++---
 mi/miinitext.c              |    2 --
 4 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit f79ad5674ed41c3626e8055cd2bac0135de928c6
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Sat May 31 18:46:35 2008 +0930

    kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 005465f..5c686b6 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1981,7 +1981,7 @@ KdReleaseAllKeys (void)
                 GetEventList(&kdEvents);
                 nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);
                 for (i = 0; i < nEvents; i++)
-                    KdQueueEvent (ki->dixdev, kdEvents + i);
+                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);
             }
         }
     }
@@ -2046,7 +2046,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
         GetEventList(&kdEvents);
         nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
         for (i = 0; i < nEvents; i++)
-            KdQueueEvent(ki->dixdev, kdEvents);
+            KdQueueEvent(ki->dixdev, (kdEvents + i)->event);
     }
     else {
         ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",
@@ -2148,7 +2148,7 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
     nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel,
                                0, 3, valuators);
     for (i = 0; i < nEvents; i++)
-        KdQueueEvent(pi->dixdev, kdEvents + i);
+        KdQueueEvent(pi->dixdev, (kdEvents + i)->event);
 }
 
 void
commit 58d12c99abc4d06cb8b43386d4bcd126f0bedf83
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Sat May 31 18:45:11 2008 +0930

    mi: Remove #ifdef XINPUT, kdrive otherwise won't get events.

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 94becd2..3740daa 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -475,9 +475,7 @@ InitExtensions(int argc, char *argv[])
 #ifdef MULTIBUFFER
     if (!noMultibufferExtension) MultibufferExtensionInit();
 #endif
-#if defined(XINPUT)
     if (!noXInputExtension) XInputExtensionInit();
-#endif
 #ifdef XTEST
     if (!noTestExtensions) XTestExtensionInit();
 #endif
commit 942086fc965fc9a24be2db4f537f0ff54db51083
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Sat May 31 18:17:49 2008 +0930

    dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it

diff --git a/dix/events.c b/dix/events.c
index 73b7fa0..cec12f0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5410,7 +5410,6 @@ ProcQueryPointer(ClientPtr client)
     xQueryPointerReply rep;
     WindowPtr pWin, t;
     DeviceIntPtr mouse = PickPointer(client);
-    DeviceIntPtr dev;
     SpritePtr pSprite;
     int rc;
     REQUEST(xResourceReq);
@@ -5423,18 +5422,6 @@ ProcQueryPointer(ClientPtr client)
     if (rc != Success)
 	return rc;
 
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-        if (dev->isMaster && IsPointerDevice(dev) &&
-                dev->deviceGrab.grab && dev->deviceGrab.grab->coreGrab &&
-                SameClient(dev->deviceGrab.grab, client))
-        {
-            /* special case, we have a grab on the device so we need to return
-             * this one */
-            mouse = dev;
-        }
-    }
-
     pSprite = mouse->spriteInfo->sprite;
     if (mouse->valuator->motionHintWindow)
 	MaybeStopHint(mouse, client);
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index d415fe7..e00791c 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -295,6 +295,8 @@ miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
 	ephyrUnrealizeCursor,
 	ephyrSetCursor,
 	ephyrMoveCursor,
+        NULL,
+        NULL
 };