rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

replaced True/False with true/false when assigning to m_repeat. 

also should now work if the first element of a modifier
keymapping is 0.  that won't normally be the case but xmodmap
was doing weird things on grace.  if the first element is 0
it'll try the second element.  if that's also zero then that
modifier will be ignored.
This commit is contained in:
crs 2002-05-05 19:52:03 +00:00
parent 7ebaab42e0
commit f8f1fb4041
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
client/CXWindowsSecondaryScreen.cpp
View File

@ -468,17 +468,20 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
// be at least one. // be at least one.
const KeyCode* modifierKeys = const KeyCode* modifierKeys =
&m_modifierToKeycode[i * m_keysPerModifier]; &m_modifierToKeycode[i * m_keysPerModifier];
KeyCode modifierKey = modifierKeys[0];
if (modifierKey == 0)
modifierKey = modifierKeys[1];
assert(modifierKeys[0] != 0); assert(modifierKeys[0] != 0);
if ((outMask & bit) != 0) { if (modifierKey != 0 && (outMask & bit) != 0) {
// modifier is not active but should be. if the // modifier is not active but should be. if the
// modifier is a toggle then toggle it on with a // modifier is a toggle then toggle it on with a
// press/release, otherwise activate it with a // press/release, otherwise activate it with a
// press. use the first keycode for the modifier. // press. use the first keycode for the modifier.
log((CLOG_DEBUG2 "modifier 0x%04x is not active", bit)); log((CLOG_DEBUG2 "modifier 0x%04x is not active", bit));
keystroke.m_keycode = modifierKeys[0]; keystroke.m_keycode = modifierKey;
keystroke.m_press = True; keystroke.m_press = True;
keystroke.m_repeat = False; keystroke.m_repeat = false;
keys.push_back(keystroke); keys.push_back(keystroke);
if ((bit & m_toggleModifierMask) != 0) { if ((bit & m_toggleModifierMask) != 0) {
log((CLOG_DEBUG2 "modifier 0x%04x is a toggle", bit)); log((CLOG_DEBUG2 "modifier 0x%04x is a toggle", bit));
@ -501,7 +504,7 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
} }
} }
else { else if ((outMask & bit) == 0) {
// modifier is active but should not be. if the // modifier is active but should not be. if the
// modifier is a toggle then toggle it off with a // modifier is a toggle then toggle it off with a
// press/release, otherwise deactivate it with a // press/release, otherwise deactivate it with a
@ -509,33 +512,37 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
// modifier if not a toggle. // modifier if not a toggle.
log((CLOG_DEBUG2 "modifier 0x%04x is active", bit)); log((CLOG_DEBUG2 "modifier 0x%04x is active", bit));
if ((bit & m_toggleModifierMask) != 0) { if ((bit & m_toggleModifierMask) != 0) {
log((CLOG_DEBUG2 "modifier 0x%04x is a toggle", bit)); if (modifierKey != 0) {
keystroke.m_keycode = modifierKeys[0]; log((CLOG_DEBUG2 "modifier 0x%04x is a toggle", bit));
keystroke.m_repeat = False; keystroke.m_keycode = modifierKey;
if ((bit == m_capsLockMask && m_capsLockHalfDuplex) || keystroke.m_repeat = false;
(bit == m_numLockMask && m_numLockHalfDuplex)) { if ((bit == m_capsLockMask &&
keystroke.m_press = False; m_capsLockHalfDuplex) ||
keys.push_back(keystroke); (bit == m_numLockMask &&
keystroke.m_press = True; m_numLockHalfDuplex)) {
undo.push_back(keystroke); keystroke.m_press = False;
} keys.push_back(keystroke);
else { keystroke.m_press = True;
keystroke.m_press = True; undo.push_back(keystroke);
keys.push_back(keystroke); }
keystroke.m_press = False; else {
keys.push_back(keystroke); keystroke.m_press = True;
undo.push_back(keystroke); keys.push_back(keystroke);
keystroke.m_press = True; keystroke.m_press = False;
undo.push_back(keystroke); keys.push_back(keystroke);
undo.push_back(keystroke);
keystroke.m_press = True;
undo.push_back(keystroke);
}
} }
} }
else { else {
for (unsigned int j = 0; j < m_keysPerModifier; ++j) { for (unsigned int j = 0; j < m_keysPerModifier; ++j) {
const KeyCode key = modifierKeys[j]; const KeyCode key = modifierKeys[j];
if (m_keys[key]) { if (key != 0 && m_keys[key]) {
keystroke.m_keycode = key; keystroke.m_keycode = key;
keystroke.m_press = False; keystroke.m_press = False;
keystroke.m_repeat = False; keystroke.m_repeat = false;
keys.push_back(keystroke); keys.push_back(keystroke);
keystroke.m_press = True; keystroke.m_press = True;
undo.push_back(keystroke); undo.push_back(keystroke);
@ -557,19 +564,19 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
switch (action) { switch (action) {
case kPress: case kPress:
keystroke.m_press = True; keystroke.m_press = True;
keystroke.m_repeat = False; keystroke.m_repeat = false;
keys.push_back(keystroke); keys.push_back(keystroke);
break; break;
case kRelease: case kRelease:
keystroke.m_press = False; keystroke.m_press = False;
keystroke.m_repeat = False; keystroke.m_repeat = false;
keys.push_back(keystroke); keys.push_back(keystroke);
break; break;
case kRepeat: case kRepeat:
keystroke.m_press = False; keystroke.m_press = False;
keystroke.m_repeat = True; keystroke.m_repeat = true;
keys.push_back(keystroke); keys.push_back(keystroke);
keystroke.m_press = True; keystroke.m_press = True;
keys.push_back(keystroke); keys.push_back(keystroke);
@ -608,7 +615,7 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
const KeyCode* modifierKeys = &m_modifierToKeycode[ const KeyCode* modifierKeys = &m_modifierToKeycode[
index->second * m_keysPerModifier]; index->second * m_keysPerModifier];
for (unsigned int j = 0; !down && j < m_keysPerModifier; ++j) { for (unsigned int j = 0; !down && j < m_keysPerModifier; ++j) {
if (m_keys[modifierKeys[j]]) if (modifierKeys[j] != 0 && m_keys[modifierKeys[j]])
down = true; down = true;
} }
if (!down) if (!down)