mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend-vnc: fix initial repaint 

weston_renderer::repaint_output must be called from the weston_output::repaint
callback. When called from the weston_output::enable callback, a black frame
is produced. Instead of painting an invalid buffer and then working around it
by setting output damage, just don't skip the first real repaint even though
no VNC client is connected yet.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-02-23 17:04:26 +01:00 committed by Pekka Paalanen
parent b399d48dd4
commit d245bbdd13
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libweston/backend-vnc/vnc.c
View File

@ -87,6 +87,9 @@ struct vnc_output {
pixman_region32_t damage;
struct wl_list peers;
/* used to trigger initial repaint */
bool fb_pool_empty;
};
struct vnc_peer {
@ -656,8 +659,7 @@ vnc_output_enable(struct weston_output *base)
output->display = nvnc_display_new(0, 0);
pixman_region32_init_rect(&output->damage, base->x, base->y,
base->width, base->height);
pixman_region32_init(&output->damage);
nvnc_add_display(backend->server, output->display);
@ -665,7 +667,7 @@ vnc_output_enable(struct weston_output *base)
* Neat VNC warns when a client connects before a display buffer has
* been set. Repaint once to create an initial buffer.
*/
vnc_update_buffer(output->display, &output->damage);
output->fb_pool_empty = true;
return 0;
}
@ -823,9 +825,10 @@ vnc_output_repaint(struct weston_output *base, pixman_region32_t *damage)
&output->damage, damage);
/* Only repaint when a client is connected */
if (!wl_list_empty(&output->peers)) {
if (!wl_list_empty(&output->peers) || output->fb_pool_empty) {
vnc_update_buffer(output->display, &output->damage);
pixman_region32_clear(&output->damage);
output->fb_pool_empty = false;
}
pixman_region32_subtract(&ec->primary_plane.damage,