X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=cc9ea3b41675cbbde3d967c164a2234269d2f2b2;hb=ac4e3581fb1834a7d28eeaa2575777635d790279;hp=fd0006fa963d2d7c16d3a304e848ba77984e6bd6;hpb=2d7243208d3e455decd730e7e33ab2452b1a0508;p=src%2Fagl-compositor.git diff --git a/src/main.c b/src/main.c index fd0006f..cc9ea3b 100644 --- a/src/main.c +++ b/src/main.c @@ -24,6 +24,7 @@ */ #include "ivi-compositor.h" +#include "policy.h" #include #include @@ -36,14 +37,18 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#ifdef HAVE_BACKEND_X11 +#include +#endif +#include +#include +#include +#include #include "shared/os-compatibility.h" +#include "shared/helpers.h" #include "agl-shell-server-protocol.h" @@ -536,7 +541,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) struct weston_config_section *section; int use_current_mode = 0; int use_pixman = 0; - int use_shadow; + bool use_shadow; int ret; const struct weston_option options[] = { @@ -582,7 +587,7 @@ windowed_parse_common_options(struct ivi_compositor *ivi, int *argc, char *argv[ bool *use_pixman, bool *fullscreen, int *output_count) { struct weston_config_section *section; - int pixman; + bool pixman; int fs = 0; const struct weston_option options[] = { @@ -709,6 +714,7 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) return windowed_create_outputs(ivi, output_count, "WL", "wayland"); } +#ifdef HAVE_BACKEND_X11 static int load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) { @@ -746,6 +752,13 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) return windowed_create_outputs(ivi, output_count, "X", "screen"); } +#else +static int +load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) +{ + return -1; +} +#endif static int load_backend(struct ivi_compositor *ivi, const char *backend, @@ -785,8 +798,8 @@ compositor_init_config(struct weston_compositor *compositor, struct xkb_rule_names xkb_names; struct weston_config_section *section; int repaint_msec; - int vt_switching; - int require_input; + bool vt_switching; + bool require_input; /* agl-compositor.ini [keyboard] */ section = weston_config_get_section(config, "keyboard", NULL, NULL); @@ -967,8 +980,6 @@ load_config(struct weston_config **config, bool no_config, } static FILE *logfile; -//static struct weston_log_scope *log_scope; -//static struct weston_log_scope *protocol_scope; static int log_timestamp(void) @@ -1088,10 +1099,24 @@ usage(int error_code) exit(error_code); } +static void +ivi_compositor_get_quirks(struct ivi_compositor *ivi) +{ + struct weston_config_section *section; + + if (!ivi->config) + return; + + section = weston_config_get_section(ivi->config, "shell", NULL, NULL); + weston_config_section_get_bool(section, "activate-by-default", + &ivi->quirks.activate_apps_by_default, 0); + +} + int main(int argc, char *argv[]) { struct ivi_compositor ivi = { 0 }; - struct wl_display *display; + struct wl_display *display = NULL; struct wl_event_loop *loop; struct wl_event_source *signals[3] = { 0 }; struct weston_config_section *section; @@ -1103,7 +1128,10 @@ int main(int argc, char *argv[]) int version = 0; int no_config = 0; char *config_file = NULL; - int debug_protocol = 0; + struct weston_log_context *log_ctx = NULL; + struct weston_log_scope *log_scope; + struct weston_log_subscriber *logger; + int ret = EXIT_FAILURE; const struct weston_option core_options[] = { { WESTON_OPTION_STRING, "backend", 'B', &backend }, @@ -1113,12 +1141,13 @@ int main(int argc, char *argv[]) { WESTON_OPTION_BOOLEAN, "version", 0, &version }, { WESTON_OPTION_BOOLEAN, "no-config", 0, &no_config }, { WESTON_OPTION_STRING, "config", 'c', &config_file }, - { WESTON_OPTION_BOOLEAN, "debug", 0, &debug_protocol }, }; wl_list_init(&ivi.outputs); wl_list_init(&ivi.surfaces); wl_list_init(&ivi.pending_surfaces); + wl_list_init(&ivi.popup_pending_apps); + wl_list_init(&ivi.desktop_clients); /* Prevent any clients we spawn getting our stdin */ os_fd_set_cloexec(STDIN_FILENO); @@ -1133,9 +1162,22 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } + log_ctx = weston_log_ctx_compositor_create(); + if (!log_ctx) { + fprintf(stderr, "Failed to initialize weston debug framework.\n"); + return ret; + } + + log_scope = weston_compositor_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"); + if (load_config(&ivi.config, no_config, config_file) < 0) goto error_signals; section = weston_config_get_section(ivi.config, "core", NULL, NULL); @@ -1146,6 +1188,8 @@ int main(int argc, char *argv[]) backend = choose_default_backend(); } + ivi_compositor_get_quirks(&ivi); + display = wl_display_create(); loop = wl_display_get_event_loop(display); @@ -1165,7 +1209,7 @@ int main(int argc, char *argv[]) if (!signals[i]) goto error_signals; - ivi.compositor = weston_compositor_create(display, &ivi); + ivi.compositor = weston_compositor_create(display, log_ctx, &ivi); if (!ivi.compositor) { weston_log("fatal: failed to create compositor.\n"); goto error_signals; @@ -1186,6 +1230,9 @@ int main(int argc, char *argv[]) if (ivi_desktop_init(&ivi) < 0) goto error_compositor; + if (ivi_policy_init(&ivi) < 0) + goto error_compositor; + if (ivi_shell_init(&ivi) < 0) goto error_compositor; @@ -1193,6 +1240,8 @@ int main(int argc, char *argv[]) weston_compositor_flush_heads_changed(ivi.compositor); + ivi_shell_init_black_fs(&ivi); + if (create_listening_socket(display, socket_name) < 0) goto error_compositor; @@ -1202,14 +1251,27 @@ int main(int argc, char *argv[]) ivi_shell_create_global(&ivi); ivi_launch_shell_client(&ivi); + ivi_agl_systemd_notify(&ivi); wl_display_run(display); + ret = ivi.compositor->exit_code; + wl_display_destroy_clients(display); error_compositor: + weston_compositor_tear_down(ivi.compositor); + + 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); + + ivi_policy_destroy(ivi.policy); + error_signals: for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i) if (signals[i]) @@ -1220,4 +1282,6 @@ error_signals: log_file_close(); if (ivi.config) weston_config_destroy(ivi.config); + + return ret; }