xserver: Branch 'master'

[Michel Dänzer]

 dix/devices.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4c926dbac65ceb699b91bb0d3fd0005a5854572d
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Thu Oct 23 22:07:37 2008 +1030

    dix: fix two more endian issues, correct initial "enabled" value. #18111
    
    EnableDevice and DisableDevice both change the property too.
    
    And enabled must be set to FALSE in AddInputDevice, the device is not enabled
    yet.
    
    X.Org Bug 18111 <https://bugs.freedesktop.org/show_bug.cgi?id=18111>

diff --git a/dix/devices.c b/dix/devices.c
index 1100a29..3f6d560 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -189,7 +189,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
     *prev = dev;
     dev->next = NULL;
 
-    enabled = TRUE;
+    enabled = FALSE;
     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
                            XA_INTEGER, 8, PropModeReplace, 1, &enabled,
                            FALSE);
@@ -223,6 +223,7 @@ EnableDevice(DeviceIntPtr dev)
     int evsize  = sizeof(xEvent);
     int listlen;
     EventListPtr evlist;
+    BOOL enabled;
 
     for (prev = &inputInfo.off_devices;
 	 *prev && (*prev != dev);
@@ -281,8 +282,9 @@ EnableDevice(DeviceIntPtr dev)
     *prev = dev;
     dev->next = NULL;
 
+    enabled = TRUE;
     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
-                           XA_INTEGER, 8, PropModeReplace, 1, &dev->enabled,
+                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,
                            TRUE);
 
     ev.type = DevicePresenceNotify;
@@ -312,6 +314,7 @@ DisableDevice(DeviceIntPtr dev)
     DeviceIntPtr *prev, other;
     DeviceIntRec dummyDev;
     devicePresenceNotify ev;
+    BOOL enabled;
 
     for (prev = &inputInfo.devices;
 	 *prev && (*prev != dev);
@@ -357,8 +360,9 @@ DisableDevice(DeviceIntPtr dev)
     dev->next = inputInfo.off_devices;
     inputInfo.off_devices = dev;
 
+    enabled = FALSE;
     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
-                           XA_INTEGER, 8, PropModeReplace, 1, &dev->enabled,
+                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,
                            TRUE);
 
     ev.type = DevicePresenceNotify;