From 01f903874b7e27539488fad7f31476d5bcbc6ac9 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Wed, 7 Aug 2019 08:11:38 +0200
Subject: Revert "output: atomic mode"
This reverts commit ee5f98ad49fed0439f3313ec685307831d1d1d05.
This intoduced problems where outputs could not be turned off because
they had flips pending.
---
rootston/output.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'rootston/output.c')
diff --git a/rootston/output.c b/rootston/output.c
index f24c4345..66a43694 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -470,10 +470,8 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
wl_list_for_each(config_head, &config->heads, link) {
struct wlr_output *wlr_output = config_head->state.output;
if (!config_head->state.enabled) {
- wlr_output_enable(wlr_output, false);
+ ok &= wlr_output_enable(wlr_output, false);
wlr_output_layout_remove(desktop->layout, wlr_output);
-
- ok &= wlr_output_commit(wlr_output);
}
}
@@ -483,12 +481,11 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
if (!config_head->state.enabled) {
continue;
}
-
- wlr_output_enable(wlr_output, true);
+ ok &= wlr_output_enable(wlr_output, true);
if (config_head->state.mode != NULL) {
- wlr_output_set_mode(wlr_output, config_head->state.mode);
+ ok &= wlr_output_set_mode(wlr_output, config_head->state.mode);
} else {
- wlr_output_set_custom_mode(wlr_output,
+ ok &= wlr_output_set_custom_mode(wlr_output,
config_head->state.custom_mode.width,
config_head->state.custom_mode.height,
config_head->state.custom_mode.refresh);
@@ -497,8 +494,6 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
config_head->state.x, config_head->state.y);
wlr_output_set_transform(wlr_output, config_head->state.transform);
wlr_output_set_scale(wlr_output, config_head->state.scale);
-
- ok &= wlr_output_commit(wlr_output);
}
if (ok) {
@@ -679,7 +674,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
}
wlr_output_layout_add_auto(desktop->layout, wlr_output);
}
- wlr_output_commit(wlr_output);
struct roots_seat *seat;
wl_list_for_each(seat, &input->seats, link) {
--
cgit v1.2.3