if (ivi->simple_output_configure) {
output->output =
- weston_compositor_create_output_with_head(ivi->compositor,
- head);
+ weston_compositor_create_output(ivi->compositor, head, head->name);
if (!output->output) {
free(output->name);
free(output);
} else {
output->output =
- weston_compositor_create_output(ivi->compositor, name);
+ weston_compositor_create_output(ivi->compositor, head, name);
if (!output->output) {
free(output->name);
free(output);
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) {
enum weston_renderer_type renderer)
{
struct weston_headless_backend_config config = {};
- int ret = 0;
bool force_pixman = false;
bool fullscreen;
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;
+ 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) {
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_HEADLESS:
+ return load_headless_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
}
#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
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;
}