hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-10 23:33:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'whot/for-keith'

Browse source
This commit is contained in:
Keith Packard 2012-11-05 17:16:07 -08:00
commit 011f845880
5 changed files with 129 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dix/devices.c
View file

@ -145,9 +145,11 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1)
return BadValue;
/* Don't allow disabling of VCP/VCK */
if ((dev == inputInfo.pointer ||dev ==
inputInfo.keyboard) &&!(*(CARD8 *) prop->data))
/* Don't allow disabling of VCP/VCK or XTest devices */
if ((dev == inputInfo.pointer ||
dev == inputInfo.keyboard ||
IsXTestDevice(dev, NULL))
&&!(*(CARD8 *) prop->data))
return BadAccess;
if (!checkonly) {