From c006717910e5f30ca65645f701541dfa176c1392 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 18 Oct 2018 21:20:00 +1000 Subject: 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). --- sway/commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index 8db1df01..d1275a1e 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -68,7 +68,7 @@ void apply_seat_config(struct seat_config *seat_config) { list_add(config->seat_configs, seat_config); } - input_manager_apply_seat_config(input_manager, seat_config); + input_manager_apply_seat_config(seat_config); } /* Keep alphabetized */ @@ -240,7 +240,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat, if (seat == NULL) { // passing a NULL seat means we just pick the default seat - seat = input_manager_get_default_seat(input_manager); + seat = input_manager_get_default_seat(); if (!sway_assert(seat, "could not find a seat to run the command on")) { return NULL; } -- cgit v1.2.3