mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-30 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Render LAYER_TOP surfaces above fullscreen

Browse source
This commit is contained in:
vilhalmer 2018-11-03 09:06:17 -04:00
parent 6297b757b1
commit c1dae5781e
No known key found for this signature in database
GPG key ID: 50CCC70C5AD25E4F
1 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
sway/desktop/render.c
View file

@ -936,16 +936,19 @@ void output_render(struct sway_output *output, struct timespec *when,
} }
struct sway_container *fullscreen_con = workspace->current.fullscreen; struct sway_container *fullscreen_con = workspace->current.fullscreen;
static const float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
static const float fullscreen_clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_renderer_clear(renderer,
fullscreen_con ? fullscreen_clear_color : clear_color);
}
if (fullscreen_con) { if (fullscreen_con) {
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_renderer_clear(renderer, clear_color);
}
// TODO: handle views smaller than the output // TODO: handle views smaller than the output
if (fullscreen_con->view) { if (fullscreen_con->view) {
if (fullscreen_con->view->saved_buffer) { if (fullscreen_con->view->saved_buffer) {
@ -966,19 +969,7 @@ void output_render(struct sway_output *output, struct timespec *when,
render_floating_container(output, damage, floater); render_floating_container(output, damage, floater);
} }
} }
#ifdef HAVE_XWAYLAND
render_unmanaged(output, damage, &root->xwayland_unmanaged);
#endif
} else { } else {
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_renderer_clear(renderer, clear_color);
}
render_layer(output, damage, render_layer(output, damage,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
render_layer(output, damage, render_layer(output, damage,
@ -986,12 +977,11 @@ void output_render(struct sway_output *output, struct timespec *when,
render_workspace(output, damage, workspace, workspace->current.focused); render_workspace(output, damage, workspace, workspace->current.focused);
render_floating(output, damage); render_floating(output, damage);
#ifdef HAVE_XWAYLAND
render_unmanaged(output, damage, &root->xwayland_unmanaged);
#endif
render_layer(output, damage,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
} }
#ifdef HAVE_XWAYLAND
render_unmanaged(output, damage, &root->xwayland_unmanaged);
#endif
render_layer(output, damage, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
render_dropzones(output, damage); render_dropzones(output, damage);