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

OSXScreen.mm: do not use reserved id for variables

This commit is contained in:
Sergey Fedorov 2024-12-07 20:21:49 +08:00
parent fe46de9053
commit 8c43a3dd9a
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lib/platform/OSXScreen.mm
View File

@ -324,14 +324,14 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask)
return 0;
}
// choose hotkey id
UInt32 id;
// choose hotkey kid
UInt32 kid;
if (!m_oldHotKeyIDs.empty()) {
id = m_oldHotKeyIDs.back();
kid = m_oldHotKeyIDs.back();
m_oldHotKeyIDs.pop_back();
}
else {
id = m_hotKeys.size() + 1;
kid = m_hotKeys.size() + 1;
}
// if this hot key has modifiers only then we'll handle it specially
@ -343,37 +343,37 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask)
okay = false;
}
else {
m_modifierHotKeys[mask] = id;
m_modifierHotKeys[mask] = kid;
okay = true;
}
}
else {
EventHotKeyID hkid = { 'SNRG', (UInt32)id };
EventHotKeyID hkid = { 'SNRG', (UInt32)kid };
OSStatus status = RegisterEventHotKey(macKey, macMask, hkid,
GetApplicationEventTarget(), 0,
&ref);
okay = (status == noErr);
m_hotKeyToIDMap[HotKeyItem(macKey, macMask)] = id;
m_hotKeyToIDMap[HotKeyItem(macKey, macMask)] = kid;
}
if (!okay) {
m_oldHotKeyIDs.push_back(id);
m_oldHotKeyIDs.push_back(kid);
m_hotKeyToIDMap.erase(HotKeyItem(macKey, macMask));
LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask));
return 0;
}
m_hotKeys.insert(std::make_pair(id, HotKeyItem(ref, macKey, macMask)));
m_hotKeys.insert(std::make_pair(kid, HotKeyItem(ref, macKey, macMask)));
LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, id));
return id;
LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, kid));
return kid;
}
void
OSXScreen::unregisterHotKey(UInt32 id)
OSXScreen::unregisterHotKey(UInt32 kid)
{
// look up hotkey
HotKeyMap::iterator i = m_hotKeys.find(id);
HotKeyMap::iterator i = m_hotKeys.find(kid);
if (i == m_hotKeys.end()) {
return;
}
@ -388,7 +388,7 @@ OSXScreen::unregisterHotKey(UInt32 id)
// XXX -- this is inefficient
for (ModifierHotKeyMap::iterator j = m_modifierHotKeys.begin();
j != m_modifierHotKeys.end(); ++j) {
if (j->second == id) {
if (j->second == kid) {
m_modifierHotKeys.erase(j);
okay = true;
break;
@ -396,17 +396,17 @@ OSXScreen::unregisterHotKey(UInt32 id)
}
}
if (!okay) {
LOG((CLOG_WARN "failed to unregister hotkey id=%d", id));
LOG((CLOG_WARN "failed to unregister hotkey id=%d", kid));
}
else {
LOG((CLOG_DEBUG "unregistered hotkey id=%d", id));
LOG((CLOG_DEBUG "unregistered hotkey id=%d", kid));
}
// discard hot key from map and record old id for reuse
m_hotKeyToIDMap.erase(i->second);
m_hotKeys.erase(i);
m_oldHotKeyIDs.push_back(id);
if (m_activeModifierHotKey == id) {
m_oldHotKeyIDs.push_back(kid);
if (m_activeModifierHotKey == kid) {
m_activeModifierHotKey = 0;
m_activeModifierHotKeyMask = 0;
}
@ -1445,8 +1445,8 @@ OSXScreen::getScrollSpeed() const
kCFPreferencesCurrentUser,
kCFPreferencesAnyHost);
if (pref != NULL) {
CFTypeID id = CFGetTypeID(pref);
if (id == CFNumberGetTypeID()) {
CFTypeID tid = CFGetTypeID(pref);
if (tid == CFNumberGetTypeID()) {
CFNumberRef value = static_cast<CFNumberRef>(pref);
if (CFNumberGetValue(value, kCFNumberDoubleType, &scaling)) {
if (scaling < 0.0) {