backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 12:53:53 +08:00
Code Issues Projects Releases Wiki Activity

Integrated some changes from 1.2 branch.

Browse Source
This commit is contained in:
crs
2005-01-26 19:01:53 +00:00
parent 42b4e2488a
commit 1bd227922e
3 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/platform/COSXKeyState.cpp
View File

@@ -315,8 +315,17 @@ COSXKeyState::mapKey(Keystrokes& keys, KeyID id,
// if the desired mask includes Alt or Control then match the
// desired mask. this ensures that combinations like
// Command+Shift+S use the Command and Shift modifiers and
// those like Command+S do not use the shift modifier.
if ((desiredMask & (KeyModifierControl | KeyModifierAlt)) != 0) {
// those like Command+S do not use the shift modifier. do not
// do this if the key to synthesize is a modifier key, otherwise
// we'd apply modifiers to modifiers which breaks things (by
// say, putting a Control press and release around a Control
// press).
if ((desiredMask & (KeyModifierControl | KeyModifierAlt)) != 0 &&
id != kKeyShift_L && id != kKeyShift_R &&
id != kKeyControl_L && id != kKeyControl_R &&
id != kKeyAlt_L && id != kKeyAlt_R &&
id != kKeySuper_L && id != kKeySuper_R &&
id != kKeyMeta_L && id != kKeyMeta_R) {
return addKeystrokes(keys, sequence.back().m_button,
desiredMask,
KeyModifierShift | KeyModifierSuper |