aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2023-07-31 10:19:52 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2023-07-31 16:25:01 +0200
commitf8ddd97e0e5a72392e3dda34d03ef11c036d0234 (patch)
treee99f06abd9454c32948db11513ef31dad72d05c2
parentdesktop/output: fix output manager enabled state (diff)
downloadsway-f8ddd97e0e5a72392e3dda34d03ef11c036d0234.tar.gz
sway-f8ddd97e0e5a72392e3dda34d03ef11c036d0234.tar.zst
sway-f8ddd97e0e5a72392e3dda34d03ef11c036d0234.zip
output: drop current_mode
This is now unused.
-rw-r--r--include/sway/output.h2
-rw-r--r--sway/config/output.c4
-rw-r--r--sway/tree/output.c1
3 files changed, 0 insertions, 7 deletions
diff --git a/include/sway/output.h b/include/sway/output.h
index 50d90d25..62d866bc 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -33,8 +33,6 @@ struct sway_output {
33 int width, height; // transformed buffer size 33 int width, height; // transformed buffer size
34 enum wl_output_subpixel detected_subpixel; 34 enum wl_output_subpixel detected_subpixel;
35 enum scale_filter_mode scale_filter; 35 enum scale_filter_mode scale_filter;
36 // last applied mode when the output is powered off
37 struct wlr_output_mode *current_mode;
38 36
39 bool enabling, enabled; 37 bool enabling, enabled;
40 list_t *workspaces; 38 list_t *workspaces;
diff --git a/sway/config/output.c b/sway/config/output.c
index 6fb29ded..0985b0e8 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -510,10 +510,6 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
510 struct wlr_output_state pending = {0}; 510 struct wlr_output_state pending = {0};
511 queue_output_config(oc, output, &pending); 511 queue_output_config(oc, output, &pending);
512 512
513 if (!oc || oc->power != 0) {
514 output->current_mode = pending.mode;
515 }
516
517 sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name); 513 sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
518 if (!wlr_output_commit_state(wlr_output, &pending)) { 514 if (!wlr_output_commit_state(wlr_output, &pending)) {
519 // Failed to commit output changes, maybe the output is missing a CRTC. 515 // Failed to commit output changes, maybe the output is missing a CRTC.
diff --git a/sway/tree/output.c b/sway/tree/output.c
index eccab2f7..0960f413 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -271,7 +271,6 @@ void output_disable(struct sway_output *output) {
271 list_del(root->outputs, index); 271 list_del(root->outputs, index);
272 272
273 output->enabled = false; 273 output->enabled = false;
274 output->current_mode = NULL;
275 274
276 arrange_root(); 275 arrange_root();
277 276