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

cleaned up osx keystate code that handles modifiers (really weird code).

This commit is contained in:
Nick Bolton 2014-03-17 18:39:27 +00:00
parent 826cd7e60b
commit 729bbeab01
2 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/lib/platform/OSXKeyState.cpp
View File

@ -182,7 +182,12 @@ static const CKeyEntry s_controlKeys[] = {
COSXKeyState::COSXKeyState(IEventQueue* events) : COSXKeyState::COSXKeyState(IEventQueue* events) :
CKeyState(events), CKeyState(events),
m_deadKeyState(0) m_deadKeyState(0),
m_shiftPressed(false),
m_controlPressed(false),
m_altPressed(false),
m_superPressed(false),
m_capsPressed(false)
{ {
init(); init();
} }
@ -201,13 +206,6 @@ COSXKeyState::~COSXKeyState()
void void
COSXKeyState::init() COSXKeyState::init()
{ {
// initialize modifier key values
shiftPressed = false;
controlPressed = false;
altPressed = false;
superPressed = false;
capsPressed = false;
// build virtual key map // build virtual key map
for (size_t i = 0; i < sizeof(s_controlKeys) / for (size_t i = 0; i < sizeof(s_controlKeys) /
sizeof(s_controlKeys[0]); ++i) { sizeof(s_controlKeys[0]); ++i) {
@ -488,47 +486,70 @@ COSXKeyState::fakeKey(const Keystroke& keystroke)
switch (keystroke.m_type) { switch (keystroke.m_type) {
case Keystroke::kButton: case Keystroke::kButton:
{ {
LOG((CLOG_DEBUG1 " %03x (%08x) %s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client, keystroke.m_data.m_button.m_press ? "down" : "up")); CGKeyCode keyCode = mapKeyButtonToVirtualKey(keystroke.m_data.m_button.m_button);
bool keyDown = keystroke.m_data.m_button.m_press;
CGEventSourceRef source = 0;
// let system figure out character for us LOG((CLOG_DEBUG1 " button=%03x keyCode=%03x keyDown=%s client=%08x",
ref = CGEventCreateKeyboardEvent(0, mapKeyButtonToVirtualKey( keystroke.m_data.m_button.m_button,
keystroke.m_data.m_button.m_button), keyCode,
keystroke.m_data.m_button.m_press); keyDown ? "down" : "up",
keystroke.m_data.m_button.m_client));
ref = CGEventCreateKeyboardEvent(source, keyCode, keystroke.m_data.m_button.m_press);
if (ref == NULL) { if (ref == NULL) {
LOG((CLOG_CRIT "unable to create keyboard event for keystroke")); LOG((CLOG_CRIT "unable to create keyboard event for keystroke"));
return;
} }
UInt32 vk = mapKeyButtonToVirtualKey(keystroke.m_data.m_button.m_button); // check if modifier and store the value for next time this function is called.
UInt32 modifierDown = keystroke.m_data.m_button.m_press; if (keyCode == s_shiftVK) {
m_shiftPressed = keyDown;
}
else if (keyCode == s_controlVK) {
m_controlPressed = keyDown;
}
else if (keyCode == s_altVK) {
m_altPressed = keyDown;
}
else if (keyCode == s_superVK) {
m_superPressed = keyDown;
}
else if (keyCode == s_capsLockVK) {
m_capsPressed = keyDown;
}
// check the key for specials and store the value (persistent until changed)
if (vk == s_shiftVK) shiftPressed=modifierDown;
if (vk == s_controlVK) controlPressed=modifierDown;
if (vk == s_altVK) altPressed=modifierDown;
if (vk == s_superVK) superPressed=modifierDown;
if (vk == s_capsLockVK) capsPressed=modifierDown;
//Set the event flags for special keys - see following link:
//http://stackoverflow.com/questions/2008126/cgeventpost-possible-bug-when-simulating-keyboard-events
CGEventFlags modifiers = 0; CGEventFlags modifiers = 0;
if (shiftPressed) modifiers |= kCGEventFlagMaskShift; if (m_shiftPressed) {
if (controlPressed) modifiers |= kCGEventFlagMaskControl; modifiers |= kCGEventFlagMaskShift;
if (altPressed) modifiers |= kCGEventFlagMaskAlternate; }
if (superPressed) modifiers |= kCGEventFlagMaskCommand; else if (m_controlPressed) {
if (capsPressed) modifiers |= kCGEventFlagMaskAlphaShift; modifiers |= kCGEventFlagMaskControl;
}
else if (m_altPressed) {
modifiers |= kCGEventFlagMaskAlternate;
}
else if (m_superPressed) {
modifiers |= kCGEventFlagMaskCommand;
}
else if (m_capsPressed) {
modifiers |= kCGEventFlagMaskAlphaShift;
}
LOG((CLOG_DEBUG1 " modifiers=%03x", modifiers));
// set the event flags for modifier keys, see: http://tinyurl.com/pxl742y
CGEventSetFlags(ref, modifiers); CGEventSetFlags(ref, modifiers);
CGEventPost(kCGHIDEventTap, ref); CGEventPost(kCGHIDEventTap, ref);
// add a delay if client data isn't zero // HACK: add a delay if client data isn't zero
if (keystroke.m_data.m_button.m_client) { if (keystroke.m_data.m_button.m_client) {
ARCH->sleep(0.01); ARCH->sleep(0.01);
} }
} }
break; break;
case Keystroke::kGroup: case Keystroke::kGroup: {
if (keystroke.m_data.m_group.m_absolute) { if (keystroke.m_data.m_group.m_absolute) {
LOG((CLOG_DEBUG1 " group %d", keystroke.m_data.m_group.m_group)); LOG((CLOG_DEBUG1 " group %d", keystroke.m_data.m_group.m_group));
setGroup(keystroke.m_data.m_group.m_group); setGroup(keystroke.m_data.m_group.m_group);
@ -541,6 +562,7 @@ COSXKeyState::fakeKey(const Keystroke& keystroke)
break; break;
} }
} }
}
void void
COSXKeyState::getKeyMapForSpecialKeys(CKeyMap& keyMap, SInt32 group) const COSXKeyState::getKeyMapForSpecialKeys(CKeyMap& keyMap, SInt32 group) const

11
src/lib/platform/OSXKeyState.h
View File

@ -215,10 +215,9 @@ private:
GroupList m_groups; GroupList m_groups;
GroupMap m_groupMap; GroupMap m_groupMap;
// Hold the current state of modifier keys bool m_shiftPressed;
bool shiftPressed; bool m_controlPressed;
bool controlPressed; bool m_altPressed;
bool altPressed; bool m_superPressed;
bool superPressed; bool m_capsPressed;
bool capsPressed;
}; };