diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
| commit | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (patch) | |
| tree | 0e3b50cb6bcd0839b591d318a41d04b7cbd8e6e2 /xorg-server/xkb/xkbAccessX.c | |
| parent | 79409465b0b8d5d38e6b94deb1943316f40c66eb (diff) | |
| parent | 0a5888393c68f6f7db86206d1f277232db18240b (diff) | |
| download | vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.gz vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.bz2 vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkbAccessX.c')
| -rw-r--r-- | xorg-server/xkb/xkbAccessX.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkb/xkbAccessX.c b/xorg-server/xkb/xkbAccessX.c index 70b1c6013..7c6f0bed6 100644 --- a/xorg-server/xkb/xkbAccessX.c +++ b/xorg-server/xkb/xkbAccessX.c @@ -694,7 +694,7 @@ ProcessInputProc backupproc; xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
DeviceEvent *event = &ev->device_event;
- dev = (IsMaster(mouse) || mouse->u.master) ? GetMaster(mouse, MASTER_KEYBOARD) : mouse;
+ dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
if (dev && dev->key)
{
|