From 1ae529bef50a8ccc4a8a264ed120aeae544b21e7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 14 Jan 2009 14:56:10 +1000 Subject: [PATCH] dix: replace manual check for event types with IsPointerEvent() --- dix/events.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dix/events.c b/dix/events.c index da57aa093..a042089ab 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3592,14 +3592,9 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev, * for the type of event, to see if we really want to deliver it to * the focus window. For pointer events, the answer is no. */ - if (xE->u.u.type == DeviceButtonPress || - xE->u.u.type == DeviceButtonRelease || - xE->u.u.type == DeviceMotionNotify || - xE->u.u.type == ProximityIn || - xE->u.u.type == ProximityOut) - { + if (IsPointerEvent(xE)) focus = PointerRootWin; - } else if (thisDev->focus) + else if (thisDev->focus) { focus = thisDev->focus->win; if (focus == FollowKeyboardWin)