Make wlr_output_enable idempotent

DemiMarie · DemiMarie · commit ab53f5e055e7 · 2021-10-27T04:10:45.000-04:00
Enabling or disabling an output should be idempotent.  Previously, this
was not the case, causing bugs.
diff --git a/types/output/output.c b/types/output/output.c
@@ -175,13 +175,12 @@ static void output_update_matrix(struct wlr_output *output) {
 }
 
 void wlr_output_enable(struct wlr_output *output, bool enable) {
+	output->pending.enabled = enable;
 	if (output->enabled == enable) {
 		output->pending.committed &= ~WLR_OUTPUT_STATE_ENABLED;
-		return;
+	} else {
+		output->pending.committed |= WLR_OUTPUT_STATE_ENABLED;
 	}
-
-	output->pending.committed |= WLR_OUTPUT_STATE_ENABLED;
-	output->pending.enabled = enable;
 }
 
 static void output_state_clear_mode(struct wlr_output_state *state) {

Original file line number	Diff line number	Diff line change
`@@ -175,13 +175,12 @@ static void output_update_matrix(struct wlr_output *output) {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`void wlr_output_enable(struct wlr_output *output, bool enable) {`
	`178`	`+ output->pending.enabled = enable;`
`178`	`179`	`if (output->enabled == enable) {`
`179`	`180`	`output->pending.committed &= ~WLR_OUTPUT_STATE_ENABLED;`
`180`		`- return;`
	`181`	`+ } else {`
	`182`	`+ output->pending.committed \|= WLR_OUTPUT_STATE_ENABLED;`
`181`	`183`	`}`
`182`		`-`
`183`		`- output->pending.committed \|= WLR_OUTPUT_STATE_ENABLED;`
`184`		`- output->pending.enabled = enable;`
`185`	`184`	`}`
`186`	`185`
`187`	`186`	`static void output_state_clear_mode(struct wlr_output_state *state) {`