From 0f7936735cfc8224f9926199b7e807e95d86d900 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 31 Mar 2018 10:56:49 -0400 Subject: Fix unmanaged views rendering on all outputs --- sway/desktop/output.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'sway/desktop/output.c') diff --git a/sway/desktop/output.c b/sway/desktop/output.c index c248b29e..24c0bf40 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -243,14 +243,23 @@ static void render_output(struct sway_output *output, struct timespec *when, struct sway_view *view; wl_list_for_each(view, &root_container.sway_root->unmanaged_views, unmanaged_view_link) { - if (view->type == SWAY_XWAYLAND_VIEW) { - // the only kind of unamanged view right now is xwayland override - // redirect - int view_x = view->wlr_xwayland_surface->x; - int view_y = view->wlr_xwayland_surface->y; - render_surface(view->surface, wlr_output, &output->last_frame, - view_x, view_y, 0); + if (view->type != SWAY_XWAYLAND_VIEW) { + continue; + } + + const struct wlr_box view_box = { + .x = view->wlr_xwayland_surface->x, + .y = view->wlr_xwayland_surface->y, + .width = view->wlr_xwayland_surface->width, + .height = view->wlr_xwayland_surface->height, + }; + struct wlr_box intersection; + if (!wlr_box_intersection(&view_box, output_box, &intersection)) { + continue; } + + render_surface(view->surface, wlr_output, &output->last_frame, + view_box.x - output_box->x, view_box.y - output_box->y, 0); } // TODO: Consider revising this when fullscreen windows are supported -- cgit v1.2.3 From 98b67e2399df70d1e8354d5641744d1730a60189 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 31 Mar 2018 11:30:15 -0400 Subject: Fix xwayland configure in set_size --- sway/desktop/output.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sway/desktop/output.c') diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 24c0bf40..0d706c52 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -247,11 +247,13 @@ static void render_output(struct sway_output *output, struct timespec *when, continue; } + struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; + const struct wlr_box view_box = { - .x = view->wlr_xwayland_surface->x, - .y = view->wlr_xwayland_surface->y, - .width = view->wlr_xwayland_surface->width, - .height = view->wlr_xwayland_surface->height, + .x = xsurface->x, + .y = xsurface->y, + .width = xsurface->width, + .height = xsurface->height, }; struct wlr_box intersection; if (!wlr_box_intersection(&view_box, output_box, &intersection)) { -- cgit v1.2.3