alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clear transformed fullscreen damage

Browse source
This commit is contained in:
Erik Reider 2024-01-22 13:43:12 +01:00
parent 8da7c5080c
commit 3ad50f9627
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sway/desktop/render.c
View file

@ -1971,26 +1971,31 @@ static void render_seatops(struct sway_output *output,
static void render_fullscreen_con(pixman_region32_t *damage, static void render_fullscreen_con(pixman_region32_t *damage,
struct sway_output *output, struct sway_container *fullscreen_con, struct sway_output *output, struct sway_container *fullscreen_con,
struct sway_workspace *workspace, bool clear_screen) { struct sway_workspace *workspace, bool clear_whole_screen) {
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
// Don't clear the buffer when rendering the workspace transition struct decoration_data deco_data = get_undecorated_decoration_data();
if (clear_screen) { deco_data.saturation = fullscreen_con->saturation;
int nrects; deco_data.on_focused_workspace = workspace == output->current.active_workspace;
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
for (int i = 0; i < nrects; ++i) { // Only clear the transformed fullscreen bounds
scissor_output(wlr_output, &rects[i]); pixman_region32_t dmg;
fx_renderer_clear(clear_color); if (!clear_whole_screen) {
} pixman_region32_init(&dmg);
pixman_region32_copy(&dmg, damage);
adjust_damage_to_workspace_bounds(&dmg, &deco_data, workspace);
damage = &dmg;
}
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]);
fx_renderer_clear(clear_color);
} }
bool on_focused_ws = workspace == output->current.active_workspace;
if (fullscreen_con->view) { if (fullscreen_con->view) {
struct decoration_data deco_data = get_undecorated_decoration_data();
deco_data.saturation = fullscreen_con->saturation;
deco_data.blur = !clear_screen && fullscreen_con->blur_enabled;
deco_data.on_focused_workspace = on_focused_ws;
if (!wl_list_empty(&fullscreen_con->view->saved_buffers)) { if (!wl_list_empty(&fullscreen_con->view->saved_buffers)) {
render_saved_view(fullscreen_con->view, output, damage, deco_data); render_saved_view(fullscreen_con->view, output, damage, deco_data);
} else if (fullscreen_con->view->surface) { } else if (fullscreen_con->view->surface) {
@ -1998,19 +2003,21 @@ static void render_fullscreen_con(pixman_region32_t *damage,
} }
} else { } else {
render_container(output, damage, fullscreen_con, fullscreen_con->current.focused, render_container(output, damage, fullscreen_con, fullscreen_con->current.focused,
on_focused_ws); deco_data.on_focused_workspace);
} }
for (int i = 0; i < workspace->current.floating->length; ++i) { for (int i = 0; i < workspace->current.floating->length; ++i) {
struct sway_container *floater = struct sway_container *floater =
workspace->current.floating->items[i]; workspace->current.floating->items[i];
if (container_is_transient_for(floater, fullscreen_con)) { if (container_is_transient_for(floater, fullscreen_con)) {
render_floating_container(output, damage, floater, on_focused_ws); render_floating_container(output, damage, floater, deco_data.on_focused_workspace);
} }
} }
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
render_unmanaged(output, damage, &root->xwayland_unmanaged); render_unmanaged(output, damage, &root->xwayland_unmanaged);
#endif #endif
pixman_region32_fini(&dmg);
} }
void output_render(struct sway_output *output, struct timespec *when, void output_render(struct sway_output *output, struct timespec *when,