1 files changed, 42 insertions, 70 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index f936b2a8..8711a248 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -232,6 +232,23 @@ static void output_configure_scene(struct sway_output *output,
         }
 }
 
+static bool output_can_tear(struct sway_output *output) {
+        struct sway_workspace *workspace = output->current.active_workspace;
+        if (!workspace) {
+                return false;
+        }
+
+        struct sway_container *fullscreen_con = root->fullscreen_global;
+        if (!fullscreen_con) {
+                fullscreen_con = workspace->current.fullscreen;
+        }
+        if (fullscreen_con && fullscreen_con->view) {
+                return (output->allow_tearing && view_can_tear(fullscreen_con->view));
+        }
+
+        return false;
+}
+
 static int output_repaint_timer_handler(void *data) {
         struct sway_output *output = data;
 
@@ -247,25 +264,24 @@ static int output_repaint_timer_handler(void *data) {
                 .color_transform = output->color_transform,
         };
 
+        struct wlr_scene_output *scene_output = output->scene_output;
+        if (!wlr_scene_output_needs_frame(scene_output)) {
+                return 0;
+        }
+
         struct wlr_output_state pending;
         wlr_output_state_init(&pending);
         if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) {
                 return 0;
         }
 
-        if (output->gamma_lut_changed) {
-                output->gamma_lut_changed = false;
-                struct wlr_gamma_control_v1 *gamma_control =
-                        wlr_gamma_control_manager_v1_get_control(
-                        server.gamma_control_manager_v1, output->wlr_output);
-                if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
-                        wlr_output_state_finish(&pending);
-                        return 0;
-                }
+        if (output_can_tear(output)) {
+                pending.tearing_page_flip = true;
 
                 if (!wlr_output_test_state(output->wlr_output, &pending)) {
-                        wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
-                        wlr_output_state_set_gamma_lut(&pending, 0, NULL, NULL, NULL);
+                        sway_log(SWAY_DEBUG, "Output test failed on '%s', retrying without tearing page-flip",
+                                output->wlr_output->name);
+                        pending.tearing_page_flip = false;
                 }
         }
 
@@ -340,7 +356,7 @@ static void handle_frame(struct wl_listener *listener, void *user_data) {
         wlr_scene_output_for_each_buffer(output->scene_output, send_frame_done_iterator, &data);
 }
 
-static void update_output_manager_config(struct sway_server *server) {
+void update_output_manager_config(struct sway_server *server) {
         struct wlr_output_configuration_v1 *config =
                 wlr_output_configuration_v1_create();
 
@@ -371,9 +387,6 @@ static int timer_modeset_handle(void *data) {
         server->delayed_modeset = NULL;
 
         apply_all_output_configs();
-        transaction_commit_dirty();
-        update_output_manager_config(server);
-
         return 0;
 }
 
@@ -398,7 +411,6 @@ static void begin_destroy(struct sway_output *output) {
 
         wl_list_remove(&output->layout_destroy.link);
         wl_list_remove(&output->destroy.link);
-        wl_list_remove(&output->commit.link);
         wl_list_remove(&output->present.link);
         wl_list_remove(&output->frame.link);
         wl_list_remove(&output->request_state.link);
@@ -421,31 +433,6 @@ static void handle_layout_destroy(struct wl_listener *listener, void *data) {
         begin_destroy(output);
 }
 
-static void handle_commit(struct wl_listener *listener, void *data) {
-        struct sway_output *output = wl_container_of(listener, output, commit);
-        struct wlr_output_event_commit *event = data;
-
-        if (!output->enabled) {
-                return;
-        }
-
-        if (event->state->committed & (
-                        WLR_OUTPUT_STATE_MODE |
-                        WLR_OUTPUT_STATE_TRANSFORM |
-                        WLR_OUTPUT_STATE_SCALE)) {
-                arrange_layers(output);
-                arrange_output(output);
-                transaction_commit_dirty();
-
-                update_output_manager_config(output->server);
-        }
-
-        // Next time the output is enabled, try to re-apply the gamma LUT
-        if ((event->state->committed & WLR_OUTPUT_STATE_ENABLED) && !output->wlr_output->enabled) {
-                output->gamma_lut_changed = true;
-        }
-}
-
 static void handle_present(struct wl_listener *listener, void *data) {
         struct sway_output *output = wl_container_of(listener, output, present);
         struct wlr_output_event_present *output_event = data;
@@ -454,7 +441,7 @@ static void handle_present(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        output->last_presentation = *output_event->when;
+        output->last_presentation = output_event->when;
         output->refresh_nsec = output_event->refresh;
 }
 
@@ -462,7 +449,20 @@ static void handle_request_state(struct wl_listener *listener, void *data) {
         struct sway_output *output =
                 wl_container_of(listener, output, request_state);
         const struct wlr_output_event_request_state *event = data;
+
+        uint32_t committed = event->state->committed;
         wlr_output_commit_state(output->wlr_output, event->state);
+
+        if (committed & (
+                        WLR_OUTPUT_STATE_MODE |
+                        WLR_OUTPUT_STATE_TRANSFORM |
+                        WLR_OUTPUT_STATE_SCALE)) {
+                arrange_layers(output);
+                arrange_output(output);
+                transaction_commit_dirty();
+
+                update_output_manager_config(output->server);
+        }
 }
 
 static unsigned int last_headless_num = 0;
@@ -526,8 +526,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
         output->layout_destroy.notify = handle_layout_destroy;
         wl_signal_add(&wlr_output->events.destroy, &output->destroy);
         output->destroy.notify = handle_destroy;
-        wl_signal_add(&wlr_output->events.commit, &output->commit);
-        output->commit.notify = handle_commit;
         wl_signal_add(&wlr_output->events.present, &output->present);
         output->present.notify = handle_present;
         wl_signal_add(&wlr_output->events.frame, &output->frame);
@@ -545,28 +543,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
         request_modeset(server);
 }
 
-void handle_output_layout_change(struct wl_listener *listener,
-                void *data) {
-        struct sway_server *server =
-                wl_container_of(listener, server, output_layout_change);
-        update_output_manager_config(server);
-}
-
-void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
-        struct sway_server *server =
-                wl_container_of(listener, server, gamma_control_set_gamma);
-        const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
-
-        struct sway_output *output = event->output->data;
-
-        if(!output) {
-                return;
-        }
-
-        output->gamma_lut_changed = true;
-        wlr_output_schedule_frame(output->wlr_output);
-}
-
 static struct output_config *output_config_for_config_head(
                 struct wlr_output_configuration_head_v1 *config_head,
                 struct sway_output *output) {
@@ -657,10 +633,6 @@ static void output_manager_apply(struct sway_server *server,
                 wlr_output_configuration_v1_send_failed(config);
         }
         wlr_output_configuration_v1_destroy(config);
-
-        if (!test_only) {
-                update_output_manager_config(server);
-        }
 }
 
 void handle_output_manager_apply(struct wl_listener *listener, void *data) {