fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-05 01:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xi: When attaching, check for ptr -> ptr and keybd -> keybd.

Browse source 
Some pointer devices have key classes (e.g. MS Optical Desktop 2000). The
previous test was performed as Error if ptr -> keybd or keybd -> ptr. This
doesnt work with such devices. New test is Succeed if ptr->ptr or
keybd->keybd.
This commit is contained in:
Peter Hutterer 2008-04-10 08:08:54 +09:30
parent 389dae73cc
commit e7211eb0b3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Xi/chdevhier.c
View file

@ -272,10 +272,10 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
goto unwind;
}
if ((IsPointerDevice(newmaster) &&
!IsPointerDevice(ptr)) ||
if (!((IsPointerDevice(newmaster) &&
IsPointerDevice(ptr)) ||
(IsKeyboardDevice(newmaster) &&
!IsKeyboardDevice(ptr)))
IsKeyboardDevice(ptr))))
{
rc = BadDevice;
goto unwind;