From f8ddd97e0e5a72392e3dda34d03ef11c036d0234 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 31 Jul 2023 10:19:52 +0200 Subject: [PATCH] output: drop current_mode This is now unused. --- include/sway/output.h | 2 -- sway/config/output.c | 4 ---- sway/tree/output.c | 1 - 3 files changed, 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 { int width, height; // transformed buffer size enum wl_output_subpixel detected_subpixel; enum scale_filter_mode scale_filter; - // last applied mode when the output is powered off - struct wlr_output_mode *current_mode; bool enabling, enabled; 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) { struct wlr_output_state pending = {0}; queue_output_config(oc, output, &pending); - if (!oc || oc->power != 0) { - output->current_mode = pending.mode; - } - sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name); if (!wlr_output_commit_state(wlr_output, &pending)) { // 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) { list_del(root->outputs, index); output->enabled = false; - output->current_mode = NULL; arrange_root();