aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-18 21:20:00 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-20 13:11:43 +1000
commitc006717910e5f30ca65645f701541dfa176c1392 (patch)
treec64452b7f2fe6ab481ad90c424cb14bcb0328eda /sway/input/keyboard.c
parentMerge pull request #2872 from RyanDwyer/cursor-rebase (diff)
downloadsway-c006717910e5f30ca65645f701541dfa176c1392.tar.gz
sway-c006717910e5f30ca65645f701541dfa176c1392.tar.zst
sway-c006717910e5f30ca65645f701541dfa176c1392.zip
Minor refactor of input manager
The input manager is a singleton object. Passing the sway_input_manager argument to each of its functions is unnecessary, while removing the argument makes it obvious to the caller that it's a singleton. This patch removes the argument and makes the input manager use server.input instead. On a similar note: * sway_input_manager.server is removed in favour of using the server global. * seat.input is removed because it can get it from server.input. Due to a circular dependency, creating seat0 is now done directly in server_init rather than in input_manager_create. This is because creating seats must be done after server.input is set. Lastly, it now stores the default seat name using a constant and removes a second reference to seat0 (in input_manager_get_default_seat).
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 4427dabe..5c1e7ae6 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -211,7 +211,7 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
211 struct wlr_input_device *wlr_device = 211 struct wlr_input_device *wlr_device =
212 keyboard->seat_device->input_device->wlr_device; 212 keyboard->seat_device->input_device->wlr_device;
213 char *device_identifier = input_device_get_identifier(wlr_device); 213 char *device_identifier = input_device_get_identifier(wlr_device);
214 wlr_idle_notify_activity(seat->input->server->idle, wlr_seat); 214 wlr_idle_notify_activity(server.idle, wlr_seat);
215 struct wlr_event_keyboard_key *event = data; 215 struct wlr_event_keyboard_key *event = data;
216 bool input_inhibited = seat->exclusive_client != NULL; 216 bool input_inhibited = seat->exclusive_client != NULL;
217 217