aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-10-20 08:42:56 +0200
committerGitHub <noreply@github.com>2018-10-20 08:42:56 +0200
commit75ea19c71b08e4b3dd1ad053944724fd91dc04bd (patch)
tree734b3ad6e6ef44d62ac6bbb1162a8bbb2ca28ae4 /sway/desktop/render.c
parentfe6aea1d02db7e172cafdaac61d612d0de2dc9d0 (diff)
parentc006717910e5f30ca65645f701541dfa176c1392 (diff)
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
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,
static void render_dropzones(struct sway_output *output,
pixman_region32_t *damage) {
struct sway_seat *seat;
- wl_list_for_each(seat, &input_manager->seats, link) {
+ wl_list_for_each(seat, &server.input->seats, link) {
if (seat->operation == OP_MOVE_TILING && seat->op_target_node
&& node_get_output(seat->op_target_node) == output) {
float color[4];
@@ -995,7 +995,7 @@ void output_render(struct sway_output *output, struct timespec *when,
render_dropzones(output, damage);
- struct sway_seat *seat = input_manager_current_seat(input_manager);
+ struct sway_seat *seat = input_manager_current_seat();
struct sway_container *focus = seat_get_focused_container(seat);
if (focus && focus->view) {
render_view_popups(focus->view, output, damage, focus->alpha);