Skip to content

Commit

Permalink
pass layout to update_modifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasavru authored and wash2 committed Nov 16, 2023
1 parent c490084 commit 6e4b95c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions examples/data_device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ impl KeyboardHandler for DataDeviceWindow {
_: &wl_keyboard::WlKeyboard,
_serial: u32,
_modifiers: Modifiers,
_layout: u32,
) {
}
}
Expand Down
1 change: 1 addition & 0 deletions examples/generic_simple_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ impl<T: Test + 'static> KeyboardHandler for SimpleWindow<T> {
_: &wl_keyboard::WlKeyboard,
_serial: u32,
modifiers: Modifiers,
_layout: u32,
) {
println!("Update modifiers: {modifiers:?}");
}
Expand Down
1 change: 1 addition & 0 deletions examples/simple_layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ impl KeyboardHandler for SimpleLayer {
_: &wl_keyboard::WlKeyboard,
_serial: u32,
modifiers: Modifiers,
_layout: u32,
) {
println!("Update modifiers: {modifiers:?}");
}
Expand Down
1 change: 1 addition & 0 deletions examples/simple_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ impl KeyboardHandler for SimpleWindow {
_: &wl_keyboard::WlKeyboard,
_serial: u32,
modifiers: Modifiers,
_layout: u32,
) {
println!("Update modifiers: {modifiers:?}");
}
Expand Down
1 change: 1 addition & 0 deletions examples/themed_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ impl KeyboardHandler for SimpleWindow {
_: &wl_keyboard::WlKeyboard,
_serial: u32,
_: Modifiers,
_layout: u32,
) {
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/seat/keyboard/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ pub trait KeyboardHandler: Sized {
keyboard: &wl_keyboard::WlKeyboard,
serial: u32,
modifiers: Modifiers,
layout: u32,
);

/// The keyboard has updated the rate and delay between repeating key inputs.
Expand Down Expand Up @@ -827,7 +828,7 @@ where

// Always issue the modifiers update for the user.
let modifiers = udata.update_modifiers();
data.update_modifiers(conn, qh, keyboard, serial, modifiers);
data.update_modifiers(conn, qh, keyboard, serial, modifiers, group);
}

wl_keyboard::Event::RepeatInfo { rate, delay } => {
Expand Down

0 comments on commit 6e4b95c

Please sign in to comment.