mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unmanaged views rendering on all outputs

This commit is contained in:
emersion 2018-03-31 10:56:49 -04:00
parent 6579717994
commit 0f7936735c
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sway/desktop/output.c
View File

@ -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