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/xkbUtils.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/xkbUtils.c')
| -rw-r--r-- | xorg-server/xkb/xkbUtils.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c index b0e643e62..9db94773f 100644 --- a/xorg-server/xkb/xkbUtils.c +++ b/xorg-server/xkb/xkbUtils.c @@ -2094,3 +2094,29 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode) return effectiveGroup;
}
+
+/* Merge the lockedPtrButtons from all attached SDs for the given master
+ * device into the MD's state.
+ */
+void
+XkbMergeLockedPtrBtns(DeviceIntPtr master)
+{
+ DeviceIntPtr d = inputInfo.devices;
+ XkbSrvInfoPtr xkbi = NULL;
+
+ if (!IsMaster(master))
+ return;
+
+ if (!master->key)
+ return;
+
+ xkbi = master->key->xkbInfo;
+ xkbi->lockedPtrButtons = 0;
+
+ for (; d; d = d->next) {
+ if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key)
+ continue;
+
+ xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons;
+ }
+}
|