diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-06-01 15:16:18 +0200 |
|---|---|---|
| committer | Isaac Freund <ifreund@ifreund.xyz> | 2020-06-01 15:16:18 +0200 |
| commit | 62abfc5ee508a4b4186b120619c7f428ed95fa43 (patch) | |
| tree | 0cd5f61cd8699404c664cc84388f942508e7fe69 /src/Keyboard.zig | |
| parent | 70cc3185181109a43871b65771891ce3d733b0fe (diff) | |
| download | river-62abfc5ee508a4b4186b120619c7f428ed95fa43.tar.gz river-62abfc5ee508a4b4186b120619c7f428ed95fa43.tar.xz | |
Rename bind -> map
Diffstat (limited to 'src/Keyboard.zig')
| -rw-r--r-- | src/Keyboard.zig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Keyboard.zig b/src/Keyboard.zig index 8c19b84..cbfd6cd 100644 --- a/src/Keyboard.zig +++ b/src/Keyboard.zig @@ -91,7 +91,7 @@ fn handleKey(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { ); // Get a list of keysyms ignoring modifiers (e.g. 1 instead of !) - // Important for bindings like Mod+Shift+1 + // Important for mappings like Mod+Shift+1 var raw_keysyms: ?[*]c.xkb_keysym_t = undefined; const layout_index = c.xkb_state_key_get_layout(wlr_keyboard.xkb_state, keycode); const raw_keysyms_len = c.xkb_keymap_key_get_syms_by_level( @@ -108,10 +108,10 @@ fn handleKey(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { if (event.state == .WLR_KEY_PRESSED) { var i: usize = 0; while (i < translated_keysyms_len) : (i += 1) { - if (self.handleBuiltinKeybind(translated_keysyms.?[i])) { + if (self.handleBuiltinMapping(translated_keysyms.?[i])) { handled = true; break; - } else if (self.seat.handleKeybinding(translated_keysyms.?[i], modifiers)) { + } else if (self.seat.handleMapping(translated_keysyms.?[i], modifiers)) { handled = true; break; } @@ -119,10 +119,10 @@ fn handleKey(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { if (!handled) { i = 0; while (i < raw_keysyms_len) : (i += 1) { - if (self.handleBuiltinKeybind(raw_keysyms.?[i])) { + if (self.handleBuiltinMapping(raw_keysyms.?[i])) { handled = true; break; - } else if (self.seat.handleKeybinding(raw_keysyms.?[i], modifiers)) { + } else if (self.seat.handleMapping(raw_keysyms.?[i], modifiers)) { handled = true; break; } @@ -161,9 +161,9 @@ fn handleModifiers(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void ); } -/// Handle any builtin, harcoded compsitor bindings such as VT switching. +/// Handle any builtin, harcoded compsitor mappings such as VT switching. /// Returns true if the keysym was handled. -fn handleBuiltinKeybind(self: Self, keysym: c.xkb_keysym_t) bool { +fn handleBuiltinMapping(self: Self, keysym: c.xkb_keysym_t) bool { if (keysym >= c.XKB_KEY_XF86Switch_VT_1 and keysym <= c.XKB_KEY_XF86Switch_VT_12) { Log.Debug.log("Switch VT keysym received", .{}); const wlr_backend = self.seat.input_manager.server.wlr_backend; |
