diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-01 06:37:06 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-01 06:37:06 +0000 |
| commit | 87559ccfc67a98a75fa8068066871c35caa88e30 (patch) | |
| tree | 2bf313d2ae1adb6840cff8e62ccce5f984af142a /xorg-server/xkb/xkbActions.c | |
| parent | 644d0b3793014483679c9ae0d45a972484c10cb9 (diff) | |
| download | vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.gz vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.bz2 vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.zip | |
git update 1/7/2010
Diffstat (limited to 'xorg-server/xkb/xkbActions.c')
| -rw-r--r-- | xorg-server/xkb/xkbActions.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index 48eeeb772..1274f4871 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -633,6 +633,16 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, break;
}
xkbi->lockedPtrButtons&= ~(1<<button);
+
+ if (IsMaster(xkbi->device))
+ {
+ XkbMergeLockedPtrBtns(xkbi->device);
+ /* One SD still has lock set, don't post event */
+ if ((xkbi->lockedPtrButtons & (1 << button)) != 0)
+ break;
+ }
+
+ /* fallthrough */
case XkbSA_PtrBtn:
XkbFakeDeviceButton(xkbi->device, 0, button);
break;
|