Support xkb v2 format by usering-around · Pull Request #11482 · hyprwm/Hyprland

usering-around · 2025-08-19T12:45:56Z

Describe your PR, what does it fix/add?

Updated all xkb_keymap_new_from_names calls to xkb_keymap_new_from_names2
Added support to the xkb V2 format, with fallback to V1 for clients (currently there is no xkb V2 format in the wayland protocol)
Added input:kb_file_v1 to change the fallback keymap

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

I haven't seen any input tests (and I'm not sure how to do one), so there is no test

Is it ready for merging, or does it need work?

Ready

vaxerski

generally lgtm, probably needs a wiki update to mention v2

usering-around · 2025-08-20T20:37:36Z

generally lgtm, probably needs a wiki update to mention v2

added a mention of the V2 format hyprwm/hyprland-wiki#1205

vaxerski · 2025-08-21T15:30:46Z

@fufexan nix bump for xkb needed

fufexan · 2025-08-21T18:36:29Z

Gonna rebuild the world for a while.

vaxerski · 2025-08-22T13:18:08Z

@fufexan is it supposed to fail after 2.5h?

fufexan · 2025-08-22T13:36:35Z

Runner is out of storage so no

vaxerski · 2025-08-23T10:53:55Z

well guess we waiting for untable nixpkgs

fufexan · 2025-09-11T15:55:48Z

CI should build now.

RichAyotte · 2025-09-12T19:03:11Z

I needed to patch my Debian Sid system with libxkbcommon0 (= 1.7.0-2.1) in order to build. I'm not a cpp dev so there's probably a better way to do this.

Diff

diff --git a/src/devices/IKeyboard.cpp b/src/devices/IKeyboard.cpp
index 0fc30ca9..13c57e0f 100644
--- a/src/devices/IKeyboard.cpp
+++ b/src/devices/IKeyboard.cpp
@@ -91,13 +91,22 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
         if (FILE* const KEYMAPFILE = fopen(path.c_str(), "r"); !KEYMAPFILE)
             Debug::log(ERR, "Cannot open input:kb_file= file for reading");
         else {
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
             m_xkbKeymap = xkb_keymap_new_from_file(CONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+            m_xkbKeymap = xkb_keymap_new_from_file(CONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             fclose(KEYMAPFILE);
         }
     }
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
     if (!m_xkbKeymap)
         m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    if (!m_xkbKeymap)
+        m_xkbKeymap = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
     if (!m_xkbKeymap) {
         g_pConfigManager->addParseError("Invalid keyboard layout passed. ( rules: " + rules.rules + ", model: " + rules.model + ", variant: " + rules.variant +
@@ -113,13 +122,21 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
         m_currentRules.options = "";
         m_currentRules.layout  = "us";
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        m_xkbKeymap = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     }
 
     auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V1);
     if (!cKeymapStr) {
         Debug::log(ERR, "Couldn't convert keymap to V1 format");
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         m_xkbKeymapV1 = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        m_xkbKeymapV1 = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     } else {
         m_xkbKeymapV1 = xkb_keymap_new_from_string(CONTEXT, cKeymapStr, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
         free(cKeymapStr);
@@ -166,7 +183,11 @@ void IKeyboard::updateKeymapFD() {
     if (m_xkbKeymapV1FD.isValid())
         m_xkbKeymapV1FD.reset();
 
-    auto cKeymapStr   = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+    auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2);
+#else
+    auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V1);
+#endif
     m_xkbKeymapString = cKeymapStr;
     free(cKeymapStr);
     auto cKeymapV1Str   = xkb_keymap_get_as_string(m_xkbKeymapV1, XKB_KEYMAP_FORMAT_TEXT_V1);
@@ -251,19 +272,31 @@ void IKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
             rules.model   = model.c_str();
             rules.variant = variant.c_str();
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
             auto KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+            auto KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
             if (!KEYMAP) {
                 Debug::log(ERR, "updateXKBTranslationState: keymap failed 1, fallback without model/variant");
                 rules.model   = "";
                 rules.variant = "";
-                KEYMAP        = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+                KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+                KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             }
 
             if (!KEYMAP) {
                 Debug::log(ERR, "updateXKBTranslationState: keymap failed 2, fallback to us");
                 rules.layout = "us";
-                KEYMAP       = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+                KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_text_v2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+                KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             }
 
             m_xkbState       = xkb_state_new(KEYMAP);
@@ -287,7 +320,11 @@ void IKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
         .options = m_currentRules.options.c_str(),
     };
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
     const auto NEWKEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    const auto NEWKEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
     m_xkbState       = xkb_state_new(NEWKEYMAP);
     m_xkbStaticState = xkb_state_new(NEWKEYMAP);
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index cd69289e..b7f8e753 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -291,8 +291,13 @@ void CKeybindManager::updateXKBTranslationState() {
     const auto        PCONTEXT   = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
     FILE* const       KEYMAPFILE = FILEPATH.empty() ? nullptr : fopen(absolutePath(FILEPATH, g_pConfigManager->m_configCurrentPath).c_str(), "r");
 
-    auto              PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS) :
-                                             xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+    auto PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS) :
+                                xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    auto PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS) :
+                                xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     if (KEYMAPFILE)
         fclose(KEYMAPFILE);
 
