diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-08-21 19:57:10 +0200 |
|---|---|---|
| committer | Isaac Freund <ifreund@ifreund.xyz> | 2020-08-21 21:06:59 +0200 |
| commit | c7c1934b70f074bd15ca59b795aa998d8397469a (patch) | |
| tree | 33b30027f15c8b931b40ea7476e51d4582d6f461 | |
| parent | 163fa47822a362fc45b91ef8b5665c601a892948 (diff) | |
| download | river-c7c1934b70f074bd15ca59b795aa998d8397469a.tar.gz river-c7c1934b70f074bd15ca59b795aa998d8397469a.tar.xz | |
Keyboard: clean up initialization
| -rw-r--r-- | river/Keyboard.zig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/river/Keyboard.zig b/river/Keyboard.zig index 0054e4f..cb8dc12 100644 --- a/river/Keyboard.zig +++ b/river/Keyboard.zig @@ -29,13 +29,15 @@ seat: *Seat, wlr_input_device: *c.wlr_input_device, wlr_keyboard: *c.wlr_keyboard, -listen_key: c.wl_listener, -listen_modifiers: c.wl_listener, +listen_key: c.wl_listener = undefined, +listen_modifiers: c.wl_listener = undefined, pub fn init(self: *Self, seat: *Seat, wlr_input_device: *c.wlr_input_device) !void { - self.seat = seat; - self.wlr_input_device = wlr_input_device; - self.wlr_keyboard = @field(wlr_input_device, c.wlr_input_device_union).keyboard; + self.* = .{ + .seat = seat, + .wlr_input_device = wlr_input_device, + .wlr_keyboard = @field(wlr_input_device, c.wlr_input_device_union).keyboard, + }; // We need to prepare an XKB keymap and assign it to the keyboard. This // assumes the defaults (e.g. layout = "us"). |