migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-31 22:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

On Linux, fix wrong layout for key_without_modifiers

Browse Source 
The layout was hardcoded to zero, so the keys were sent for whatever
user configured first.
This commit is contained in:
Kirill Chibisov
2023-06-28 02:02:12 +04:00
parent 0defd747c8
commit b97df599c5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform_impl/linux/common/xkb_state.rs
View File

@@ -524,10 +524,12 @@ impl<'a> KeyEventResults<'a> {
// This will become a pointer to an array which libxkbcommon owns, so we don't need to deallocate it. // This will become a pointer to an array which libxkbcommon owns, so we don't need to deallocate it.
let mut keysyms = ptr::null(); let mut keysyms = ptr::null();
let keysym_count = unsafe { let keysym_count = unsafe {
let layout = (XKBH.xkb_state_key_get_layout)(self.state.xkb_state, self.keycode);
(XKBH.xkb_keymap_key_get_syms_by_level)( (XKBH.xkb_keymap_key_get_syms_by_level)(
self.state.xkb_keymap, self.state.xkb_keymap,
self.keycode, self.keycode,
0, layout,
// NOTE: The level should be zero to ignore modifiers.
0, 0,
&mut keysyms, &mut keysyms,
) )