X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=f71528056c1bbee632b448b83e7ca90e40a52abe;hb=3b38187d416182306e0533f17a6129a45a168f14;hp=eefdc190221898059a008108697d890cd69a438d;hpb=ffd00ab3a05351bac2124e5eba8a66f20a3b62da;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index eefdc19..f715280 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,14 +36,18 @@
 #include <unistd.h>
 #include <linux/input.h>
 
-#include <libweston-6/compositor-drm.h>
-#include <libweston-6/compositor-wayland.h>
-#include <libweston-6/compositor-x11.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/windowed-output-api.h>
-#include <libweston-6/config-parser.h>
+#include <libweston/backend-drm.h>
+#include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_X11
+#include <libweston/backend-x11.h>
+#endif
+#include <libweston/libweston.h>
+#include <libweston/windowed-output-api.h>
+#include <libweston/config-parser.h>
+#include <libweston/weston-log.h>
 
 #include "shared/os-compatibility.h"
+#include "shared/helpers.h"
 
 #include "agl-shell-server-protocol.h"
 
@@ -709,6 +713,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 +751,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,
@@ -967,8 +979,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 +1098,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;
@@ -1104,6 +1128,9 @@ int main(int argc, char *argv[])
 	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;
 
 	const struct weston_option core_options[] = {
 		{ WESTON_OPTION_STRING, "backend", 'B', &backend },
@@ -1119,6 +1146,7 @@ int main(int argc, char *argv[])
 	wl_list_init(&ivi.outputs);
 	wl_list_init(&ivi.surfaces);
 	wl_list_init(&ivi.pending_surfaces);
+	wl_list_init(&ivi.desktop_clients);
 
 	/* Prevent any clients we spawn getting our stdin */
 	os_fd_set_cloexec(STDIN_FILENO);
@@ -1133,9 +1161,21 @@ 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 EXIT_FAILURE;
+	}
+
+        log_scope = weston_compositor_add_log_scope(log_ctx, "log",
+						    "agl-compositor log\n",
+						    NULL, NULL);
+
 	log_file_open(log);
 	weston_log_set_handler(vlog, vlog_continue);
 
+	logger = weston_log_subscriber_create_log(logfile);
+
 	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 +1186,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 +1207,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;
@@ -1193,6 +1235,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;
 
@@ -1209,8 +1253,16 @@ int main(int argc, char *argv[])
 	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);
+
 error_signals:
 	for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
 		if (signals[i])