dix: Simplify retrieving the master device.
GetMaster() returns NULL for floating slaves. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
This commit is contained in:
parent
dc32a23890
commit
77af45ebc3
|
@ -4277,7 +4277,7 @@ DeviceEnterLeaveEvent(
|
|||
if (BitIsOn(mouse->button->down, i))
|
||||
SetBit(&event[1], i);
|
||||
|
||||
kbd = (IsMaster(mouse) || mouse->u.master) ? GetPairedDevice(mouse) : NULL;
|
||||
kbd = GetMaster(mouse, MASTER_KEYBOARD);
|
||||
if (kbd && kbd->key)
|
||||
{
|
||||
event->mods.base_mods = kbd->key->xkbInfo->state.base_mods;
|
||||
|
|
Loading…
Reference in New Issue