diff options
| author | Daniel Stone <daniels@collabora.com> | 2022-01-17 14:24:03 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2022-03-31 17:15:55 +0000 |
| commit | dc0f73bcac9d485d73e437173f99050bc3c9e552 (patch) | |
| tree | b46aea98979ca8f9e6830999663f841020b275cd /kiosk-shell | |
| parent | e031397e09d8380d2c3281c1b95d34cc01f36da1 (diff) | |
| download | weston-dc0f73bcac9d485d73e437173f99050bc3c9e552.tar.gz | |
shell: Encapsulate weston_curtain in its own struct
This will allow us to create a solid weston_buffer as well, since we
need to store that separately.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'kiosk-shell')
| -rw-r--r-- | kiosk-shell/kiosk-shell.c | 22 | ||||
| -rw-r--r-- | kiosk-shell/kiosk-shell.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c index c8c2276d..66aa3910 100644 --- a/kiosk-shell/kiosk-shell.c +++ b/kiosk-shell/kiosk-shell.c @@ -486,8 +486,8 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput) uint32_t bg_color = 0x0; struct weston_curtain_params curtain_params = {}; - if (shoutput->background_view) - weston_surface_destroy(shoutput->background_view->surface); + if (shoutput->curtain) + weston_curtain_destroy(shoutput->curtain); if (!output) return; @@ -514,18 +514,18 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput) curtain_params.surface_committed = NULL; curtain_params.surface_private = NULL; - shoutput->background_view = weston_curtain_create(ec, &curtain_params); + shoutput->curtain = weston_curtain_create(ec, &curtain_params); - weston_surface_set_role(shoutput->background_view->surface, + weston_surface_set_role(shoutput->curtain->view->surface, "kiosk-shell-background", NULL, 0); weston_layer_entry_insert(&shell->background_layer.view_list, - &shoutput->background_view->layer_link); + &shoutput->curtain->view->layer_link); - shoutput->background_view->is_mapped = true; - shoutput->background_view->surface->is_mapped = true; - shoutput->background_view->surface->output = output; - weston_view_set_output(shoutput->background_view, output); + shoutput->curtain->view->is_mapped = true; + shoutput->curtain->view->surface->is_mapped = true; + shoutput->curtain->view->surface->output = output; + weston_view_set_output(shoutput->curtain->view, output); } static void @@ -534,8 +534,8 @@ kiosk_shell_output_destroy(struct kiosk_shell_output *shoutput) shoutput->output = NULL; shoutput->output_destroy_listener.notify = NULL; - if (shoutput->background_view) - weston_surface_destroy(shoutput->background_view->surface); + if (shoutput->curtain) + weston_curtain_destroy(shoutput->curtain); wl_list_remove(&shoutput->output_destroy_listener.link); wl_list_remove(&shoutput->link); diff --git a/kiosk-shell/kiosk-shell.h b/kiosk-shell/kiosk-shell.h index 070ba1ab..3eb82cd9 100644 --- a/kiosk-shell/kiosk-shell.h +++ b/kiosk-shell/kiosk-shell.h @@ -88,7 +88,7 @@ struct kiosk_shell_seat { struct kiosk_shell_output { struct weston_output *output; struct wl_listener output_destroy_listener; - struct weston_view *background_view; + struct weston_curtain *curtain; struct kiosk_shell *shell; struct wl_list link; |