From c1a64a2b9dfcee3453f6e938ed62117a676994b0 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Thu, 18 Aug 2022 17:34:01 +0200 Subject: [PATCH] added main param to keyboards --- src/debug/HyprCtl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 7b36a6ce..133508f0 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 == g_pInputManager->m_pActiveKeyboard ? "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 == g_pInputManager->m_pActiveKeyboard ? "yes" : "no")); } result += "\n\nTablets:\n";