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

Xi: don't allow VCP/VCK be OpenDevice'd, but allow all SDs.

Browse Source 
Reverting to traditional XI behaviour.
This commit is contained in:
Peter Hutterer 2008-11-28 09:38:49 +10:00
parent 7330cb5650
commit 9739fac045
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Xi/opendev.c
View File

@ -99,7 +99,6 @@ ProcXOpenDevice(ClientPtr client)
int status = Success;
xOpenDeviceReply rep;
DeviceIntPtr dev;
XIClientPtr pXIClient;
REQUEST(xOpenDeviceReq);
REQUEST_SIZE_MATCH(xOpenDeviceReq);
@ -115,14 +114,8 @@ ProcXOpenDevice(ClientPtr client)
} else if (status != Success)
return status;
/* Don't let XI 1.x clients open devices other than floating SDs. */
pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
if (pXIClient->major_version < XI_2_Major)
{
if (dev->isMaster || (!dev->isMaster && dev->u.master))
return BadDevice;
}
if (dev->isMaster)
return BadDevice;
OpenInputDevice(dev, client, &status);
if (status != Success)