#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
#include <libweston/windowed-output-api.h>
#include <libweston/config-parser.h>
#include <libweston/weston-log.h>
-#include <weston/weston.h>
+#include <weston.h>
#include "shared/os-compatibility.h"
#include "shared/helpers.h"
return weston_compositor_get_user_data(ec);
}
+static void
+sigint_helper(int sig)
+{
+ raise(SIGUSR2);
+}
+
+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 = wl_container_of(listener, output, output_destroy);
assert(output->output == data);
- if (output->fullscreen_view.fs->view) {
+ if (output->fullscreen_view.fs &&
+ output->fullscreen_view.fs->view) {
weston_surface_destroy(output->fullscreen_view.fs->view->surface);
output->fullscreen_view.fs->view = NULL;
}
+ ivi_layout_save(output->ivi, output);
+
output->output = NULL;
wl_list_remove(&output->output_destroy.link);
}
ivi_output_configure_app_id(struct ivi_output *ivi_output)
{
if (ivi_output->config) {
- if (ivi_output->app_id != NULL)
+ if (ivi_output->app_ids != NULL)
return;
weston_config_section_get_string(ivi_output->config,
"agl-shell-app-id",
- &ivi_output->app_id,
+ &ivi_output->app_ids,
NULL);
- if (ivi_output->app_id == NULL)
+ if (ivi_output->app_ids == NULL)
return;
weston_log("Will place app_id %s on output %s\n",
- ivi_output->app_id, ivi_output->name);
+ ivi_output->app_ids, ivi_output->name);
}
}
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++)
return -1;
}
+static int
+parse_activation_area(const char *geometry, struct ivi_output *output)
+{
+ int n;
+ unsigned width, height, x, y;
+
+ n = sscanf(geometry, "%ux%u+%u,%u", &width, &height, &x, &y);
+ if (n != 4) {
+ return -1;
+ }
+ output->area_activation.width = width;
+ output->area_activation.height = height;
+ output->area_activation.x = x;
+ output->area_activation.y = y;
+ return 0;
+}
+
static int
configure_output(struct ivi_output *output)
{
if (parse_transform(t, &transform) < 0)
weston_log("Invalid transform \"%s\" for output %s\n",
t, output->name);
+ weston_config_section_get_string(section, "activation-area", &t, "");
+ if (parse_activation_area(t, output) < 0)
+ weston_log("Invalid activation-area \"%s\" for output %s\n",
+ t, output->name);
free(t);
}
for (size_t i = fail_len; i < output->add_len; ++i)
add_head_destroyed_listener(output->add[i]);
+ ivi_layout_restore(output->ivi, output);
+
output->add_len = fail_len;
return 0;
}
weston_head_detach(head);
if (count_heads(ivi_output->output) == 0) {
- weston_output_disable(ivi_output->output);
+ if (ivi_output->output) {
+ /* ivi_output->output destruction may be deferred in
+ * some cases (see drm_output_destroy()), so we need to
+ * forcibly trigger the destruction callback now, or
+ * otherwise would later access data that we are about
+ * to free
+ */
+ struct weston_output *save = ivi_output->output;
+
+ handle_output_destroy(&ivi_output->output_destroy, save);
+ weston_output_destroy(save);
+ }
}
+ wl_list_remove(&ivi_output->link);
+ free(ivi_output->app_ids);
+ free(ivi_output);
}
static struct weston_config_section *
goto err;
}
- if (weston_output_enable(ivi_output->output) < 0) {
+ if ((ret = weston_output_enable(ivi_output->output)) < 0) {
weston_log("Enabling remoted output \"%s\" failed.\n",
output_name);
goto err;
}
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,
}
static int
-compositor_init_config(struct weston_compositor *compositor,
- struct weston_config *config)
+compositor_init_config(struct ivi_compositor *ivi)
{
struct xkb_rule_names xkb_names;
struct weston_config_section *section;
+ struct weston_compositor *compositor = ivi->compositor;
+ struct weston_config *config = ivi->config;
int repaint_msec;
bool vt_switching;
bool require_input;
/* agl-compositor.ini [core] */
section = weston_config_get_section(config, "core", NULL, NULL);
+ weston_config_section_get_bool(section, "disable-cursor",
+ &ivi->disable_cursor, false);
+ weston_config_section_get_bool(section, "activate-by-default",
+ &ivi->activate_by_default, true);
+
weston_config_section_get_bool(section, "require-input", &require_input, true);
compositor->require_input = require_input;
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;
- surface = to_ivi_surface(main_surface);
- if (!surface)
+ focus_surface = focus_view->surface;
+ main_surface = weston_surface_get_main_surface(focus_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
return str;
}
+static void
+weston_log_setup_scopes(struct weston_log_context *log_ctx,
+ struct weston_log_subscriber *subscriber,
+ const char *names)
+{
+ assert(log_ctx);
+ assert(subscriber);
+
+ char *tokenize = strdup(names);
+ char *token = strtok(tokenize, ",");
+ while (token) {
+ weston_log_subscribe(log_ctx, subscriber, token);
+ token = strtok(NULL, ",");
+ }
+ free(tokenize);
+}
+
+static void
+weston_log_subscribe_to_scopes(struct weston_log_context *log_ctx,
+ struct weston_log_subscriber *logger,
+ const char *debug_scopes)
+{
+ if (logger && debug_scopes)
+ weston_log_setup_scopes(log_ctx, logger, debug_scopes);
+ else
+ weston_log_subscribe(log_ctx, logger, "log");
+}
+
+
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;
char *log = NULL;
char *modules = NULL;
char *option_modules = NULL;
+ char *debug_scopes = NULL;
int help = 0;
int version = 0;
int no_config = 0;
struct weston_log_subscriber *logger;
int ret = EXIT_FAILURE;
bool xwayland = false;
+ struct sigaction action;
const struct weston_option core_options[] = {
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
{ WESTON_OPTION_BOOLEAN, "debug", 0, &debug },
{ WESTON_OPTION_STRING, "config", 'c', &config_file },
{ WESTON_OPTION_STRING, "modules", 0, &option_modules },
+ { WESTON_OPTION_STRING, "debug-scopes", 'l', &debug_scopes },
};
wl_list_init(&ivi.outputs);
+ wl_list_init(&ivi.saved_outputs);
wl_list_init(&ivi.surfaces);
wl_list_init(&ivi.pending_surfaces);
wl_list_init(&ivi.popup_pending_apps);
wl_list_init(&ivi.split_pending_apps);
wl_list_init(&ivi.remote_pending_apps);
wl_list_init(&ivi.desktop_clients);
+ wl_list_init(&ivi.child_process_list);
/* Prevent any clients we spawn getting our stdin */
os_fd_set_cloexec(STDIN_FILENO);
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);
logger = weston_log_subscriber_create_log(logfile);
- weston_log_subscribe(log_ctx, logger, "log");
+ weston_log_subscribe_to_scopes(log_ctx, logger, debug_scopes);
weston_log("Command line: %s\n", cmdline);
free(cmdline);
if (!backend)
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);
display = wl_display_create();
loop = wl_display_get_event_loop(display);
signals[0] = wl_event_loop_add_signal(loop, SIGTERM, on_term_signal,
display);
- signals[1] = wl_event_loop_add_signal(loop, SIGINT, on_term_signal,
+ signals[1] = wl_event_loop_add_signal(loop, SIGUSR2, on_term_signal,
display);
- signals[2] = wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal,
+ signals[2] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
display);
+ /* When debugging the compositor, if use wl_event_loop_add_signal() to
+ * catch SIGINT, the debugger can't catch it, and attempting to stop
+ * the compositor from within the debugger results in weston exiting
+ * cleanly.
+ *
+ * Instead, use the sigaction() function, which sets up the signal in a
+ * way that gdb can successfully catch, but have the handler for SIGINT
+ * send SIGUSR2 (xwayland uses SIGUSR1), which we catch via
+ * wl_event_loop_add_signal().
+ */
+ action.sa_handler = sigint_helper;
+ sigemptyset(&action.sa_mask);
+ action.sa_flags = 0;
+ sigaction(SIGINT, &action, NULL);
+
for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
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;
}
- if (compositor_init_config(ivi.compositor, ivi.config) < 0)
+ if (compositor_init_config(&ivi) < 0)
goto error_compositor;
if (load_backend(&ivi, backend, &argc, argv) < 0) {
weston_compositor_wake(ivi.compositor);
ivi_shell_create_global(&ivi);
- ivi_launch_shell_client(&ivi);
+
+ ivi_launch_shell_client(&ivi, "shell-client",
+ &ivi.shell_client.client);
+ ivi_launch_shell_client(&ivi, "shell-client-ext",
+ &ivi.shell_client_ext.client);
+
if (debug)
ivi_screenshooter_create(&ivi);
ivi_agl_systemd_notify(&ivi);
wl_display_destroy_clients(display);
error_compositor:
- weston_compositor_tear_down(ivi.compositor);
-
- weston_compositor_log_scope_destroy(log_scope);
- log_scope = NULL;
+ free(backend);
+ backend = NULL;
+ free(modules);
+ modules = 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