@@ -305,7 +310,11 @@ void CKeybindManager::updateXKBTranslationState() {
                    rules.rules, rules.model, rules.options);
         memset(&rules, 0, sizeof(rules));
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         PKEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        PKEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     }
 
     xkb_context_unref(PCONTEXT);
diff --git a/src/protocols/VirtualKeyboard.cpp b/src/protocols/VirtualKeyboard.cpp
index 2acc2298..50fa2244 100644
--- a/src/protocols/VirtualKeyboard.cpp
+++ b/src/protocols/VirtualKeyboard.cpp
@@ -88,7 +88,11 @@ CVirtualKeyboardV1Resource::CVirtualKeyboardV1Resource(SP<CZwpVirtualKeyboardV1>
             return;
         }
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         auto xkbKeymap = xkb_keymap_new_from_string(xkbContext, sc<const char*>(keymapData), XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        auto xkbKeymap = xkb_keymap_new_from_string(xkbContext, sc<const char*>(keymapData), XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
         munmap(keymapData, len);
 
         if UNLIKELY (!xkbKeymap) {

vaxerski · 2025-09-12T23:26:41Z

update xkbcommon? :P

RichAyotte · 2025-09-13T00:31:11Z

I'm trying.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1106487

vaxerski · 2025-09-13T14:37:40Z

good luck

RichAyotte · 2025-09-13T15:31:44Z

good luck

In the meantime, would you accept a PR with this patch #11482 (comment)?

amplexus · 2025-09-19T05:10:11Z

I needed to patch my Debian Sid system with libxkbcommon0 (= 1.7.0-2.1) in order to build. I'm not a cpp dev so there's probably a better way to do this.

Diff

diff --git a/src/devices/IKeyboard.cpp b/src/devices/IKeyboard.cpp
index 0fc30ca9..13c57e0f 100644
--- a/src/devices/IKeyboard.cpp
+++ b/src/devices/IKeyboard.cpp
@@ -91,13 +91,22 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
         if (FILE* const KEYMAPFILE = fopen(path.c_str(), "r"); !KEYMAPFILE)
             Debug::log(ERR, "Cannot open input:kb_file= file for reading");
         else {
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
             m_xkbKeymap = xkb_keymap_new_from_file(CONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+            m_xkbKeymap = xkb_keymap_new_from_file(CONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             fclose(KEYMAPFILE);
         }
     }
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
     if (!m_xkbKeymap)
         m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    if (!m_xkbKeymap)
+        m_xkbKeymap = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
     if (!m_xkbKeymap) {
         g_pConfigManager->addParseError("Invalid keyboard layout passed. ( rules: " + rules.rules + ", model: " + rules.model + ", variant: " + rules.variant +
@@ -113,13 +122,21 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
         m_currentRules.options = "";
         m_currentRules.layout  = "us";
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        m_xkbKeymap = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     }
 
     auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V1);
     if (!cKeymapStr) {
         Debug::log(ERR, "Couldn't convert keymap to V1 format");
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         m_xkbKeymapV1 = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        m_xkbKeymapV1 = xkb_keymap_new_from_names(CONTEXT, &XKBRULES, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     } else {
         m_xkbKeymapV1 = xkb_keymap_new_from_string(CONTEXT, cKeymapStr, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
         free(cKeymapStr);
@@ -166,7 +183,11 @@ void IKeyboard::updateKeymapFD() {
     if (m_xkbKeymapV1FD.isValid())
         m_xkbKeymapV1FD.reset();
 
-    auto cKeymapStr   = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+    auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2);
+#else
+    auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V1);
+#endif
     m_xkbKeymapString = cKeymapStr;
     free(cKeymapStr);
     auto cKeymapV1Str   = xkb_keymap_get_as_string(m_xkbKeymapV1, XKB_KEYMAP_FORMAT_TEXT_V1);
@@ -251,19 +272,31 @@ void IKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
             rules.model   = model.c_str();
             rules.variant = variant.c_str();
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
             auto KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+            auto KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
             if (!KEYMAP) {
                 Debug::log(ERR, "updateXKBTranslationState: keymap failed 1, fallback without model/variant");
                 rules.model   = "";
                 rules.variant = "";
-                KEYMAP        = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+                KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+                KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             }
 
             if (!KEYMAP) {
                 Debug::log(ERR, "updateXKBTranslationState: keymap failed 2, fallback to us");
                 rules.layout = "us";
-                KEYMAP       = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+                KEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_text_v2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+                KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
             }
 
             m_xkbState       = xkb_state_new(KEYMAP);
@@ -287,7 +320,11 @@ void IKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
         .options = m_currentRules.options.c_str(),
     };
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
     const auto NEWKEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    const auto NEWKEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
 
     m_xkbState       = xkb_state_new(NEWKEYMAP);
     m_xkbStaticState = xkb_state_new(NEWKEYMAP);
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index cd69289e..b7f8e753 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -291,8 +291,13 @@ void CKeybindManager::updateXKBTranslationState() {
     const auto        PCONTEXT   = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
     FILE* const       KEYMAPFILE = FILEPATH.empty() ? nullptr : fopen(absolutePath(FILEPATH, g_pConfigManager->m_configCurrentPath).c_str(), "r");
 
-    auto              PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS) :
-                                             xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
+    auto PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS) :
+                                xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+    auto PKEYMAP = KEYMAPFILE ? xkb_keymap_new_from_file(PCONTEXT, KEYMAPFILE, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS) :
+                                xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     if (KEYMAPFILE)
         fclose(KEYMAPFILE);
 
@@ -305,7 +310,11 @@ void CKeybindManager::updateXKBTranslationState() {
                    rules.rules, rules.model, rules.options);
         memset(&rules, 0, sizeof(rules));
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         PKEYMAP = xkb_keymap_new_from_names2(PCONTEXT, &rules, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        PKEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
     }
 
     xkb_context_unref(PCONTEXT);
diff --git a/src/protocols/VirtualKeyboard.cpp b/src/protocols/VirtualKeyboard.cpp
index 2acc2298..50fa2244 100644
--- a/src/protocols/VirtualKeyboard.cpp
+++ b/src/protocols/VirtualKeyboard.cpp
@@ -88,7 +88,11 @@ CVirtualKeyboardV1Resource::CVirtualKeyboardV1Resource(SP<CZwpVirtualKeyboardV1>
             return;
         }
 
+#ifdef XKB_KEYMAP_FORMAT_TEXT_V2
         auto xkbKeymap = xkb_keymap_new_from_string(xkbContext, sc<const char*>(keymapData), XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#else
+        auto xkbKeymap = xkb_keymap_new_from_string(xkbContext, sc<const char*>(keymapData), XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+#endif
         munmap(keymapData, len);
 
         if UNLIKELY (!xkbKeymap) {

I see the 4th ifdef check for V2 is referencing the V1 var. when I presume it should be referencing the V1 var.

github-actions Bot added core config managers protocols devices labels Aug 19, 2025

vaxerski reviewed Aug 20, 2025

View reviewed changes

Comment thread src/config/ConfigDescriptions.hpp Outdated

vaxerski reviewed Aug 20, 2025

View reviewed changes

Comment thread src/config/ConfigManager.cpp Outdated

usering-around mentioned this pull request Aug 20, 2025

Configuring/Variables: mention support for the xkb V2 format hyprwm/hyprland-wiki#1205

Open

vaxerski previously approved these changes Aug 21, 2025

View reviewed changes

fufexan dismissed vaxerski’s stale review via 418ac42 August 21, 2025 18:36

usering added 7 commits September 11, 2025 18:54

update xkb_keymap_new_from_names to xkb_keymap_new_from_names2

915c809

support V2 format in the file, with fallback to V1 to clients

da9b932

add input:kb_file_v1 to chang e the fallback

5a6520c

clarify kb_file_v1

253df79

create V1 keymap from V2 keymap

90c669f

remove input:kb_file_v1

b41fb10

remove newline

ac7d760

fufexan force-pushed the support-XKB-V2-format branch from 418ac42 to ac7d760 Compare September 11, 2025 15:55

vaxerski approved these changes Sep 11, 2025

View reviewed changes

vaxerski merged commit 38169c8 into hyprwm:main Sep 11, 2025
13 checks passed

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 13, 2025

input: support xkb v2 format (hyprwm#11482)

a8110a3

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 13, 2025

input: support xkb v2 format (hyprwm#11482)

3328f72

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 13, 2025

input: support xkb v2 format (hyprwm#11482)

08b69d5

lxe pushed a commit to lxe/Hyprland that referenced this pull request Sep 14, 2025

input: support xkb v2 format (hyprwm#11482)

6a2739c

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 15, 2025

input: support xkb v2 format (hyprwm#11482)

1ce4198

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 15, 2025

input: support xkb v2 format (hyprwm#11482)

b7ad5b3

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 15, 2025

input: support xkb v2 format (hyprwm#11482)

3008b2a

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 15, 2025

input: support xkb v2 format (hyprwm#11482)

cc056e8

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 15, 2025

input: support xkb v2 format (hyprwm#11482)

ed0b676

littleblack111 pushed a commit to littleblack111/Hyprland that referenced this pull request Sep 23, 2025

input: support xkb v2 format (hyprwm#11482)

fdcc142

Mozzarella32 pushed a commit to Mozzarella32/Hyprland that referenced this pull request Oct 8, 2025

input: support xkb v2 format (hyprwm#11482)

65bce6b

Uh oh!

Conversation

usering-around commented Aug 19, 2025

Describe your PR, what does it fix/add?

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

Is it ready for merging, or does it need work?

Uh oh!

Uh oh!

vaxerski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

usering-around commented Aug 20, 2025

Uh oh!

vaxerski commented Aug 21, 2025

Uh oh!

fufexan commented Aug 21, 2025

Uh oh!

vaxerski commented Aug 22, 2025

Uh oh!

fufexan commented Aug 22, 2025

Uh oh!

vaxerski commented Aug 23, 2025

Uh oh!

fufexan commented Sep 11, 2025

Uh oh!

Uh oh!

RichAyotte commented Sep 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vaxerski commented Sep 12, 2025

Uh oh!

RichAyotte commented Sep 13, 2025

Uh oh!

vaxerski commented Sep 13, 2025

Uh oh!

RichAyotte commented Sep 13, 2025

Uh oh!

amplexus commented Sep 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

RichAyotte commented Sep 12, 2025 •

edited

Loading