From 19744a5207cccca079406166cad527575bb4abf9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 2 Jun 2022 10:10:56 +0100 Subject: [PATCH] weston-curtain: Always mark surface as mapped The surface always has valid content, hence it can always be mapped. Signed-off-by: Daniel Stone --- fullscreen-shell/fullscreen-shell.c | 1 - kiosk-shell/kiosk-shell.c | 1 - shell-utils/shell-utils.c | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c index dbec02cf..009ad1e3 100644 --- a/fullscreen-shell/fullscreen-shell.c +++ b/fullscreen-shell/fullscreen-shell.c @@ -327,7 +327,6 @@ fs_output_create(struct fullscreen_shell *shell, struct weston_output *output) fsout->curtain = create_curtain(shell->compositor, fsout, output->x, output->y, output->width, output->height); - weston_surface_map(fsout->curtain->view->surface); fsout->curtain->view->is_mapped = true; weston_layer_entry_insert(&shell->layer.view_list, &fsout->curtain->view->layer_link); diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c index c109e31f..62949ed4 100644 --- a/kiosk-shell/kiosk-shell.c +++ b/kiosk-shell/kiosk-shell.c @@ -523,7 +523,6 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput) &shoutput->curtain->view->layer_link); shoutput->curtain->view->is_mapped = true; - weston_surface_map(shoutput->curtain->view->surface); shoutput->curtain->view->surface->output = output; weston_view_set_output(shoutput->curtain->view, output); } diff --git a/shell-utils/shell-utils.c b/shell-utils/shell-utils.c index 2bf1d3bd..a34e9d00 100644 --- a/shell-utils/shell-utils.c +++ b/shell-utils/shell-utils.c @@ -185,6 +185,8 @@ weston_curtain_create(struct weston_compositor *compositor, pixman_region32_init(&surface->input); } + weston_surface_map(surface); + weston_view_set_position(view, params->x, params->y); return curtain;