Address code review concerns

Author: NicksWorld

library/Core.cpp

@@ -2464,8 +2464,9 @@ bool Core::doSdlInputEvent(SDL_Event* ev)
         DEBUG(keybinding).print("mouse button down: button=%d\n", but.button);
         // don't mess with the first three buttons, which are critical elements of DF's control scheme
         if (but.button > 3) {
+            // We represent mouse buttons as a negative number, permitting buttons 4-15
             SDL_Keycode sym = -but.button;
-            if (sym >= -15 && sym <= -1  && hotkey_mgr->handleKeybind(sym, modstate))
+            if (sym >= -15 && sym <= -3  && hotkey_mgr->handleKeybind(sym, modstate))
                 return suppress_duplicate_keyboard_events;
         }
     } else if (ev->type == SDL_TEXTINPUT) {

library/LuaApi.cpp

@@ -1897,12 +1897,13 @@ void hotkey_pushBindArray(lua_State *L, const std::vector<Hotkey::KeyBinding>& b
     for (const auto& bind : binds) {
         lua_createtable(L, 0, 2);
 
-        lua_pushstring(L, "spec");
-        lua_pushstring(L, Hotkey::keyspec_to_string(bind.spec, true).c_str());
+        lua_pushlstring(L, "spec", 4);
+        auto spec_str = Hotkey::keyspec_to_string(bind.spec, true);
+        lua_pushlstring(L, spec_str.data(), spec_str.size());
         lua_settable(L, -3);
 
-        lua_pushstring(L, "command");
-        lua_pushstring(L, bind.cmdline.c_str());
+        lua_pushlstring(L, "command", 7);
+        lua_pushlstring(L, bind.cmdline.data(), bind.cmdline.size());
         lua_settable(L, -3);
         lua_rawseti(L, -2, i++);
     }

library/include/modules/Hotkey.h

@@ -37,8 +37,8 @@ namespace DFHack {
             bool addKeybind(std::string keyspec, std::string cmd);
             bool addKeybind(Hotkey::KeySpec spec, std::string cmd);
             // Clear a keybind with the given keyspec, optionally for any focus, or with a specific command
-            bool clearKeybind(std::string keyspec, bool any_focus=false, std::string cmdline="");
-            bool clearKeybind(const Hotkey::KeySpec& spec, bool any_focus=false, std::string cmdline="");
+            bool clearKeybind(std::string keyspec, bool any_focus=false, std::string_view cmdline="");
+            bool clearKeybind(const Hotkey::KeySpec& spec, bool any_focus=false, std::string_view cmdline="");
 
             std::vector<std::string> listKeybinds(std::string keyspec);
             std::vector<std::string> listKeybinds(const Hotkey::KeySpec& spec);

library/modules/Hotkey.cpp

@@ -181,7 +181,7 @@ bool HotkeyManager::addKeybind(std::string keyspec, std::string cmd) {
     return this->addKeybind(spec_opt.value(), cmd);
 }
 
-bool HotkeyManager::clearKeybind(const KeySpec& spec, bool any_focus, std::string cmdline) {
+bool HotkeyManager::clearKeybind(const KeySpec& spec, bool any_focus, std::string_view cmdline) {
     std::lock_guard<std::mutex> l(lock);
     if (!bindings.contains(spec.sym))
         return false;
@@ -199,7 +199,7 @@ bool HotkeyManager::clearKeybind(const KeySpec& spec, bool any_focus, std::strin
     return true;
 }
 
-bool HotkeyManager::clearKeybind(std::string keyspec, bool any_focus, std::string cmdline) {
+bool HotkeyManager::clearKeybind(std::string keyspec, bool any_focus, std::string_view cmdline) {
     std::optional<KeySpec> spec_opt = Hotkey::parseKeySpec(keyspec);
     if (!spec_opt.has_value())
         return false;