diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
| commit | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch) | |
| tree | 3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/xkb/xkbActions.c | |
| parent | af64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff) | |
| parent | 87559ccfc67a98a75fa8068066871c35caa88e30 (diff) | |
| download | vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2 vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip | |
svn merge ^/branches/released .
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 44675c9fe..d631b3286 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;
|