Skip to content

Fix some interactive wayland bits - #900

Merged
wismill merged 2 commits into
xkbcommon:masterfrom
rpigott:wayland-fixes
Oct 28, 2025
Merged

wismill merged 2 commits into
xkbcommon:masterfrom
rpigott:wayland-fixes

Conversation

@rpigott

@rpigott rpigott commented Oct 28, 2025

Copy link
Copy Markdown
Contributor

xkbcli keymap-dump was kinda broken on wayland because it would commit an xdg surface without a role object. Applies some small fixes to the wayland code.

Previously we would try to commit an incomplete xdg_surface. This is illegal in
xdg_shell and results in a "not constructed" xdg_wm_base error. Shift the
ifdef's around a bit so that only the actually relevant code for the keymap-dump
utility is compiled.
Let's make sure we destroy our wayland resource objects in a nice order to avoid
any errors at shutdown time. Fixes errors like:

$ xkbcli interactive-wayland
[...]
[destroyed object]: error 6: surface was destroyed before its role object
@wismill wismill added bug Indicates an unexpected problem or unintended behavior tools: interactive tools: dump labels Oct 28, 2025
@wismill
wismill merged commit 9784fa3 into xkbcommon:master Oct 28, 2025
5 checks passed
@wismill

wismill commented Oct 28, 2025

Copy link
Copy Markdown
Member

Great fixes! Thanks!

@rpigott
rpigott deleted the wayland-fixes branch October 28, 2025 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Indicates an unexpected problem or unintended behavior tools: dump tools: interactive

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants