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

Xi: return all master devices as type IsXPointer/Keyboard when listing devs. 

Slave devices are reported as IsXExtensionPointer/Keyboard.
This commit is contained in:
Peter Hutterer 2007-10-19 11:28:44 +09:30
parent 9aadde3779
commit cfcc6e14b9
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xi/listdev.c
View File

@ -177,9 +177,9 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
dev->id = d->id; dev->id = d->id;
dev->type = d->type; dev->type = d->type;
dev->num_classes = num_classes; dev->num_classes = num_classes;
if (d == inputInfo.keyboard) if (d->isMaster && IsKeyboardDevice(d))
dev->use = IsXKeyboard; dev->use = IsXKeyboard;
else if (d == inputInfo.pointer) else if (d->isMaster && IsPointerDevice(d))
dev->use = IsXPointer; dev->use = IsXPointer;
else if (d->key && d->kbdfeed) else if (d->key && d->kbdfeed)
dev->use = IsXExtensionKeyboard; dev->use = IsXExtensionKeyboard;
@ -328,10 +328,6 @@ ProcXListInputDevices(ClientPtr client)
AddOtherInputDevices(); AddOtherInputDevices();
SizeDeviceInfo(inputInfo.keyboard, &namesize, &size);
SizeDeviceInfo(inputInfo.pointer, &namesize, &size);
numdevs = 2;
for (d = inputInfo.devices; d; d = d->next) { for (d = inputInfo.devices; d; d = d->next) {
SizeDeviceInfo(d, &namesize, &size); SizeDeviceInfo(d, &namesize, &size);
numdevs++; numdevs++;
@ -348,11 +344,6 @@ ProcXListInputDevices(ClientPtr client)
savbuf = devbuf; savbuf = devbuf;
dev = (xDeviceInfoPtr) 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++) for (d = inputInfo.devices; d; d = d->next, dev++)
ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf); ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf);
for (d = inputInfo.off_devices; d; d = d->next, dev++) for (d = inputInfo.off_devices; d; d = d->next, dev++)