aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands.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/commands.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/commands.c')
-rw-r--r--sway/commands.c4
1 files changed, 2 insertions, 2 deletions
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) {
68 list_add(config->seat_configs, seat_config); 68 list_add(config->seat_configs, seat_config);
69 } 69 }
70 70
71 input_manager_apply_seat_config(input_manager, seat_config); 71 input_manager_apply_seat_config(seat_config);
72} 72}
73 73
74/* Keep alphabetized */ 74/* Keep alphabetized */
@@ -240,7 +240,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat,
240 240
241 if (seat == NULL) { 241 if (seat == NULL) {
242 // passing a NULL seat means we just pick the default seat 242 // passing a NULL seat means we just pick the default seat
243 seat = input_manager_get_default_seat(input_manager); 243 seat = input_manager_get_default_seat();
244 if (!sway_assert(seat, "could not find a seat to run the command on")) { 244 if (!sway_assert(seat, "could not find a seat to run the command on")) {
245 return NULL; 245 return NULL;
246 } 246 }