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

Revert "Revert "Used input source ID as the key in group map #2765"" 

This reverts commit a70cba80ea.
This commit is contained in:
Jerry (Xinyu Hou) 2016-08-11 16:59:36 +01:00 committed by Andrew Nelless
parent c772a59572
commit 57950d39a3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,15 +392,17 @@ OSXKeyState::pollActiveModifiers() const
SInt32 SInt32
OSXKeyState::pollActiveGroup() const OSXKeyState::pollActiveGroup() const
{ {
bool layoutValid = true;
TISInputSourceRef keyboardLayout = TISCopyCurrentKeyboardLayoutInputSource(); TISInputSourceRef keyboardLayout = TISCopyCurrentKeyboardLayoutInputSource();
CFDataRef id = (CFDataRef)TISGetInputSourceProperty(
keyboardLayout, kTISPropertyInputSourceID);
if (layoutValid) { GroupMap::const_iterator i = m_groupMap.find(id);
GroupMap::const_iterator i = m_groupMap.find(keyboardLayout); if (i != m_groupMap.end()) {
if (i != m_groupMap.end()) { return i->second;
return i->second;
}
} }
LOG((CLOG_DEBUG "can't get the active group, use the first group instead"));
return 0; return 0;
} }
@ -427,7 +429,9 @@ OSXKeyState::getKeyMap(synergy::KeyMap& keyMap)
m_groupMap.clear(); m_groupMap.clear();
SInt32 numGroups = (SInt32)m_groups.size(); SInt32 numGroups = (SInt32)m_groups.size();
for (SInt32 g = 0; g < numGroups; ++g) { for (SInt32 g = 0; g < numGroups; ++g) {
m_groupMap[m_groups[g]] = g; CFDataRef id = (CFDataRef)TISGetInputSourceProperty(
m_groups[g], kTISPropertyInputSourceID);
m_groupMap[id] = g;
} }
} }

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

@ -159,7 +159,7 @@ private:
KeyButtonOffset = 1 KeyButtonOffset = 1
}; };
typedef std::map<KeyLayout, SInt32> GroupMap; typedef std::map<CFDataRef, SInt32> GroupMap;
typedef std::map<UInt32, KeyID> VirtualKeyMap; typedef std::map<UInt32, KeyID> VirtualKeyMap;
VirtualKeyMap m_virtualKeyMap; VirtualKeyMap m_virtualKeyMap;