#include <libweston/backend-drm.h>
#include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_HEADLESS
#include <libweston/backend-headless.h>
+#endif
#ifdef HAVE_BACKEND_X11
#include <libweston/backend-x11.h>
#endif
parse_transform(const char *transform, uint32_t *out)
{
static const struct { const char *name; uint32_t token; } transforms[] = {
- { "normal", WL_OUTPUT_TRANSFORM_NORMAL },
- { "90", WL_OUTPUT_TRANSFORM_90 },
- { "180", WL_OUTPUT_TRANSFORM_180 },
- { "270", WL_OUTPUT_TRANSFORM_270 },
- { "flipped", WL_OUTPUT_TRANSFORM_FLIPPED },
- { "flipped-90", WL_OUTPUT_TRANSFORM_FLIPPED_90 },
- { "flipped-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
- { "flipped-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
+ { "normal", WL_OUTPUT_TRANSFORM_NORMAL },
+ { "rotate-90", WL_OUTPUT_TRANSFORM_90 },
+ { "rotate-180", WL_OUTPUT_TRANSFORM_180 },
+ { "rotate-270", WL_OUTPUT_TRANSFORM_270 },
+ { "flipped", WL_OUTPUT_TRANSFORM_FLIPPED },
+ { "flipped-rotate-90", WL_OUTPUT_TRANSFORM_FLIPPED_90 },
+ { "flipped-rotate-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
+ { "flipped-rotate-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
};
for (size_t i = 0; i < ARRAY_LENGTH(transforms); i++)
}
ivi_output = zalloc(sizeof(*ivi_output));
+ if (!ivi_output) {
+ free(_name);
+ continue;
+ }
ivi_output->ivi = ivi;
ivi_output->name = _name;
}
ivi_output = zalloc(sizeof(*ivi_output));
+ if (!ivi_output) {
+ free(_name);
+ continue;
+ }
ivi_output->ivi = ivi;
ivi_output->name = _name;
int use_current_mode = 0;
int use_pixman = 0;
bool use_shadow;
+ bool without_input = false;
int ret;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
- { WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
{ WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device },
{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &use_current_mode },
{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
+ { WESTON_OPTION_BOOLEAN, "continue-without-input", false, &without_input }
};
parse_options(options, ARRAY_LENGTH(options), argc, argv);
weston_config_section_get_bool(section, "pixman-shadow", &use_shadow, 1);
config.use_pixman_shadow = use_shadow;
+ if (without_input)
+ ivi->compositor->require_input = !without_input;
+
ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
&config.base);
if (ret < 0)
}
#endif
+#ifdef HAVE_BACKEND_HEADLESS
static int
load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
{
return 0;
}
+#else
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+ return -1;
+}
+#endif
static int
load_backend(struct ivi_compositor *ivi, const char *backend,
continue;
}
+ if (strstr(buffer, "systemd-notify.so")) {
+ weston_log("systemd-notify plug-in already loaded!\n");
+ p = end;
+ while (*p == ',')
+ p++;
+ continue;
+ }
+
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
- &vt_switching, true);
+ &vt_switching, false);
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */
static void
activate_binding(struct weston_seat *seat,
- struct weston_view *focus_view)
+ struct weston_view *focus_view, uint32_t flags)
{
- struct weston_surface *focus = focus_view->surface;
- struct weston_surface *main_surface =
- weston_surface_get_main_surface(focus);
- struct ivi_surface *surface;
+ struct weston_surface *focus_surface;
+ struct weston_surface *main_surface;
+ struct ivi_surface *ivi_surface;
+ struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(seat);
+
+ if (!focus_view)
+ return;
+
+ focus_surface = focus_view->surface;
+ main_surface = weston_surface_get_main_surface(focus_surface);
- surface = to_ivi_surface(main_surface);
- if (!surface)
+ ivi_surface = to_ivi_surface(main_surface);
+ if (!ivi_surface)
return;
- weston_seat_set_keyboard_focus(seat, focus);
+ if (ivi_seat)
+ ivi_shell_activate_surface(ivi_surface, ivi_seat, flags);
}
static void
if (pointer->focus == NULL)
return;
- activate_binding(pointer->seat, pointer->focus);
+ activate_binding(pointer->seat, pointer->focus,
+ WESTON_ACTIVATE_FLAG_CLICKED);
}
static void
if (touch->focus == NULL)
return;
- activate_binding(touch->seat, touch->focus);
+ activate_binding(touch->seat, touch->focus,
+ WESTON_ACTIVATE_FLAG_NONE);
}
static void
}
WL_EXPORT
-int wet_main(int argc, char *argv[])
+int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
{
struct ivi_compositor ivi = { 0 };
char *cmdline;
if (version) {
printf(PACKAGE_STRING "\n");
- return EXIT_SUCCESS;
+ ret = EXIT_SUCCESS;
+ goto exit_signals;
}
- log_ctx = weston_log_ctx_compositor_create();
+ log_ctx = weston_log_ctx_create();
if (!log_ctx) {
fprintf(stderr, "Failed to initialize weston debug framework.\n");
- return ret;
+ goto exit_signals;
}
- log_scope = weston_compositor_add_log_scope(log_ctx, "log",
- "agl-compositor log\n",
- NULL, NULL, NULL);
+ log_scope = weston_log_ctx_add_log_scope(log_ctx, "log",
+ "agl-compositor log\n",
+ NULL, NULL, NULL);
log_file_open(log);
weston_log_set_handler(vlog, vlog_continue);
backend = choose_default_backend();
}
/* from [core] */
- weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
- weston_config_section_get_bool(section, "activate-by-default", &ivi.activate_by_default, true);
+ weston_config_section_get_bool(section, "hide-cursor",
+ &ivi.hide_cursor, false);
+ weston_config_section_get_bool(section, "activate-by-default",
+ &ivi.activate_by_default, true);
display = wl_display_create();
loop = wl_display_get_event_loop(display);
if (!signals[i])
goto error_signals;
- ivi.compositor = weston_compositor_create(display, log_ctx, &ivi);
+ ivi.compositor = weston_compositor_create(display, log_ctx, &ivi, test_data);
if (!ivi.compositor) {
weston_log("fatal: failed to create compositor.\n");
goto error_signals;
wl_display_destroy_clients(display);
error_compositor:
- weston_compositor_tear_down(ivi.compositor);
+ free(backend);
+ backend = NULL;
+ free(modules);
+ modules = NULL;
- weston_compositor_log_scope_destroy(log_scope);
- log_scope = NULL;
-
- weston_log_ctx_compositor_destroy(ivi.compositor);
weston_compositor_destroy(ivi.compositor);
- weston_log_subscriber_destroy_log(logger);
+ weston_log_scope_destroy(log_scope);
+ log_scope = NULL;
+
+ weston_log_subscriber_destroy(logger);
+ weston_log_ctx_destroy(log_ctx);
ivi_policy_destroy(ivi.policy);
if (ivi.config)
weston_config_destroy(ivi.config);
+exit_signals:
+ free(log);
+ free(config_file);
+ free(socket_name);
+ free(option_modules);
return ret;
}
Code Review / src / agl-compositor.git / blobdiff