aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/swap.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/swap.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/swap.c')
-rw-r--r--sway/commands/swap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 8a6dfdbd..6062724d 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -108,7 +108,7 @@ static void container_swap(struct sway_container *con1,
108 container_set_fullscreen(con2, false); 108 container_set_fullscreen(con2, false);
109 } 109 }
110 110
111 struct sway_seat *seat = input_manager_get_default_seat(input_manager); 111 struct sway_seat *seat = input_manager_get_default_seat();
112 struct sway_container *focus = seat_get_focused_container(seat); 112 struct sway_container *focus = seat_get_focused_container(seat);
113 struct sway_workspace *vis1 = 113 struct sway_workspace *vis1 =
114 output_get_active_workspace(con1->workspace->output); 114 output_get_active_workspace(con1->workspace->output);