[PATCH 04/20] mi: simplify a "check for keyboard" condition

Peter Hutterer peter.hutterer at who-t.net
Thu Feb 17 19:52:11 PST 2011


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 mi/mipointer.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 124f9de..aa0ca6d 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -193,8 +193,7 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     miPointerPtr pPointer;
 
     /* return for keyboards */
-    if ((IsMaster(pDev) && !DevHasCursor(pDev)) ||
-        (!IsMaster(pDev) && pDev->u.master && !DevHasCursor(pDev->u.master)))
+    if (!IsPointerDevice(pDev))
             return FALSE;
 
     pPointer = MIPOINTER(pDev);
-- 
1.7.4



More information about the xorg-devel mailing list