xserver: Branch 'mpx' - 2 commits

[Peter Hutterer]

 dix/events.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 20ace6321ac464d821c67a82c7023f74ae038176
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon Jan 7 20:08:56 2008 +1030

    dix: don't try to confine cursor on screen restructure if there is no cursor.
    
    Stops segfaulting when using xrandr. Yay.

diff --git a/dix/events.c b/dix/events.c
index 2872bf8..0ce07d5 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1481,6 +1481,8 @@ ScreenRestructured (ScreenPtr pScreen)
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
     {
+        if (!DevHasCursor(pDev))
+            continue;
 
         /* GrabDevice doesn't have a confineTo field, so we don't need to
          * worry about it. */
commit 57a491e6d3ebec464c0c861b02c9ddcb1cc62c3c
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon Jan 7 20:06:32 2008 +1030

    dix: init GrabPrivateKey to correct value.
    
    Merge detritus from last pull.

diff --git a/dix/events.c b/dix/events.c
index d2309eb..2872bf8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1538,7 +1538,7 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
 }
 
 /* Only ever used if a grab is called on an attached slave device. */
-static DevPrivateKey GrabPrivateKey = -1;
+static DevPrivateKey GrabPrivateKey = &GrabPrivateKey;
 typedef struct _GrabMemoryRec {
     DeviceIntPtr oldmaster;
 } GrabMemoryRec, *GrabMemoryPtr;