MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2380 from myk002/myk_instrument_keybinding 

instrument core keybinding resolution
develop
Myk 2022-11-08 10:16:13 -08:00 committed by GitHub
parent f075e2393f 351ecbfb59
commit 22eb9ca8b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/Core.cpp
Unescape Escape View File

@ -101,6 +101,7 @@ size_t loadScriptFiles(Core* core, color_ostream& out, const vector<std::string>
namespace DFHack { namespace DFHack {
DBG_DECLARE(core,keybinding,DebugCategory::LINFO);
DBG_DECLARE(core,script,DebugCategory::LINFO); DBG_DECLARE(core,script,DebugCategory::LINFO);
class MainThread { class MainThread {
@ -2388,20 +2389,36 @@ bool Core::SelectHotkey(int sym, int modifiers)
std::string cmd; std::string cmd;
DEBUG(keybinding).print("checking hotkeys for sym=%d, modifiers=%x\n", sym, modifiers);
{ {
std::lock_guard<std::mutex> lock(HotkeyMutex); std::lock_guard<std::mutex> lock(HotkeyMutex);
// Check the internal keybindings // Check the internal keybindings
std::vector<KeyBinding> &bindings = key_bindings[sym]; std::vector<KeyBinding> &bindings = key_bindings[sym];
for (int i = bindings.size()-1; i >= 0; --i) { for (int i = bindings.size()-1; i >= 0; --i) {
if (bindings[i].modifiers != modifiers) auto &binding = bindings[i];
DEBUG(keybinding).print("examining hotkey with commandline: '%s'\n", binding.cmdline.c_str());
if (binding.modifiers != modifiers) {
DEBUG(keybinding).print("skipping keybinding due to modifiers mismatch: 0x%x != 0x%x\n",
binding.modifiers, modifiers);
continue; continue;
if (!bindings[i].focus.empty() && }
!prefix_matches(bindings[i].focus, Gui::getFocusString(screen))) string focusString = Gui::getFocusString(screen);
if (!binding.focus.empty() && !prefix_matches(binding.focus, focusString)) {
DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
focusString.c_str(), binding.focus.c_str());
continue; continue;
if (!plug_mgr->CanInvokeHotkey(bindings[i].command[0], screen)) }
if (!plug_mgr->CanInvokeHotkey(binding.command[0], screen)) {
DEBUG(keybinding).print("skipping keybinding due to hotkey guard rejection (command: '%s')\n",
binding.command[0].c_str());
continue; continue;
cmd = bindings[i].cmdline; }
cmd = binding.cmdline;
DEBUG(keybinding).print("matched hotkey\n");
break; break;
} }