Skip to content

Commit

Permalink
config/output: drop enabling flag
Browse files Browse the repository at this point in the history
This was useful when wlroots backends were updating the current
mode on their own. This is no longer the case.
  • Loading branch information
emersion authored and frosklis committed Mar 31, 2024
1 parent 7bd5661 commit 9fb5a6a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion include/sway/output.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct sway_output {
enum wl_output_subpixel detected_subpixel;
enum scale_filter_mode scale_filter;

bool enabling, enabled;
bool enabled;
list_t *workspaces;

struct sway_output_state current;
Expand Down
6 changes: 0 additions & 6 deletions sway/config/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,6 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {

struct wlr_output *wlr_output = output->wlr_output;

// Flag to prevent the output mode event handler from calling us
output->enabling = (!oc || oc->enabled);

struct wlr_output_state pending = {0};
queue_output_config(oc, output, &pending);

Expand All @@ -522,12 +519,9 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
// Leave the output disabled for now and try again when the output gets
// the mode we asked for.
sway_log(SWAY_ERROR, "Failed to commit output %s", wlr_output->name);
output->enabling = false;
return false;
}

output->enabling = false;

if (oc && !oc->enabled) {
sway_log(SWAY_DEBUG, "Disabling output %s", oc->name);
if (output->enabled) {
Expand Down

0 comments on commit 9fb5a6a

Please sign in to comment.