aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/output.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-10-20 08:42:56 +0200
committerLibravatar GitHub <noreply@github.com>2018-10-20 08:42:56 +0200
commit75ea19c71b08e4b3dd1ad053944724fd91dc04bd (patch)
tree734b3ad6e6ef44d62ac6bbb1162a8bbb2ca28ae4 /sway/tree/output.c
parentMerge pull request #2886 from RyanDwyer/fix-headless-unmap-crash (diff)
parentMinor refactor of input manager (diff)
downloadsway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.gz
sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.zst
sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.zip
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r--sway/tree/output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 98041c47..04219b5f 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -83,7 +83,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
83 struct sway_workspace *ws = workspace_create(output, ws_name); 83 struct sway_workspace *ws = workspace_create(output, ws_name);
84 // Set each seat's focus if not already set 84 // Set each seat's focus if not already set
85 struct sway_seat *seat = NULL; 85 struct sway_seat *seat = NULL;
86 wl_list_for_each(seat, &input_manager->seats, link) { 86 wl_list_for_each(seat, &server.input->seats, link) {
87 if (!seat->has_focus) { 87 if (!seat->has_focus) {
88 seat_set_focus_workspace(seat, ws); 88 seat_set_focus_workspace(seat, ws);
89 } 89 }
@@ -98,7 +98,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
98 } 98 }
99 wl_signal_init(&output->events.destroy); 99 wl_signal_init(&output->events.destroy);
100 100
101 input_manager_configure_xcursor(input_manager); 101 input_manager_configure_xcursor();
102 102
103 wl_signal_add(&wlr_output->events.mode, &output->mode); 103 wl_signal_add(&wlr_output->events.mode, &output->mode);
104 wl_signal_add(&wlr_output->events.transform, &output->transform); 104 wl_signal_add(&wlr_output->events.transform, &output->transform);