mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Rename weston_solid_color_surface to weston_curtain_params

Browse Source 
The name implied that it was a surface in and of itself, rather than
parameters used by a helper to create a surface and view.

Rename it now that we have weston_curtain as a name, and clean up
initialisers.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2022-01-17 13:58:16 +00:00
parent b77c2374ee
commit 3a298b0b05
5 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shell-utils.c
+5 -5
View File
@@ -140,7 +140,7 @@ surface_get_label(struct weston_surface *surface, char *buf, size_t len)
struct weston_view *
weston_curtain_create(struct weston_compositor *compositor,
struct weston_solid_color_surface *ss,
struct weston_curtain_params *params,
float x, float y, int w, int h)
{
struct weston_surface *surface = NULL;
@@ -158,11 +158,11 @@ weston_curtain_create(struct weston_compositor *compositor,
return NULL;
}
surface->committed = ss->surface_committed;
surface->committed_private = ss->surface_private;
surface->committed = params->surface_committed;
surface->committed_private = params->surface_private;
weston_surface_set_color(surface, ss->r, ss->g, ss->b, 1.0);
weston_surface_set_label_func(surface, ss->get_label);
weston_surface_set_color(surface, params->r, params->g, params->b, 1.0);
weston_surface_set_label_func(surface, params->get_label);
pixman_region32_fini(&surface->opaque);
pixman_region32_init_rect(&surface->opaque, 0, 0, w, h);
pixman_region32_fini(&surface->input);
shared/shell-utils.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include <libweston/libweston.h>
/* parameter for weston_curtain_create() */
struct weston_solid_color_surface {
struct weston_curtain_params {
int (*get_label)(struct weston_surface *es, char *buf, size_t len);
void (*surface_committed)(struct weston_surface *es, int32_t sx, int32_t sy);
void *surface_private;
@@ -54,5 +54,5 @@ surface_get_label(struct weston_surface *surface, char *buf, size_t len);
*/
struct weston_view *
weston_curtain_create(struct weston_compositor *compositor,
struct weston_solid_color_surface *ss,
struct weston_curtain_params *ss,
float x, float y, int w, int h);