aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <mail@isaacfreund.com>2024-01-05 12:31:55 -0600
committerIsaac Freund <mail@isaacfreund.com>2024-01-05 12:31:55 -0600
commit393bfb42b98948f4864daab5187e270166ae8fba (patch)
treecd805af44496e05c92c9782a48e54ca8a6d19f56
parent913770975b6542788b09bf635dbeca19840c3fa3 (diff)
downloadriver-393bfb42b98948f4864daab5187e270166ae8fba.tar.gz
river-393bfb42b98948f4864daab5187e270166ae8fba.tar.xz
Keyboard: delete some uneeded code
-rw-r--r--river/Keyboard.zig5
-rw-r--r--river/Seat.zig17
2 files changed, 1 insertions, 21 deletions
diff --git a/river/Keyboard.zig b/river/Keyboard.zig
index 2aaf6fb..97eae23 100644
--- a/river/Keyboard.zig
+++ b/river/Keyboard.zig
@@ -129,11 +129,8 @@ fn handleKey(listener: *wl.Listener(*wlr.Keyboard.event.Key), event: *wlr.Keyboa
}
};
- if (self.device.seat.hasMapping(keycode, modifiers, released, xkb_state)) {
+ if (self.device.seat.handleMapping(keycode, modifiers, released, xkb_state)) {
if (!released) self.eaten_keycodes.add(event.keycode);
-
- const handled = self.device.seat.handleMapping(keycode, modifiers, released, xkb_state);
- assert(handled);
} else if (self.getInputMethodGrab()) |keyboard_grab| {
if (!released) self.eaten_keycodes.add(event.keycode);
diff --git a/river/Seat.zig b/river/Seat.zig
index dc28b2f..5efd665 100644
--- a/river/Seat.zig
+++ b/river/Seat.zig
@@ -358,23 +358,6 @@ pub fn enterMode(self: *Self, mode_id: u32) void {
}
}
-/// Is there a user-defined mapping for passed keycode, modifiers and keyboard state?
-pub fn hasMapping(
- self: *Self,
- keycode: xkb.Keycode,
- modifiers: wlr.Keyboard.ModifierMask,
- released: bool,
- xkb_state: *xkb.State,
-) bool {
- const modes = &server.config.modes;
- for (modes.items[self.mode_id].mappings.items) |*mapping| {
- if (mapping.match(keycode, modifiers, released, xkb_state)) {
- return true;
- }
- }
- return false;
-}
-
/// Handle any user-defined mapping for passed keycode, modifiers and keyboard state
/// Returns true if at least one mapping was run
pub fn handleMapping(