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

- made unit testing easier by (mostly) removing the event queue singleton.

Browse Source 
- fixed code style in many places (mostly indentation).
This commit is contained in:
Nick Bolton
2013-06-29 14:17:49 +00:00
parent 13b2649fa0
commit 608074c041
143 changed files with 2220 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,8 +382,9 @@ static const KeyID s_numpadTable[] = {
// CKeyState
//
CKeyState::CKeyState() :
IKeyState(),
CKeyState::CKeyState(IEventQueue* events) :
IKeyState(events),
m_events(events),
m_mask(0),
m_keyMapPtr(new CKeyMap()),
m_keyMap(*m_keyMapPtr)
@@ -391,8 +392,9 @@ CKeyState::CKeyState() :
init();
}
CKeyState::CKeyState(IEventQueue& eventQueue, CKeyMap& keyMap) :
IKeyState(eventQueue),
CKeyState::CKeyState(IEventQueue* events, CKeyMap& keyMap) :
IKeyState(events),
m_events(events),
m_mask(0),
m_keyMapPtr(0),
m_keyMap(keyMap)
@@ -450,23 +452,23 @@ CKeyState::sendKeyEvent(
// ignore auto-repeat on half-duplex keys
}
else {
getEventQueue().addEvent(CEvent(getKeyDownEvent(), target,
m_events->addEvent(CEvent(m_events->forIKeyState().keyDown(), target,
CKeyInfo::alloc(key, mask, button, 1)));
getEventQueue().addEvent(CEvent(getKeyUpEvent(), target,
m_events->addEvent(CEvent(m_events->forIKeyState().keyUp(), target,
CKeyInfo::alloc(key, mask, button, 1)));
}
}
else {
if (isAutoRepeat) {
getEventQueue().addEvent(CEvent(getKeyRepeatEvent(), target,
m_events->addEvent(CEvent(m_events->forIKeyState().keyRepeat(), target,
CKeyInfo::alloc(key, mask, button, count)));
}
else if (press) {
getEventQueue().addEvent(CEvent(getKeyDownEvent(), target,
m_events->addEvent(CEvent(m_events->forIKeyState().keyDown(), target,
CKeyInfo::alloc(key, mask, button, 1)));
}
else {
getEventQueue().addEvent(CEvent(getKeyUpEvent(), target,
m_events->addEvent(CEvent(m_events->forIKeyState().keyUp(), target,
CKeyInfo::alloc(key, mask, button, 1)));
}
}