return weston_compositor_get_user_data(ec);
}
+static void
+sigint_helper(int sig)
+{
+ raise(SIGUSR2);
+}
+
static void
handle_output_destroy(struct wl_listener *listener, void *data)
{
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);
}
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);
}
static struct weston_config_section *
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)
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);
- surface = to_ivi_surface(main_surface);
- if (!surface)
+ if (!focus_view)
return;
- weston_seat_set_keyboard_focus(seat, focus);
+ 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;
+
+ 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
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 },
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);
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);
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;