fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-06-14 12:28:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop-shell: use new label for helper surfaces

Browse source 
Part of migration away from get_label().

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Marius Vlad 2026-02-25 16:13:13 +02:00 • committed by Marius Vlad
parent e2766ca2f4
commit 2ed03fcaea
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
desktop-shell/shell.c
View file

@ -42,6 +42,7 @@
#include <libweston/config-parser.h>
#include "shared/helpers.h"
#include "shared/timespec-util.h"
#include "shared/string-helpers.h"
#include <libweston/shell-utils.h>
#include <libweston/desktop.h>
@ -2646,12 +2647,6 @@ static const struct weston_desktop_api shell_desktop_api = {
/* ************************ *
* end of libweston-desktop *
* ************************ */
static int
background_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "background for output %s",
(surface->output ? surface->output->name : "NULL"));
}
static void
background_committed(struct weston_surface *es,
@ -2704,6 +2699,7 @@ desktop_shell_set_background(struct wl_client *client,
wl_resource_get_user_data(surface_resource);
struct shell_output *sh_output;
struct weston_head *head = weston_head_from_resource(output_resource);
char *label;
if (surface->committed) {
wl_resource_post_error(surface_resource,
@ -2726,7 +2722,9 @@ desktop_shell_set_background(struct wl_client *client,
surface->committed = background_committed;
surface->committed_private = sh_output;
weston_surface_set_label_func(surface, background_get_label);
str_printf(&label, "background for output %s", surface->output->name);
weston_surface_set_label(surface, label);
weston_desktop_shell_send_configure(resource, 0,
surface_resource,
@ -2741,13 +2739,6 @@ desktop_shell_set_background(struct wl_client *client,
&sh_output->background_surface_listener);
}
static int
panel_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "panel for output %s",
(surface->output ? surface->output->name : "NULL"));
}
static void
panel_committed(struct weston_surface *es,
struct weston_coord_surface new_origin)
@ -2822,6 +2813,7 @@ desktop_shell_set_panel(struct wl_client *client,
wl_resource_get_user_data(surface_resource);
struct shell_output *sh_output;
struct weston_head *head = weston_head_from_resource(output_resource);
char *label;
if (surface->committed) {
wl_resource_post_error(surface_resource,
@ -2845,7 +2837,9 @@ desktop_shell_set_panel(struct wl_client *client,
surface->committed = panel_committed;
surface->committed_private = sh_output;
weston_surface_set_label_func(surface, panel_get_label);
str_printf(&label, "panel for output %s", surface->output->name);
weston_surface_set_label(surface, label);
weston_desktop_shell_send_configure(resource, 0,
surface_resource,
@ -2858,12 +2852,6 @@ desktop_shell_set_panel(struct wl_client *client,
wl_signal_add(&surface->destroy_signal, &sh_output->panel_surface_listener);
}
static int
lock_surface_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "lock window");
}
static void
lock_surface_committed(struct weston_surface *surface,
struct weston_coord_surface new_origin)
@ -2920,7 +2908,7 @@ desktop_shell_set_lock_surface(struct wl_client *client,
surface->committed = lock_surface_committed;
surface->committed_private = shell;
weston_surface_set_label_func(surface, lock_surface_get_label);
weston_surface_set_label_static(surface, "lock window");
shell->lock_surface = surface;
shell->lock_surface_listener.notify = handle_lock_surface_destroy;