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

use new anywhere hotkey and filter out own hotkey

develop
myk002 2022-11-09 14:36:23 -08:00
parent de20603080
commit a2efc41fef
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/hotkeys.cpp
Unescape Escape View File

@ -21,6 +21,7 @@ using std::vector;
using namespace DFHack; using namespace DFHack;
static const string INVOKE_MENU_COMMAND = "overlay trigger hotkeys.menu";
static const std::string MENU_SCREEN_FOCUS_STRING = "dfhack/lua/hotkeys/menu"; static const std::string MENU_SCREEN_FOCUS_STRING = "dfhack/lua/hotkeys/menu";
static bool valid = false; // whether the following two vars contain valid data static bool valid = false; // whether the following two vars contain valid data
@ -55,6 +56,11 @@ static void add_binding_if_valid(const string &sym, const string &cmdline, df::v
if (!can_invoke(cmdline, screen)) if (!can_invoke(cmdline, screen))
return; return;
if (cmdline == INVOKE_MENU_COMMAND) {
DEBUG(log).print("filtering out hotkey menu keybinding\n");
return;
}
current_bindings[sym] = cmdline; current_bindings[sym] = cmdline;
sorted_keys.push_back(sym); sorted_keys.push_back(sym);
string keyspec = sym + "@" + MENU_SCREEN_FOCUS_STRING; string keyspec = sym + "@" + MENU_SCREEN_FOCUS_STRING;
@ -163,9 +169,8 @@ static bool invoke_command(color_ostream &out, const size_t index) {
static command_result hotkeys_cmd(color_ostream &out, vector <string> & parameters) { static command_result hotkeys_cmd(color_ostream &out, vector <string> & parameters) {
if (!parameters.size()) { if (!parameters.size()) {
static const string invokeOverlayCmd = "overlay trigger hotkeys.menu"; DEBUG(log).print("invoking command: '%s'\n", INVOKE_MENU_COMMAND.c_str());
DEBUG(log).print("invoking command: '%s'\n", invokeOverlayCmd.c_str()); return Core::getInstance().runCommand(out, INVOKE_MENU_COMMAND );
return Core::getInstance().runCommand(out, invokeOverlayCmd);
} }
if (parameters[0] == "list") { if (parameters[0] == "list") {
@ -184,18 +189,13 @@ static command_result hotkeys_cmd(color_ostream &out, vector <string> & paramete
return invoke_command(out, index) ? CR_OK : CR_WRONG_USAGE; return invoke_command(out, index) ? CR_OK : CR_WRONG_USAGE;
} }
// allow "hotkeys" to be invoked as a hotkey from any screen
static bool hotkeys_anywhere(df::viewscreen *) {
return true;
}
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) { DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
commands.push_back( commands.push_back(
PluginCommand( PluginCommand(
"hotkeys", "hotkeys",
"Invoke hotkeys from the interactive menu.", "Invoke hotkeys from the interactive menu.",
hotkeys_cmd, hotkeys_cmd,
hotkeys_anywhere)); Gui::anywhere_hotkey));
return CR_OK; return CR_OK;
} }