cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: fix virtual keyboard keymaps (#11763)

Browse source
This commit is contained in:
usering-around 2025-09-19 17:58:03 +03:00 • committed by GitHub
parent afd1e71761
commit 8fc7b2c171
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/devices/IKeyboard.cpp
View file

@ -43,15 +43,11 @@ void IKeyboard::clearManuallyAllocd() {
if (m_xkbKeymap) if (m_xkbKeymap)
xkb_keymap_unref(m_xkbKeymap); xkb_keymap_unref(m_xkbKeymap);
if (m_xkbKeymapV1)
xkb_keymap_unref(m_xkbKeymapV1);
if (m_xkbSymState) if (m_xkbSymState)
xkb_state_unref(m_xkbSymState); xkb_state_unref(m_xkbSymState);
m_xkbSymState = nullptr; m_xkbSymState = nullptr;
m_xkbKeymap = nullptr; m_xkbKeymap = nullptr;
m_xkbKeymapV1 = nullptr;
m_xkbState = nullptr; m_xkbState = nullptr;
m_xkbStaticState = nullptr; m_xkbStaticState = nullptr;
m_xkbKeymapFD.reset(); m_xkbKeymapFD.reset();
@ -116,15 +112,6 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS); m_xkbKeymap = xkb_keymap_new_from_names2(CONTEXT, &XKBRULES, XKB_KEYMAP_FORMAT_TEXT_V2, XKB_KEYMAP_COMPILE_NO_FLAGS);
} }
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");
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_string(CONTEXT, cKeymapStr, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
free(cKeymapStr);
}
updateXKBTranslationState(m_xkbKeymap); updateXKBTranslationState(m_xkbKeymap);
const auto NUMLOCKON = g_pConfigManager->getDeviceInt(m_hlName, "numlock_by_default", "input:numlock_by_default"); const auto NUMLOCKON = g_pConfigManager->getDeviceInt(m_hlName, "numlock_by_default", "input:numlock_by_default");
@ -169,7 +156,7 @@ void IKeyboard::updateKeymapFD() {
auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2); auto cKeymapStr = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V2);
m_xkbKeymapString = cKeymapStr; m_xkbKeymapString = cKeymapStr;
free(cKeymapStr); free(cKeymapStr);
auto cKeymapV1Str = xkb_keymap_get_as_string(m_xkbKeymapV1, XKB_KEYMAP_FORMAT_TEXT_V1); auto cKeymapV1Str = xkb_keymap_get_as_string(m_xkbKeymap, XKB_KEYMAP_FORMAT_TEXT_V1);
m_xkbKeymapV1String = cKeymapV1Str; m_xkbKeymapV1String = cKeymapV1Str;
free(cKeymapV1Str); free(cKeymapV1Str);

3
src/devices/IKeyboard.hpp
View file

@ -99,8 +99,7 @@ class IKeyboard : public IHID {
xkb_state* m_xkbStaticState = nullptr; xkb_state* m_xkbStaticState = nullptr;
xkb_state* m_xkbSymState = nullptr; // same as static but gets layouts xkb_state* m_xkbSymState = nullptr; // same as static but gets layouts
xkb_keymap* m_xkbKeymap = nullptr; xkb_keymap* m_xkbKeymap = nullptr;
xkb_keymap* m_xkbKeymapV1 = nullptr;
struct { struct {
uint32_t depressed = 0, latched = 0, locked = 0, group = 0; uint32_t depressed = 0, latched = 0, locked = 0, group = 0;