/*
- * 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(ivi->compositor, head, head->name);
- 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, head, name);
- if (!output->output) {
- free(output->name);
- free(output);
- return NULL;
- }
}
output->output_destroy.notify = handle_output_destroy;
}
#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 = {};
-
- 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 */
- if (!weston_compositor_load_backend(c, WESTON_BACKEND_HEADLESS, &config.base))
- return -1;
-
- 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)
-{
- return -1;
-}
-#endif
-
#ifdef HAVE_BACKEND_RDP
static void
weston_rdp_backend_config_init(struct weston_rdp_backend_config *config)
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;
}
switch (backend) {
case WESTON_BACKEND_DRM:
return load_drm_backend(ivi, argc, argv, renderer);
- case WESTON_BACKEND_HEADLESS:
- return load_headless_backend(ivi, argc, argv, renderer);
case WESTON_BACKEND_RDP:
return load_rdp_backend(ivi, argc, argv);
case WESTON_BACKEND_WAYLAND:
Code Review / src / agl-compositor.git / blobdiff