backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-06 11:57:00 +08:00
Code Issues Projects Releases Wiki Activity

merged 1.4 r1043:1044 into trunk

Browse Source
This commit is contained in:
Nick Bolton
2011-06-18 23:44:23 +00:00
parent 7f4138a376
commit 2fe11744cf
28 changed files with 1101 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/synergy/CKeyState.cpp
View File

@@ -583,7 +583,7 @@ CKeyState::fakeKeyDown(KeyID id, KeyModifierMask mask, KeyButton serverID)
fakeKeys(keys, 1);
}
void
bool
CKeyState::fakeKeyRepeat(
KeyID id, KeyModifierMask mask,
SInt32 count, KeyButton serverID)
@@ -593,7 +593,7 @@ CKeyState::fakeKeyRepeat(
// if we haven't seen this button go down then ignore it
KeyButton oldLocalID = m_serverKeys[serverID];
if (oldLocalID == 0) {
return;
return false;
}
// get keys for key repeat
@@ -603,11 +603,11 @@ CKeyState::fakeKeyRepeat(
m_keyMap.mapKey(keys, id, pollActiveGroup(), m_activeModifiers,
getActiveModifiersRValue(), mask, true);
if (keyItem == NULL) {
return;
return false;
}
KeyButton localID = (KeyButton)(keyItem->m_button & kButtonMask);
if (localID == 0) {
return;
return false;
}
// if the KeyButton for the auto-repeat is not the same as for the
@@ -642,15 +642,16 @@ CKeyState::fakeKeyRepeat(
// generate key events
fakeKeys(keys, count);
return true;
}
void
bool
CKeyState::fakeKeyUp(KeyButton serverID)
{
// if we haven't seen this button go down then ignore it
KeyButton localID = m_serverKeys[serverID & kButtonMask];
if (localID == 0) {
return;
return false;
}
// get the sequence of keys to simulate key release
@@ -682,6 +683,7 @@ CKeyState::fakeKeyUp(KeyButton serverID)
// generate key events
fakeKeys(keys, 1);
return true;
}
void