xserver: Branch 'server-1.7-nominations'

[Peter Hutterer]

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

New commits:
commit e116bebb1324c5cdb806a70683ca747321c536b0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Oct 13 13:15:05 2009 +1000

    dix: extend IsPointerDevice check to valuator-only devices.
    
    A device with valuators but no keys is definitely a pointer device and needs
    to be attached to the VCP. Otherwise, the class copying happens on the VCK
    and the VCP isn't updated with the events that are to be sent through it.
    This addresses the trigger for #24441, not the actual issue.
    Jury is still out on valuator+key devices.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 72f5874434c0c015b671c492c1318f35f1793668)

diff --git a/dix/events.c b/dix/events.c
index d60b8a5..8f63d33 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -345,7 +345,9 @@ DevHasCursor(DeviceIntPtr pDev)
 Bool
 IsPointerDevice(DeviceIntPtr dev)
 {
-    return (dev->type == MASTER_POINTER) || (dev->valuator && dev->button);
+    return (dev->type == MASTER_POINTER) ||
+            (dev->valuator && dev->button) ||
+            (dev->valuator && !dev->key);
 }
 
 /*