From c7b878b90406781c97db751a9b454e2b6baee0e1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 16 Oct 2007 15:07:31 +0930
Subject: [PATCH] dix: don't treat VCK/VCP separately in DevHasCursor,
 IsPointer/KeyboardDevice.

---
 dix/events.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 5bdf14552..50d06c465 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -322,7 +322,7 @@ XItoCoreType(int xitype)
 _X_EXPORT Bool
 DevHasCursor(DeviceIntPtr pDev) 
 {
-    return (pDev != inputInfo.pointer && pDev->spriteInfo->spriteOwner);
+    return pDev->spriteInfo->spriteOwner;
 }
 
 /*
@@ -332,7 +332,7 @@ DevHasCursor(DeviceIntPtr pDev)
 _X_EXPORT Bool
 IsPointerDevice(DeviceIntPtr dev)
 {
-    return ((dev->valuator && dev->button) || dev == inputInfo.pointer);
+    return (dev->valuator && dev->button);
 }
 
 /*
@@ -342,7 +342,7 @@ IsPointerDevice(DeviceIntPtr dev)
 _X_EXPORT Bool
 IsKeyboardDevice(DeviceIntPtr dev)
 {
-    return ((dev->key && dev->kbdfeed) || dev == inputInfo.keyboard);
+    return (dev->key && dev->kbdfeed);
 }
 
 #ifdef XEVIE