]> git.mdlowis.com Git - proto/labwc.git/commitdiff
src/output.c: remove wlroots 0.18 wlopm with custom-mode workaround
authorConsolatis <35009135+Consolatis@users.noreply.github.com>
Fri, 4 Jul 2025 22:25:43 +0000 (00:25 +0200)
committerJohan Malm <johanmalm@users.noreply.github.com>
Sun, 6 Jul 2025 17:50:33 +0000 (18:50 +0100)
The fix has been included in wlroots 0.19.0.

src/output.c

index 17d801176c896e0b03056f157fb816a7d51bb6a5..00e1faf0e021e8e9e304bea32585e75eb67834e0 100644 (file)
@@ -1100,28 +1100,6 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
                        return;
                }
                wlr_output_state_set_enabled(&output->pending, true);
-               if (!event->output->current_mode) {
-                       /*
-                        * This output uses a custom mode, due to a wlroots DRM
-                        * issue we have to ensure the output commit includes a
-                        * modeset. This is made more difficult by wlroots
-                        * removing a requested change for a custom resolution
-                        * from the output state when it matches the wlr_output
-                        * one. To in turn work around this issue we temporarily
-                        * change the custom wlr_output resolution.
-                        *
-                        * See: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3946
-                        *
-                        * TODO: To be removed once the underlying wlroots issue
-                        *       has been fixed and released. Likely only after
-                        *       labwc starts tracking wlroots 0.19 to keep older
-                        *       0.18.x releases working as expected.
-                        */
-                       int width = event->output->width;
-                       event->output->width++;
-                       wlr_output_state_set_custom_mode(&output->pending, width,
-                               event->output->height, event->output->refresh);
-               }
                output_state_commit(output);
                /*
                 * Re-set the cursor image so that the cursor