fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-28 06:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dix: IsFloating() on master devices is always false

Browse source 
There are a few subtle bugs during startup where IsFloating() returns true
if the device is a master device that is not yet paired with its keyboard
device.

Force IsFloating() to always return FALSE for master devices, that was the
intent after all and any code that relies on the other behaviour should be
fixed instead.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit 5497ce3da4)
This commit is contained in:
Peter Hutterer 2012-02-20 12:09:33 +10:00
parent 38e73f7fc2
commit d75da4eccb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dix/events.c
View file

@ -341,7 +341,7 @@ IsMaster(DeviceIntPtr dev)
Bool
IsFloating(DeviceIntPtr dev)
{
return GetMaster(dev, MASTER_KEYBOARD) == NULL;
return !IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == NULL;
}
/**