Move keybinding command handling into Hotkey module

Author: NicksWorld

library/Core.cpp

@@ -957,53 +957,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, s
     }
     else if (first == "keybinding")
     {
-        if (parts.size() >= 3 && (parts[0] == "set" || parts[0] == "add"))
-        {
-            std::string keystr = parts[1];
-            if (parts[0] == "set")
-                hotkey_mgr->clearKeybind(keystr);
-            // for (int i = parts.size()-1; i >= 2; i--)
-            for (const auto& part : parts | std::views::drop(2) | std::views::reverse)
-            {
-                if (!hotkey_mgr->addKeybind(keystr, part)) {
-                    con.printerr("Invalid key spec: %s\n", keystr.c_str());
-                    break;
-                }
-            }
-        }
-        else if (parts.size() >= 2 && parts[0] == "clear")
-        {
-            // for (size_t i = 1; i < parts.size(); i++)
-            for (const auto& part : parts | std::views::drop(1))
-            {
-                if (!hotkey_mgr->clearKeybind(part)) {
-                    con.printerr("Invalid key spec: %s\n", part.c_str());
-                    break;
-                }
-            }
-        }
-        else if (parts.size() == 2 && parts[0] == "list")
-        {
-            std::vector<std::string> list = hotkey_mgr->listKeybinds(parts[1]);
-            if (list.empty())
-                con << "No bindings." << std::endl;
-            for (const auto& kb : list)
-                con << "  " << kb << std::endl;
-        }
-        else
-        {
-            con << "Usage:" << std::endl
-                << "  keybinding list <key>" << std::endl
-                << "  keybinding clear <key>[@context]..." << std::endl
-                << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
-                << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
-                << "Later adds, and earlier items within one command have priority." << std::endl
-                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, `, or Enter)." << std::endl
-                << "Context may be used to limit the scope of the binding, by" << std::endl
-                << "requiring the current context to have a certain prefix." << std::endl
-                << "Current UI context is: " << std::endl
-                << join_strings("\n", Gui::getCurFocus(true)) << std::endl;
-        }
+        this->hotkey_mgr->handleKeybindingCommand(con, parts);
     }
     else if (first == "alias")
     {

library/include/modules/Hotkey.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Export.h"
+#include "ColorText.h"
 
 #include <condition_variable>
 #include <map>
@@ -10,6 +11,7 @@
 
 namespace DFHack {
     class DFHACK_EXPORT HotkeyManager {
+        friend class Core;
         public:
             HotkeyManager();
             ~HotkeyManager();
@@ -53,5 +55,6 @@ namespace DFHack {
             std::map<int, std::vector<KeyBinding>> bindings;
 
             void hotkey_thread_fn();
+            void handleKeybindingCommand(color_ostream& out, const std::vector<std::string>& parts);
     };
 }

library/modules/Hotkey.cpp

@@ -284,6 +284,49 @@ void HotkeyManager::setHotkeyCommand(std::string cmd) {
     cond.notify_all();
 }
 
+
+void HotkeyManager::handleKeybindingCommand(color_ostream &con, const std::vector<std::string>& parts) {
+    if (parts.size() >= 3 && (parts[0] == "set" || parts[0] == "add")) {
+        std::string keystr = parts[1];
+        if (parts[0] == "set")
+            clearKeybind(keystr);
+        for (const auto& part : parts | std::views::drop(2) | std::views::reverse) {
+            if (!addKeybind(keystr, part)) {
+                con.printerr("Invalid key spec: %s\n", keystr.c_str());
+                break;
+            }
+        }
+    }
+    else if (parts.size() >= 2 && parts[0] == "clear") {
+        for (const auto& part : parts | std::views::drop(1)) {
+            if (!clearKeybind(part)) {
+                con.printerr("Invalid key spec: %s\n", part.c_str());
+                break;
+            }
+        }
+    }
+    else if (parts.size() == 2 && parts[0] == "list") {
+        std::vector<std::string> list = listKeybinds(parts[1]);
+        if (list.empty())
+            con << "No bindings." << std::endl;
+        for (const auto& kb : list)
+            con << "  " << kb << std::endl;
+    }
+    else {
+        con << "Usage:" << std::endl
+            << "  keybinding list <key>" << std::endl
+            << "  keybinding clear <key>[@context]..." << std::endl
+            << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
+            << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << std::endl
+            << "Later adds, and earlier items within one command have priority." << std::endl
+            << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, `, or Enter)." << std::endl
+            << "Context may be used to limit the scope of the binding, by" << std::endl
+            << "requiring the current context to have a certain prefix." << std::endl
+            << "Current UI context is: " << std::endl
+            << join_strings("\n", Gui::getCurFocus(true)) << std::endl;
+    }
+}
+
 HotkeyManager::HotkeyManager() {
     this->hotkey_thread = std::thread(&HotkeyManager::hotkey_thread_fn, this);
 }