summaryrefslogtreecommitdiff
path: root/dix/devices.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-02-23 15:12:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-20 15:17:55 +1000
commitdfa2e8e966b699f9d292628119d5a9cbd2dbdf5a (patch)
treef5f5b1ad367a69f56545a0ec3c454fa47e291745 /dix/devices.c
parent560c58b53e4e60ebd26e0c66dd00399c438bd619 (diff)
Xi: add XIQueryDevice request handling.
Diffstat (limited to 'dix/devices.c')
-rw-r--r--dix/devices.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 97b47bc27..ca0da070a 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -78,7 +78,7 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>
#include "exglobals.h"
#include "exevents.h"
-#include "listdev.h" /* for CopySwapXXXClass */
+#include "querydev.h" /* for SizeDeviceClasses */
#include "xiproperty.h"
#include "enterleave.h" /* for EnterWindow() */
#include "xserver-properties.h"
@@ -274,7 +274,6 @@ EnableDevice(DeviceIntPtr dev)
DeviceIntPtr *prev;
int ret;
DeviceIntPtr other;
- int namelen = 0; /* dummy */
int evsize = sizeof(xEvent);
int listlen;
EventListPtr evlist;
@@ -316,7 +315,7 @@ EnableDevice(DeviceIntPtr dev)
* device
*/
- SizeDeviceInfo(dev, &namelen, &evsize);
+ evsize += SizeDeviceClasses(dev);
listlen = GetEventList(&evlist);
OsBlockSignals();