frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hutterer 2008-10-23 22:07:37 +10:30 committed by Michel Dänzer
parent 084ae9e388
commit 4c926dbac6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dix/devices.c
View File

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