aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.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/config.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/config.c')
-rw-r--r--sway/config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c
index 89b89464..f683e7ab 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -151,8 +151,7 @@ static void destroy_removed_seats(struct sway_config *old_config,
151 /* Also destroy seats that aren't present in new config */ 151 /* Also destroy seats that aren't present in new config */
152 if (new_config && list_seq_find(new_config->seat_configs, 152 if (new_config && list_seq_find(new_config->seat_configs,
153 seat_name_cmp, seat_config->name) < 0) { 153 seat_name_cmp, seat_config->name) < 0) {
154 seat = input_manager_get_seat(input_manager, 154 seat = input_manager_get_seat(seat_config->name);
155 seat_config->name);
156 seat_destroy(seat); 155 seat_destroy(seat);
157 } 156 }
158 } 157 }