diff options
| author | xDarksome <dev@darkso.me> | 2022-08-18 22:24:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 22:24:00 +0300 |
| commit | 4af95d42537e32805e4f679715dc3e763c15e328 (patch) | |
| tree | cb604942fb011c9a5755a8a3a2fb625bac08bdab /src/debug/HyprCtl.cpp | |
| parent | 844c33c9801177adf65ea7ed163a8a6df36a9a37 (diff) | |
| parent | ece3ac97f932b1f39314cf63ec8e9abb5172104e (diff) | |
Merge branch 'hyprwm:main' into main
Diffstat (limited to 'src/debug/HyprCtl.cpp')
| -rw-r--r-- | src/debug/HyprCtl.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 7b36a6ce..2f5660df 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -310,7 +310,8 @@ R"#( { "layout": "%s", "variant": "%s", "options": "%s", - "active_keymap": "%s" + "active_keymap": "%s", + "main": %s },)#", &k, escapeJSONStrings(k.keyboard->name).c_str(), @@ -319,7 +320,8 @@ R"#( { escapeJSONStrings(k.currentRules.layout).c_str(), escapeJSONStrings(k.currentRules.variant).c_str(), escapeJSONStrings(k.currentRules.options).c_str(), - escapeJSONStrings(KM).c_str() + escapeJSONStrings(KM).c_str(), + (k.active ? "true" : "false") ); } @@ -386,7 +388,7 @@ R"#( { for (auto& k : g_pInputManager->m_lKeyboards) { const auto KM = g_pInputManager->getActiveLayoutForKeyboard(&k); - result += getFormat("\tKeyboard at %x:\n\t\t%s\n\t\t\trules: r \"%s\", m \"%s\", l \"%s\", v \"%s\", o \"%s\"\n\t\t\tactive keymap: %s\n", &k, k.keyboard->name, k.currentRules.rules.c_str(), k.currentRules.model.c_str(), k.currentRules.layout.c_str(), k.currentRules.variant.c_str(), k.currentRules.options.c_str(), KM.c_str()); + result += getFormat("\tKeyboard at %x:\n\t\t%s\n\t\t\trules: r \"%s\", m \"%s\", l \"%s\", v \"%s\", o \"%s\"\n\t\t\tactive keymap: %s\n\t\t\tmain: %s\n", &k, k.keyboard->name, k.currentRules.rules.c_str(), k.currentRules.model.c_str(), k.currentRules.layout.c_str(), k.currentRules.variant.c_str(), k.currentRules.options.c_str(), KM.c_str(), (k.active ? "yes" : "no")); } result += "\n\nTablets:\n"; |