xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 Xi/querydp.c  |    6 ++++--
 dix/devices.c |    3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 139c3ab7b754dc425a09d5f7b6d2a8fb2b88138a
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Aug 12 17:49:49 2008 +0930

    Xi: return the state from the correct keyboard in QueryDevicePointer.

diff --git a/Xi/querydp.c b/Xi/querydp.c
index d63bed1..744a295 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -72,7 +72,7 @@ ProcXQueryDevicePointer(ClientPtr client)
 {
     int rc;
     xQueryDevicePointerReply rep;
-    DeviceIntPtr pDev;
+    DeviceIntPtr pDev, kbd;
     WindowPtr pWin, t;
     SpritePtr pSprite;
 
@@ -100,12 +100,14 @@ ProcXQueryDevicePointer(ClientPtr client)
     if (pDev->valuator->motionHintWindow)
         MaybeStopHint(pDev, client);
 
+    kbd = GetPairedDevice(pDev);
+
     pSprite = pDev->spriteInfo->sprite;
     rep.repType = X_Reply;
     rep.RepType = X_QueryDevicePointer;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.mask = pDev->button->state | inputInfo.keyboard->key->state;
+    rep.mask = pDev->button->state | (kbd && kbd->key) ? kbd->key->state : 0;
     rep.root = (GetCurrentRootWindow(pDev))->drawable.id;
     rep.rootX = pSprite->hot.x;
     rep.rootY = pSprite->hot.y;
commit 998375f4154b000f75b2bafd4e276c0237d24dc7
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Aug 12 17:49:16 2008 +0930

    dix: remove superfluous check.

diff --git a/dix/devices.c b/dix/devices.c
index 7519e06..2225e08 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2640,9 +2640,6 @@ GetPairedDevice(DeviceIntPtr dev)
     if (!dev->isMaster && dev->u.master)
         dev = dev->u.master;
 
-    if (!dev->spriteInfo->paired)
-        return NULL;
-
     return dev->spriteInfo->paired;
 }