X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=df97b2482dd4256581d8c81ecc32b7eb07aaa9cf;hb=d0b4585202c46be21b415c664b9d010057c37686;hp=f63cdaf88bd74043e8f33eb0f7d764e53ff73ec0;hpb=c769a2723246f0494fb127e1ba1a70c5149db792;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index f63cdaf..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>
@@ -38,13 +39,16 @@
 
 #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"
 
@@ -537,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[] = {
@@ -583,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[] = {
@@ -710,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[])
 {
@@ -747,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,
@@ -786,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);
@@ -1135,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);
@@ -1157,7 +1171,7 @@ int main(int argc, char *argv[])
 
         log_scope = weston_compositor_add_log_scope(log_ctx, "log",
 						    "agl-compositor log\n",
-						    NULL, NULL);
+						    NULL, NULL, NULL);
 
 	log_file_open(log);
 	weston_log_set_handler(vlog, vlog_continue);
@@ -1216,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;
 
@@ -1251,6 +1268,8 @@ error_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])