Skip to content

fix(wayland): handle the wl_keyboard v10 repeated key state instead of aborting #1774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikicat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(wayland): handle the wl_keyboard v10 repeated key state instead of aborting #1774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions rio-window/src/platform_impl/linux/wayland/seat/keyboard/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
let context = &mut keyboard_state.xkb_context;
context.set_keymap_from_fd(fd, size as usize);
}
_ => unreachable!(),
format => warn!("unhandled keymap format {format:?}"),
},
WEnum::Unknown(value) => {
warn!("unknown keymap format 0x{:x}", value)
Expand Down Expand Up @@ -251,6 +251,23 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
}
}
}
// Since wl_keyboard v10 the compositor may drive key repeat itself. It only
// does so after disabling client side repeat with `repeat_info { rate: 0 }`,
// so there's no timer to keep in sync here.
WlKeyboardEvent::Key {
key,
state: WEnum::Value(WlKeyState::Repeated),
..
} => {
key_input(
keyboard_state,
&mut state.events_sink,
data,
key + 8,
ElementState::Pressed,
true,
);
}
WlKeyboardEvent::Modifiers {
mods_depressed,
mods_latched,
Expand Down Expand Up @@ -302,7 +319,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
RepeatInfo::Repeat { gap, delay }
};
}
_ => unreachable!(),
event => warn!("Unhandled keyboard event {event:?}"),
}
}
}
Expand Down
Loading