/*
- * Copyright © 2012-2021 Collabora, Ltd.
+ * Copyright © 2012-2024 Collabora, Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
#ifdef HAVE_BACKEND_RDP
#include <libweston/backend-rdp.h>
#endif
-#ifdef HAVE_BACKEND_HEADLESS
-#include <libweston/backend-headless.h>
-#endif
#ifdef HAVE_BACKEND_X11
#include <libweston/backend-x11.h>
#endif
return config;
}
-
-
static void
sigint_helper(int sig)
{
enum weston_compositor_backend backend;
} backend_name_map[] = {
{ "drm", "drm-backend.so", WESTON_BACKEND_DRM },
- { "headless", "headless-backend.so", WESTON_BACKEND_HEADLESS },
- { "pipewire", "pipewire-backend.so", WESTON_BACKEND_PIPEWIRE },
{ "rdp", "rdp-backend.so", WESTON_BACKEND_RDP },
- { "vnc", "vnc-backend.so", WESTON_BACKEND_VNC },
{ "wayland", "wayland-backend.so", WESTON_BACKEND_WAYLAND },
{ "x11", "x11-backend.so", WESTON_BACKEND_X11 },
};
return false;
}
-
bool
get_renderer_from_string(const char *name, enum weston_renderer_type *renderer)
{
return false;
}
-
-void
-ivi_layout_save(struct ivi_compositor *ivi, struct ivi_output *output)
-{
- struct ivi_output *new_output;
- ivi->need_ivi_output_relayout = true;
-
- new_output = zalloc(sizeof(*new_output));
-
- new_output->ivi = ivi;
- new_output->background = output->background;
-
- new_output->top = output->top;
- new_output->bottom = output->bottom;
- new_output->left = output->left;
- new_output->right = output->right;
-
- new_output->active = output->active;
- new_output->previous_active = output->previous_active;
- new_output->name = strdup(output->name);
- if (output->app_ids)
- new_output->app_ids = strdup(output->app_ids);
-
- new_output->area = output->area;
- new_output->area_saved = output->area_saved;
- new_output->area_activation = output->area_activation;
-
- weston_log("saving output layout for output %s\n", new_output->name);
-
- wl_list_insert(&ivi->saved_outputs, &new_output->link);
-}
-
-void
-ivi_layout_restore(struct ivi_compositor *ivi, struct ivi_output *n_output)
-{
- struct ivi_output *output = NULL;
- struct ivi_output *iter_output;
-
- if (!ivi->need_ivi_output_relayout)
- return;
-
- ivi->need_ivi_output_relayout = false;
-
- wl_list_for_each(iter_output, &ivi->saved_outputs, link) {
- if (strcmp(n_output->name, iter_output->name) == 0) {
- output = iter_output;
- break;
- }
- }
-
- if (!output)
- return;
-
- weston_log("restoring output layout for output %s\n", output->name);
- n_output->background = output->background;
-
- n_output->top = output->top;
- n_output->bottom = output->bottom;
- n_output->left = output->left;
- n_output->right = output->right;
-
- n_output->active = output->active;
- n_output->previous_active = output->previous_active;
- if (output->app_ids)
- n_output->app_ids = strdup(output->app_ids);
-
- n_output->area = output->area;
- n_output->area_saved = output->area_saved;
- n_output->area_activation = output->area_activation;
-
- free(output->app_ids);
- free(output->name);
- wl_list_remove(&output->link);
- free(output);
-}
-
-void
-ivi_layout_destroy_saved_outputs(struct ivi_compositor *ivi)
-{
- struct ivi_output *output, *output_next;
-
- wl_list_for_each_safe(output, output_next, &ivi->saved_outputs, link) {
- free(output->app_ids);
- free(output->name);
-
- wl_list_remove(&output->link);
- free(output);
- }
-}
-
static void
handle_output_destroy(struct wl_listener *listener, void *data)
{
output->name = name;
output->config = config;
- if (ivi->simple_output_configure) {
- output->output =
- weston_compositor_create_output_with_head(ivi->compositor,
- head);
- if (!output->output) {
- free(output->name);
- free(output);
- return NULL;
- }
+ output->output =
+ weston_compositor_create_output(ivi->compositor, head, head->name);
+ if (!output->output) {
+ free(output->name);
+ free(output);
+ return NULL;
+ }
+ if (ivi->simple_output_configure) {
int ret = ivi->simple_output_configure(output->output);
if (ret < 0) {
weston_log("Configuring output \"%s\" failed.\n",
ivi->init_failed = true;
return NULL;
}
-
- } else {
- output->output =
- weston_compositor_create_output(ivi->compositor, name);
- if (!output->output) {
- free(output->name);
- free(output);
- return NULL;
- }
}
output->output_destroy.notify = handle_output_destroy;
if (!wl_list_empty(&c->output_list)) {
peer = container_of(c->output_list.prev,
struct weston_output, link);
- next_x = peer->x + peer->width;
+ next_x = peer->pos.c.x + peer->width;
}
- output->x = next_x;
- output->y = 0;
+ output->pos.c.x = next_x;
+ output->pos.c.y = 0;
}
bool force_pixman = false;
bool use_shadow;
bool without_input = false;
- int ret;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
if (without_input)
ivi->compositor->require_input = !without_input;
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
- &config.base);
- if (ret < 0)
- return ret;
+ ivi->heads_changed.notify = heads_changed;
+ weston_compositor_add_heads_changed_listener(ivi->compositor,
+ &ivi->heads_changed);
+
+ if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
+ &config.base))
+ return -1;
ivi->drm_api = weston_drm_output_get_api(ivi->compositor);
if (!ivi->drm_api) {
weston_log("Cannot use drm output api.\n");
- ret = -1;
goto error;
}
load_remoting_plugin(ivi, ivi->config);
+ return 0;
+
error:
free(config.gbm_format);
free(config.seat_id);
- return ret;
+ return -1;
}
static void
continue;
}
- if (ivi->window_api->create_head(ivi->compositor->backend, output_name) < 0) {
+ if (ivi->window_api->create_head(ivi->backend, output_name) < 0) {
free(output_name);
return -1;
}
if (asprintf(&default_output, "%s%d", name_prefix, i) < 0)
return -1;
- if (ivi->window_api->create_head(ivi->compositor->backend, default_output) < 0) {
+ if (ivi->window_api->create_head(ivi->backend, default_output) < 0) {
free(default_output);
return -1;
}
int sprawl = 0;
int output_count;
bool force_pixman = false;
- int ret;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "display", 0, &config.display_name },
weston_config_section_get_int(section, "cursor-size",
&config.cursor_size, 32);
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
- &config.base);
+ ivi->backend = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
+ &config.base);
free(config.cursor_theme);
free(config.display_name);
- if (ret < 0)
- return ret;
+ if (!ivi->backend)
+ return -1;
ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
config.renderer = WESTON_RENDERER_AUTO;
config.no_input = no_input;
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11,
- &config.base);
-
- if (ret < 0)
- return ret;
+ if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11, &config.base))
+ return -1;
ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
if (!ivi->window_api) {
}
#else
static int
-load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
-{
- return -1;
-}
-#endif
-
-#ifdef HAVE_BACKEND_HEADLESS
-static int
-load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
- enum weston_renderer_type renderer)
-{
- struct weston_headless_backend_config config = {};
- int ret = 0;
-
- bool force_pixman = false;
- bool fullscreen;
- bool force_gl = false;
- int output_count;
-
- struct weston_compositor *c = ivi->compositor;
-
- const struct weston_option options[] = {
- { WESTON_OPTION_BOOLEAN, "use-pixman", false, &force_pixman },
- { WESTON_OPTION_BOOLEAN, "use-gl", false, &force_gl },
- };
-
- windowed_parse_common_options(ivi, argc, argv, &force_pixman,
- &fullscreen, &output_count);
-
- parse_options(options, ARRAY_LENGTH(options), argc, argv);
-
- if ((force_pixman && force_gl) ||
- (renderer != WESTON_RENDERER_AUTO && (force_pixman || force_gl))) {
- weston_log("Conflicting renderer specifications\n");
- return -1;
- } else if (force_pixman) {
- config.renderer = WESTON_RENDERER_PIXMAN;
- } else if (force_gl) {
- config.renderer = WESTON_RENDERER_GL;
- } else {
- config.renderer = renderer;
- }
-
- config.base.struct_version = WESTON_HEADLESS_BACKEND_CONFIG_VERSION;
- config.base.struct_size = sizeof(struct weston_headless_backend_config);
-
- /* load the actual headless-backend and configure it */
- ret = weston_compositor_load_backend(c, WESTON_BACKEND_HEADLESS,
- &config.base);
- if (ret < 0)
- return ret;
-
- ivi->window_api = weston_windowed_output_get_api(c);
- if (!ivi->window_api) {
- weston_log("Cannot use weston_windowed_output_api.\n");
- return -1;
- }
-
- if (ivi->window_api->create_head(c->backend, "headless") < 0) {
- weston_log("Cannot create headless back-end\n");
- return -1;
- }
-
- return 0;
-}
-#else
-static int
-load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv, enum weston_renderer_type renderer)
+load_x11_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+ enum weston_renderer_type renderer)
{
return -1;
}
struct weston_config_section *section;
uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
char *transform_string;
+ struct weston_mode new_mode = {};
assert(parsed_options);
return -1;
}
- weston_output_set_transform(output, transform);
- if (api->output_set_size(output, width, height) < 0) {
- weston_log("Cannot configure output \"%s\" using weston_rdp_output_api.\n",
- output->name);
- return -1;
- }
+ new_mode.width = width;
+ new_mode.height = height;
+
+ api->output_set_mode(output, &new_mode);
+ weston_output_set_transform(output, transform);
return 0;
}
load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
{
struct weston_rdp_backend_config config = {};
- int ret = 0;
struct weston_config_section *section;
struct ivi_output_config *parsed_options = ivi_init_parsed_options(ivi->compositor);
parse_options(rdp_options, ARRAY_LENGTH(rdp_options), argc, argv);
ivi->simple_output_configure = rdp_backend_output_configure;
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_RDP, &config.base);
+ if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_RDP, &config.base))
+ return -1;
free(config.bind_address);
free(config.rdp_key);
free(config.server_cert);
free(config.server_key);
- return ret;
+ return 0;
}
#else
static int
weston_log("Error: unknown renderer \"%s\"\n", renderer_name);
return -1;
}
- if (strcmp(backend, "drm-backend.so") == 0) {
- return load_drm_backend(ivi, argc, argv);
- } else if (strcmp(backend, "wayland-backend.so") == 0) {
- return load_wayland_backend(ivi, argc, argv);
- } else if (strcmp(backend, "x11-backend.so") == 0) {
- return load_x11_backend(ivi, argc, argv);
- } else if (strcmp(backend, "headless-backend.so") == 0) {
- return load_headless_backend(ivi, argc, argv);
- } else if (strcmp(backend, "rdp-backend.so") == 0) {
+
+ switch (backend) {
+ case WESTON_BACKEND_DRM:
+ return load_drm_backend(ivi, argc, argv, renderer);
+ case WESTON_BACKEND_RDP:
return load_rdp_backend(ivi, argc, argv);
+ case WESTON_BACKEND_WAYLAND:
+ return load_wayland_backend(ivi, argc, argv, renderer);
+ case WESTON_BACKEND_X11:
+ return load_x11_backend(ivi, argc, argv, renderer);
+ default:
+ assert(!"unknown backend type in load_backend()");
+ }
- weston_log("fatal: unknown backend '%s'.\n", backend_name);
- return -1;
+ return 0;
}
static int
"\t\t\t\twayland-backend.so\n"
"\t\t\t\tx11-backend.so\n"
"\t\t\t\theadless-backend.so\n"
+ " -r, --renderer=NAME\tName of renderer to use: auto, gl, noop, pixman\n"
" -S, --socket=NAME\tName of socket to listen on\n"
" --log=FILE\t\tLog to the given file\n"
" -c, --config=FILE\tConfig file to load, defaults to agl-compositor.ini\n"
}
#if !defined(BUILD_XWAYLAND)
-int
+void *
wet_load_xwayland(struct weston_compositor *comp)
{
weston_log("Attempted to load xwayland library but compositor "
"was *not* built with xwayland support!\n");
- return -1;
+ return NULL;
}
#endif
char *renderer = NULL;
const struct weston_option core_options[] = {
- { WESTON_OPTION_STRING, "renderer", 0, &renderer },
+ { WESTON_OPTION_STRING, "renderer", 'r', &renderer },
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
{ WESTON_OPTION_STRING, "socket", 'S', &socket_name },
{ WESTON_OPTION_STRING, "log", 0, &log },
goto error_compositor;
}
- ivi.heads_changed.notify = heads_changed;
- weston_compositor_add_heads_changed_listener(ivi.compositor,
- &ivi.heads_changed);
+ if (weston_compositor_backends_loaded(ivi.compositor) < 0)
+ goto error_compositor;
weston_compositor_flush_heads_changed(ivi.compositor);
+
if (ivi_desktop_init(&ivi) < 0)
goto error_compositor;
goto error_compositor;
if (xwayland) {
- if (wet_load_xwayland(ivi.compositor) < 0)
+ if (!wet_load_xwayland(ivi.compositor))
goto error_compositor;
}
Code Review / src / agl-compositor.git / blobdiff