diff options
author | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
commit | 9dbe22229a8031aa2f6d922896e1b6539441b7b5 (patch) | |
tree | bd567f1d98f9431b4963dc3d0b05aea8ac78a1b6 /xorg-server/dix | |
parent | 07d4e6e86e3167bed18d2af81a56f3d9352d2541 (diff) | |
parent | 7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff) | |
download | vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.gz vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.bz2 vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/dix')
-rw-r--r-- | xorg-server/dix/events.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index d60b8a534..8f63d3381 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/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); } /* |