aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/output.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-10-27 08:55:45 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-10-27 08:55:45 -0400
commit5a98dfee0266f33165159b31a996c73d5ff607fb (patch)
tree2a7b3b1406925b0a86f06c455e437d1c57b978c9 /sway/tree/output.c
parentMerge pull request #2997 from RyanDwyer/fix-cursor-during-operation (diff)
downloadsway-5a98dfee0266f33165159b31a996c73d5ff607fb.tar.gz
sway-5a98dfee0266f33165159b31a996c73d5ff607fb.tar.zst
sway-5a98dfee0266f33165159b31a996c73d5ff607fb.zip
Revert "Fix #2992"
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r--sway/tree/output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 9d523997..e5794b8a 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -66,6 +66,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
66 } 66 }
67 struct wlr_output *wlr_output = output->wlr_output; 67 struct wlr_output *wlr_output = output->wlr_output;
68 output->enabled = true; 68 output->enabled = true;
69 apply_output_config(oc, output);
69 list_add(root->outputs, output); 70 list_add(root->outputs, output);
70 71
71 output->lx = wlr_output->lx; 72 output->lx = wlr_output->lx;
@@ -97,8 +98,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
97 } 98 }
98 wl_signal_init(&output->events.destroy); 99 wl_signal_init(&output->events.destroy);
99 100
100 apply_output_config(oc, output);
101
102 input_manager_configure_xcursor(); 101 input_manager_configure_xcursor();
103 102
104 wl_signal_add(&wlr_output->events.mode, &output->mode); 103 wl_signal_add(&wlr_output->events.mode, &output->mode);