aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.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/desktop/render.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/desktop/render.c')
-rw-r--r--sway/desktop/render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 9b26c560..1a72f752 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -885,7 +885,7 @@ static void render_floating(struct sway_output *soutput,
885static void render_dropzones(struct sway_output *output, 885static void render_dropzones(struct sway_output *output,
886 pixman_region32_t *damage) { 886 pixman_region32_t *damage) {
887 struct sway_seat *seat; 887 struct sway_seat *seat;
888 wl_list_for_each(seat, &input_manager->seats, link) { 888 wl_list_for_each(seat, &server.input->seats, link) {
889 if (seat->operation == OP_MOVE_TILING && seat->op_target_node 889 if (seat->operation == OP_MOVE_TILING && seat->op_target_node
890 && node_get_output(seat->op_target_node) == output) { 890 && node_get_output(seat->op_target_node) == output) {
891 float color[4]; 891 float color[4];
@@ -995,7 +995,7 @@ void output_render(struct sway_output *output, struct timespec *when,
995 995
996 render_dropzones(output, damage); 996 render_dropzones(output, damage);
997 997
998 struct sway_seat *seat = input_manager_current_seat(input_manager); 998 struct sway_seat *seat = input_manager_current_seat();
999 struct sway_container *focus = seat_get_focused_container(seat); 999 struct sway_container *focus = seat_get_focused_container(seat);
1000 if (focus && focus->view) { 1000 if (focus && focus->view) {
1001 render_view_popups(focus->view, output, damage, focus->alpha); 1001 render_view_popups(focus->view, output, damage, focus->alpha);