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

backend-vnc: pass vnc_backend to vnc_head_create()

Browse Source 
Pass the VNC backend to vnc_head_create().

That way the already known backend will not have to be found from the
compositor. This is trivial now, but in the multi-backend case would
entail iterating over all backends to find the correct one.

Also remove the now unused to_vnc_backend() helper.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
This commit is contained in:
Philipp Zabel 2023-04-16 18:29:00 +02:00
parent 0a1d77a728
commit 78818c6d24
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,12 +101,6 @@ struct vnc_head {
struct weston_head base;
};
static inline struct vnc_backend *
to_vnc_backend(struct weston_compositor *base)
{
return container_of(base->backend, struct vnc_backend, base);
}
static void
vnc_output_destroy(struct weston_output *base);
@ -841,9 +835,8 @@ vnc_destroy(struct weston_backend *base)
}
static void
vnc_head_create(struct weston_compositor *compositor, const char *name)
vnc_head_create(struct vnc_backend *backend, const char *name)
{
struct vnc_backend *backend = to_vnc_backend(compositor);
struct vnc_head *head;
head = xzalloc(sizeof *head);
@ -855,7 +848,7 @@ vnc_head_create(struct weston_compositor *compositor, const char *name)
head->base.backend = &backend->base;
weston_head_set_connection_status(&head->base, true);
weston_compositor_add_head(compositor, &head->base);
weston_compositor_add_head(backend->compositor, &head->base);
}
static void
@ -1107,7 +1100,7 @@ vnc_backend_create(struct weston_compositor *compositor,
NULL) < 0)
goto err_compositor;
vnc_head_create(compositor, "vnc");
vnc_head_create(backend, "vnc");
compositor->capabilities |= WESTON_CAP_ARBITRARY_MODES;