Xi: remove ChangeDeviceControl for CoreCtl.
If you want to set a device to core, attach it to a master device.
This commit is contained in:
parent
18ff17756c
commit
2bbb12c355
15
Xi/chgdctl.c
15
Xi/chgdctl.c
|
@ -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 {
|
||||
/* 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];
|
||||
|
|
|
@ -2404,6 +2404,7 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
|
|||
return Success;
|
||||
|
||||
case DEVICE_CORE:
|
||||
return BadMatch;
|
||||
case DEVICE_ENABLE:
|
||||
return Success;
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user