hyprctl: add modkeys to binds command

closes hyprwm#8606
davc0n · Nov 28, 2024 · be7bd7b · be7bd7b
1 parent 22bf285
commit be7bd7b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
@@ -2275,9 +2275,28 @@ std::optional<std::string> CConfigManager::handleBind(const std::string& command
             return "Invalid catchall, catchall keybinds are only allowed in submaps.";
         }
 
-        g_pKeybindManager->addKeybind(SKeybind{parsedKey.key, KEYSYMS,      parsedKey.keycode, parsedKey.catchAll, MOD,      MODS,           HANDLER,
-                                               COMMAND,       locked,       m_szCurrentSubmap, DESCRIPTION,        release,  repeat,         longPress,
-                                               mouse,         nonConsuming, transparent,       ignoreMods,         multiKey, hasDescription, dontInhibit});
+        g_pKeybindManager->addKeybind(SKeybind{parsedKey.key,
+                                               KEYSYMS,
+                                               parsedKey.keycode,
+                                               parsedKey.catchAll,
+                                               MOD,
+                                               MODSTR,
+                                               MODS,
+                                               HANDLER,
+                                               COMMAND,
+                                               locked,
+                                               m_szCurrentSubmap,
+                                               DESCRIPTION,
+                                               release,
+                                               repeat,
+                                               longPress,
+                                               mouse,
+                                               nonConsuming,
+                                               transparent,
+                                               ignoreMods,
+                                               multiKey,
+                                               hasDescription,
+                                               dontInhibit});
     }
 
     return {};

diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp
@@ -829,8 +829,8 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
             if (kb->hasDescription)
                 ret += "d";
 
-            ret += std::format("\n\tmodmask: {}\n\tsubmap: {}\n\tkey: {}\n\tkeycode: {}\n\tcatchall: {}\n\tdescription: {}\n\tdispatcher: {}\n\targ: {}\n\n", kb->modmask,
-                               kb->submap, kb->key, kb->keycode, kb->catchAll, kb->description, kb->handler, kb->arg);
+            ret += std::format("\n\tmodmask: {}\n\tmodkeys: {}\n\tsubmap: {}\n\tkey: {}\n\tkeycode: {}\n\tcatchall: {}\n\tdescription: {}\n\tdispatcher: {}\n\targ: {}\n\n",
+                               kb->modmask, kb->modkeys, kb->submap, kb->key, kb->keycode, kb->catchAll, kb->description, kb->handler, kb->arg);
         }
     } else {
         // json
@@ -847,6 +847,7 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
     "non_consuming": {},
     "has_description": {},
     "modmask": {},
+    "modkeys": "{}",
     "submap": "{}",
     "key": "{}",
     "keycode": {},
@@ -856,8 +857,9 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
     "arg": "{}"
 }},)#",
                 kb->locked ? "true" : "false", kb->mouse ? "true" : "false", kb->release ? "true" : "false", kb->repeat ? "true" : "false", kb->longPress ? "true" : "false",
-                kb->nonConsuming ? "true" : "false", kb->hasDescription ? "true" : "false", kb->modmask, escapeJSONStrings(kb->submap), escapeJSONStrings(kb->key), kb->keycode,
-                kb->catchAll ? "true" : "false", escapeJSONStrings(kb->description), escapeJSONStrings(kb->handler), escapeJSONStrings(kb->arg));
+                kb->nonConsuming ? "true" : "false", kb->hasDescription ? "true" : "false", kb->modmask, escapeJSONStrings(kb->modkeys), escapeJSONStrings(kb->submap),
+                escapeJSONStrings(kb->key), kb->keycode, kb->catchAll ? "true" : "false", escapeJSONStrings(kb->description), escapeJSONStrings(kb->handler),
+                escapeJSONStrings(kb->arg));
         }
         trimTrailingComma(ret);
         ret += "]";

diff --git a/src/managers/KeybindManager.hpp b/src/managers/KeybindManager.hpp
@@ -21,6 +21,7 @@ struct SKeybind {
     uint32_t               keycode        = 0;
     bool                   catchAll       = false;
     uint32_t               modmask        = 0;
+    std::string            modkeys        = "";
     std::set<xkb_keysym_t> sMkMods        = {};
     std::string            handler        = "";
     std::string            arg            = "";