X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=df97b2482dd4256581d8c81ecc32b7eb07aaa9cf;hb=795eb91d057b491011594162b402543c525d6545;hp=74e97d0834e8998451e7b7336c59fa4553f5cbf3;hpb=191dc29c7d05d8af9aa2c659275436ec4c4495c0;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 74e97d0..df97b24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
  */
 
 #include "ivi-compositor.h"
+#include "policy.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -36,14 +37,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"
 
@@ -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)
@@ -1118,6 +1129,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 },
@@ -1133,6 +1147,8 @@ 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.popup_pending_apps);
+	wl_list_init(&ivi.desktop_clients);
 
 	/* Prevent any clients we spawn getting our stdin */
 	os_fd_set_cloexec(STDIN_FILENO);
@@ -1147,9 +1163,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, 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);
@@ -1181,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;
@@ -1202,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;
 
@@ -1227,8 +1258,18 @@ 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);
+
+	ivi_policy_destroy(ivi.policy);
+
 error_signals:
 	for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
 		if (signals[i])