diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2007-08-01 03:29:12 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2007-08-01 03:33:06 +0300 |
| commit | cd8e99e56ec5d02026e401cc15e0f8d75f2a4727 (patch) | |
| tree | a38c51d2de56625d81bb6de582560c95406a3921 | |
| parent | 0a31db14b7c7c21ef550dbcc73a9f649f3613cbe (diff) | |
Input: Don't enable devices when we open them
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them. Hurrah.
| -rw-r--r-- | Xi/opendev.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/Xi/opendev.c b/Xi/opendev.c index 4b7b6a64f..0b0671d49 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -98,7 +98,6 @@ int ProcXOpenDevice(ClientPtr client) { xInputClassInfo evbase[numInputClasses]; - Bool enableit = FALSE; int j = 0; int status = Success; xOpenDeviceReply rep; @@ -121,7 +120,6 @@ ProcXOpenDevice(ClientPtr client) SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); return Success; } - enableit = TRUE; } OpenInputDevice(dev, client, &status); @@ -129,8 +127,6 @@ ProcXOpenDevice(ClientPtr client) SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status); return Success; } - if (enableit && dev->inited && dev->startup) - (void)EnableDevice(dev); rep.repType = X_Reply; rep.RepType = X_OpenDevice; diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index dca4e3287..79422f725 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -204,17 +204,6 @@ OpenInputDevice(DeviceIntPtr dev, if (!dev->inited) ActivateDevice(dev); - if (!dev->public.on) { - if (EnableDevice(dev)) { - dev->startup = FALSE; - } - else { - ErrorF("couldn't enable device %s\n", dev->name); - *status = BadDevice; - return; - } - } - *status = Success; } |