andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xi: remove ChangeDeviceControl for CoreCtl.

Browse Source 
If you want to set a device to core, attach it to a master device.
This commit is contained in:
Peter Hutterer 2008-07-13 20:23:14 +09:30
parent 18ff17756c
commit 2bbb12c355
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Xi/chgdctl.c
View File

@ -245,20 +245,9 @@ ProcXChangeDeviceControl(ClientPtr client)
break;
case DEVICE_CORE:
c = (xDeviceCoreCtl *)&stuff[1];
status = ChangeDeviceControl(client, dev, (xDeviceCtl *) c);
if (status == Success) {
dev->coreEvents = c->status;
ret = Success;
} else if (status == DeviceBusy) {
rep.status = DeviceBusy;
ret = Success;
} else {
ret = BadMatch;
}
/* Sorry, no device core switching no more. If you want a device to
* send core events, attach it to a master device */
ret = BadMatch;
break;
case DEVICE_ENABLE:
e = (xDeviceEnableCtl *)&stuff[1];

1
hw/kdrive/src/kinput.c
View File

@ -2404,6 +2404,7 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
return Success;
case DEVICE_CORE:
return BadMatch;
case DEVICE_ENABLE:
return Success;

1
hw/xfree86/common/xf86Xinput.c
View File

@ -299,6 +299,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
if (!local->control_proc) {
switch (control->control) {
case DEVICE_CORE:
return BadMatch;
case DEVICE_RESOLUTION:
case DEVICE_ABS_CALIB:
case DEVICE_ABS_AREA: