Commit 5497ce3d authored by Peter Hutterer's avatar Peter Hutterer

dix: IsFloating() on master devices is always false

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's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon Turney's avatarJon TURNEY <jon.turney@dronecode.org.uk>
parent 2c23ef83
......@@ -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;
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment