diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-04 16:20:49 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-04 16:20:49 +0000 |
| commit | 840f23bc506c991216214aa4cfc87978ef739a77 (patch) | |
| tree | 3c88f8bea334c218a879322d6c60e14b4977e7d2 /xorg-server/Xi | |
| parent | b50a4f12cd633b412387c4cddc0adbb45256acfe (diff) | |
| parent | 41c64098a90b4e974d5005a1619472f2e8a64ea1 (diff) | |
| download | vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.gz vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.bz2 vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/listdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/Xi/listdev.c b/xorg-server/Xi/listdev.c index 52fc85f57..d84dcd8d9 100644 --- a/xorg-server/Xi/listdev.c +++ b/xorg-server/Xi/listdev.c @@ -180,10 +180,10 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes, dev->use = IsXKeyboard;
else if (IsMaster(d) && IsPointerDevice(d))
dev->use = IsXPointer;
- else if (d->key && d->kbdfeed)
- dev->use = IsXExtensionKeyboard;
else if (d->valuator && d->button)
dev->use = IsXExtensionPointer;
+ else if (d->key && d->kbdfeed)
+ dev->use = IsXExtensionKeyboard;
else
dev->use = IsXExtensionDevice;
|