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

fixed caps-lock handling.

This commit is contained in:
crs 2002-05-04 19:43:20 +00:00
parent 2dad59a027
commit 2d7e3e8a61
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client/CXWindowsSecondaryScreen.cpp
View File

@ -590,12 +590,6 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
// get modifier // get modifier
const unsigned int modifierBit = (1 << index->second); const unsigned int modifierBit = (1 << index->second);
/* FIXME -- old comment
// toggle keys modify the state on press if toggling on and on
// release if toggling off. other keys set the bit on press
// and clear the bit on release. if half-duplex then toggle
// each time we get here.
*/
// toggle keys modify the state on release. other keys set the // toggle keys modify the state on release. other keys set the
// bit on press and clear the bit on release. if half-duplex // bit on press and clear the bit on release. if half-duplex
// then toggle each time we get here. // then toggle each time we get here.
@ -603,10 +597,6 @@ KeyModifierMask CXWindowsSecondaryScreen::mapKey(
if (isHalfDuplex || action == kRelease) { if (isHalfDuplex || action == kRelease) {
mask ^= modifierBit; mask ^= modifierBit;
} }
/* FIXME -- supposed to toggle on on press and off on release but does it?
if (((mask & modifierBit) == 0) == (action == kPress))
mask ^= modifierBit;
*/
} }
else if (action == kPress) { else if (action == kPress) {
mask |= modifierBit; mask |= modifierBit;
@ -722,15 +712,21 @@ bool CXWindowsSecondaryScreen::findKeyCode(
maskOut = (maskIn & ~index->second.m_keyMaskMask); maskOut = (maskIn & ~index->second.m_keyMaskMask);
log((CLOG_DEBUG2 "maskIn(0x%04x) & ~maskMask(0x%04x) -> 0x%04x", maskIn, index->second.m_keyMaskMask, maskOut)); log((CLOG_DEBUG2 "maskIn(0x%04x) & ~maskMask(0x%04x) -> 0x%04x", maskIn, index->second.m_keyMaskMask, maskOut));
if (IsKeypadKey(id) || IsPrivateKeypadKey(id)) { if (IsKeypadKey(id) || IsPrivateKeypadKey(id)) {
if ((m_mask & m_numLockMask) != 0) {
maskOut &= ~index->second.m_keyMask;
maskOut |= m_numLockMask;
log((CLOG_DEBUG2 "keypad key: & ~mask(0x%04x) | numLockMask(0x%04x) -> 0x%04x", index->second.m_keyMask, m_numLockMask, maskOut));
}
else {
maskOut |= index->second.m_keyMask; maskOut |= index->second.m_keyMask;
maskOut &= ~m_numLockMask; maskOut &= ~m_numLockMask;
log((CLOG_DEBUG2 "keypad key: | mask(0x%04x) & ~numLockMask(0x%04x) -> 0x%04x", index->second.m_keyMask, m_numLockMask, maskOut)); log((CLOG_DEBUG2 "keypad key: | mask(0x%04x) & ~numLockMask(0x%04x) -> 0x%04x", index->second.m_keyMask, m_numLockMask, maskOut));
} }
}
else { else {
unsigned int maskShift = (index->second.m_keyMask & ShiftMask); unsigned int maskShift = (index->second.m_keyMask & ShiftMask);
log((CLOG_DEBUG2 "maskShift = 0x%04x", maskShift)); log((CLOG_DEBUG2 "maskShift = 0x%04x", maskShift));
if (index->second.m_keyMaskMask != 0 && if (maskShift != 0 && (m_mask & m_capsLockMask) != 0) {
(m_mask & m_capsLockMask) != 0) {
// shift and capsLock cancel out for keysyms subject to // shift and capsLock cancel out for keysyms subject to
// case conversion but not for keys with shifted // case conversion but not for keys with shifted
// characters that are not case conversions. see if // characters that are not case conversions. see if
@ -738,13 +734,18 @@ bool CXWindowsSecondaryScreen::findKeyCode(
KeySym lKey, uKey; KeySym lKey, uKey;
XConvertCase(id, &lKey, &uKey); XConvertCase(id, &lKey, &uKey);
if (lKey != uKey) { if (lKey != uKey) {
maskShift ^= ShiftMask; log((CLOG_DEBUG2 "case convertable, shift && capsLock -> caps lock"));
log((CLOG_DEBUG2 "maskMask != 0 && capsLock on -> toggle maskShift 0x%04x", maskShift)); maskShift = m_capsLockMask;
}
else {
log((CLOG_DEBUG2 "case unconvertable, shift && capsLock -> shift, caps lock"));
maskShift |= m_capsLockMask;
} }
} }
maskOut |= maskShift | (m_mask & m_capsLockMask); log((CLOG_DEBUG2 "maskShift = 0x%04x", maskShift));
maskOut |= maskShift;
maskOut |= (index->second.m_keyMask & ~(ShiftMask | LockMask)); maskOut |= (index->second.m_keyMask & ~(ShiftMask | LockMask));
log((CLOG_DEBUG2 "| maskShift(0x%04x) | old caps lock(0x%04x) | other (0x%04x) -> 0x%04x", maskShift, (m_mask & m_capsLockMask), (index->second.m_keyMask & ~(ShiftMask | LockMask)), maskOut)); log((CLOG_DEBUG2 "| maskShift(0x%04x) | other (0x%04x) -> 0x%04x", maskShift, (index->second.m_keyMask & ~(ShiftMask | LockMask)), maskOut));
} }
return true; return true;