Skip to content

feat: Use xkb_keymap_mod_get_mask in EiKeyState if available - #8860

Merged
nbolton merged 1 commit into
masterfrom
xkbcommon-get-mask
Aug 22, 2025
Merged

feat: Use xkb_keymap_mod_get_mask in EiKeyState if available#8860
nbolton merged 1 commit into
masterfrom
xkbcommon-get-mask

Conversation

@nbolton

@nbolton nbolton commented Aug 14, 2025

Copy link
Copy Markdown
Member

Fixes: #8833

Uses xkb_keymap_mod_get_mask introduced in xkbcommon v1.10.0

This simply replaces: if ((xkbMask & (1 << xkbMod)) == 0)

It does not intentionally change the modifier behavior. Therefore, it doesn't intentionally fix these issues:

However, the convertModMask function may be related to those bugs, and so this may have some sort of impact.

Related PRs that may also change modifier behavior on Wayland/EI:

CC @wismill @whot

@nbolton
nbolton marked this pull request as draft August 14, 2025 21:37
Comment thread cmake/Libraries.cmake Outdated
Comment thread cmake/Libraries.cmake Outdated
Comment thread src/lib/platform/EiKeyState.cpp
Comment thread src/lib/platform/EiKeyState.cpp
Comment thread src/lib/platform/EiKeyState.cpp Outdated
@nbolton
nbolton force-pushed the xkbcommon-get-mask branch 2 times, most recently from 5a53553 to ced4186 Compare August 22, 2025 12:22
Comment thread src/lib/platform/EiKeyState.cpp Outdated
@nbolton
nbolton force-pushed the xkbcommon-get-mask branch 3 times, most recently from 90d3192 to 123ba12 Compare August 22, 2025 13:14
@nbolton
nbolton marked this pull request as ready for review August 22, 2025 13:21
Comment thread src/lib/platform/EiKeyState.cpp
Comment thread src/lib/platform/CMakeLists.txt Outdated
@nbolton
nbolton marked this pull request as draft August 22, 2025 13:39
@nbolton
nbolton force-pushed the xkbcommon-get-mask branch from 123ba12 to 497dc85 Compare August 22, 2025 13:39
@nbolton

This comment was marked as outdated.

@nbolton
nbolton force-pushed the xkbcommon-get-mask branch from 497dc85 to 766b4b0 Compare August 22, 2025 13:54
@nbolton
nbolton requested a review from sithlord48 August 22, 2025 13:55
@nbolton
nbolton marked this pull request as ready for review August 22, 2025 13:55
@nbolton
nbolton force-pushed the xkbcommon-get-mask branch from 766b4b0 to d065913 Compare August 22, 2025 14:01

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seams to make All my modifiers work correctly on kde wayland client (with xkbcommon 1.11)

There is still the issue of numlock or caps lock is not in sync with the client in all cases but this is also an issue elsewhere tool.

@nbolton

nbolton commented Aug 22, 2025

Copy link
Copy Markdown
Member Author

All my modifiers work correctly on kde wayland client

This PR did not fix my modifiers for some reason... I had to open #8881 for that.

@nbolton
nbolton merged commit 4302d50 into master Aug 22, 2025
31 checks passed
@nbolton
nbolton deleted the xkbcommon-get-mask branch August 22, 2025 15:06
Comment thread src/lib/platform/EiKeyState.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use xkb_keymap_mod_get_mask for mod mask in EI

3 participants