From 77af45ebc3eda32dc534968cab8d5adfb01bd9e3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 11 Feb 2011 12:48:30 +1000 Subject: [PATCH] dix: Simplify retrieving the master device. GetMaster() returns NULL for floating slaves. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- dix/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index 07f8b05ea..4826781d7 100644 --- a/dix/events.c +++ b/dix/events.c @@ -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;