summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-04-02 11:20:44 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-04-02 11:20:44 +0930
commita12054757d21edacc1c24c3077b9214726652829 (patch)
tree96474238cf45bcefa48b65eff7782447e6baf083
parent63d8f01819ef44ea3bf0d4fb20ba1d698ae91cd2 (diff)
Xi: fix ProcXListInputDevices to include the virtual core devices.
-rw-r--r--Xi/listdev.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/Xi/listdev.c b/Xi/listdev.c
index 02d55ad4c..33266ae4c 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -116,6 +116,10 @@ ProcXListInputDevices(register ClientPtr client)
AddOtherInputDevices();
+ SizeDeviceInfo(inputInfo.keyboard, &namesize, &size);
+ SizeDeviceInfo(inputInfo.pointer, &namesize, &size);
+ numdevs = 2;
+
for (d = inputInfo.devices; d; d = d->next) {
SizeDeviceInfo(d, &namesize, &size);
numdevs++;
@@ -132,6 +136,11 @@ ProcXListInputDevices(register ClientPtr client)
savbuf = devbuf;
dev = (xDeviceInfoPtr) devbuf;
+ ListDeviceInfo(client, inputInfo.keyboard, dev++,
+ &devbuf, &classbuf, &namebuf);
+ ListDeviceInfo(client, inputInfo.pointer, dev++,
+ &devbuf, &classbuf, &namebuf);
+
for (d = inputInfo.devices; d; d = d->next, dev++)
ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf);
for (d = inputInfo.off_devices; d; d = d->next, dev++)