From cf7c77e56ab895efd3b113debd53fc5881dd7205 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Sat, 22 Dec 2018 11:59:41 -0500 Subject: [PATCH] Fix wlr_box_intersection args for wlroots 1441 The fix pushed to master missed wlr_box_intersection. This just fixes those lines so sway renders properly again --- sway/desktop/output.c | 2 +- sway/desktop/render.c | 2 +- sway/tree/container.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ed504bdf..79ad7faa 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -108,7 +108,7 @@ static bool get_surface_box(struct surface_iterator_data *data, }; struct wlr_box intersection; - return wlr_box_intersection(&output_box, &rotated_box, &intersection); + return wlr_box_intersection(&intersection, &output_box, &rotated_box); } static void output_for_each_surface_iterator(struct wlr_surface *surface, diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 1260d85a..14881e96 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -261,7 +261,7 @@ static void render_saved_view(struct sway_view *view, }; struct wlr_box intersection; - bool intersects = wlr_box_intersection(&output_box, &box, &intersection); + bool intersects = wlr_box_intersection(&intersection, &output_box, &box); if (!intersects) { return; } diff --git a/sway/tree/container.c b/sway/tree/container.c index b106e0d9..0a96088e 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -979,7 +979,7 @@ void container_discover_outputs(struct sway_container *con) { output_get_box(output, &output_box); struct wlr_box intersection; bool intersects = - wlr_box_intersection(&con_box, &output_box, &intersection); + wlr_box_intersection(&intersection, &con_box, &output_box); int index = list_find(con->outputs, output); if (intersects && index == -1) {