X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=2bbb800626e0776ead90ca63364cc537d79e60c4;hb=7af3d3760c29157282348648d893af285b7efb34;hp=2764d4b9f302908e567316686ccaa92dca01b4c9;hpb=1956bd3bfb0c85e3eb3413dd465a1a2fb1ae78bb;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 2764d4b..2bbb800 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
 #include <libweston/windowed-output-api.h>
 #include <libweston/config-parser.h>
 #include <libweston/weston-log.h>
+#include <weston/weston.h>
 
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
@@ -85,6 +86,20 @@ to_ivi_output(struct weston_output *o)
 	return output;
 }
 
+static void
+ivi_output_configure_app_id(struct ivi_output *ivi_output)
+{
+	if (ivi_output->config) {
+		if (ivi_output->app_id != NULL)
+			return;
+
+		weston_config_section_get_string(ivi_output->config,
+						 "agl-shell-app-id",
+						 &ivi_output->app_id,
+						 NULL);
+	}
+}
+
 static struct ivi_output *
 ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 		  struct weston_config_section *config)
@@ -119,6 +134,7 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 					   &output->output_destroy);
 
 	wl_list_insert(&ivi->outputs, &output->link);
+	ivi_output_configure_app_id(output);
 	return output;
 }
 
@@ -1126,20 +1142,6 @@ 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 };
@@ -1173,6 +1175,9 @@ int main(int argc, char *argv[])
 	wl_list_init(&ivi.surfaces);
 	wl_list_init(&ivi.pending_surfaces);
 	wl_list_init(&ivi.popup_pending_apps);
+	wl_list_init(&ivi.fullscreen_pending_apps);
+	wl_list_init(&ivi.split_pending_apps);
+	wl_list_init(&ivi.remote_pending_apps);
 	wl_list_init(&ivi.desktop_clients);
 
 	/* Prevent any clients we spawn getting our stdin */
@@ -1214,8 +1219,6 @@ 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);