X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=431d1d47dd136cf8fda3539bc2b998a925f75ce2;hb=refs%2Fchanges%2F36%2F25436%2F3;hp=e0a9d7949c37973465df0e578cd8244594591637;hpb=81be1de53fd49b7a31e5fea217e88c038e22c3f9;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index e0a9d79..431d1d4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,6 +57,10 @@
 #include "remote.h"
 #endif
 
+#ifdef HAVE_WALTHAM
+#include <waltham-transmitter/transmitter_api.h>
+#endif
+
 static int cached_tm_mday = -1;
 static struct weston_log_scope *log_scope;
 
@@ -74,6 +78,11 @@ handle_output_destroy(struct wl_listener *listener, void *data)
 	output = wl_container_of(listener, output, output_destroy);
 	assert(output->output == data);
 
+	if (output->fullscreen_view.fs->view) {
+		weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+		output->fullscreen_view.fs->view = NULL;
+	}
+
 	output->output = NULL;
 	wl_list_remove(&output->output_destroy.link);
 }
@@ -102,6 +111,9 @@ ivi_output_configure_app_id(struct ivi_output *ivi_output)
 						 &ivi_output->app_id,
 						 NULL);
 
+		if (ivi_output->app_id == NULL)
+			return;
+
 		weston_log("Will place app_id %s on output %s\n",
 				ivi_output->app_id, ivi_output->name);
 	}
@@ -555,6 +567,38 @@ heads_changed(struct wl_listener *listener, void *arg)
 	}
 }
 
+#ifdef HAVE_WALTHAM
+static int
+load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
+{
+	struct weston_compositor *compositor = ivi->compositor;
+	int (*module_init)(struct weston_compositor *wc);
+
+	module_init = weston_load_module("waltham-transmitter.so",
+					 "wet_module_init");
+	if (!module_init)
+		return -1;
+
+	if (module_init(compositor) < 0)
+		return -1;
+
+	ivi->waltham_transmitter_api = weston_get_transmitter_api(compositor);
+	if (!ivi->waltham_transmitter_api) {
+		weston_log("Failed to load waltham-transmitter plugin.\n");
+		return -1;
+	}
+
+	weston_log("waltham-transmitter plug-in loaded\n");
+	return 0;
+}
+#else
+static int
+load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
+{
+	return -1;
+}
+#endif
+
 #ifdef HAVE_REMOTING
 static int
 drm_backend_remoted_output_configure(struct weston_output *output,
@@ -709,6 +753,7 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
 		ivi_output->config = remote_section;
+		ivi_output->type = OUTPUT_REMOTE;
 
 		if (remote_output_init(ivi_output, ivi->compositor,
 				       remote_section, ivi->remoting_api)) {
@@ -801,6 +846,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 	}
 
 	load_remoting_plugin(ivi, ivi->config);
+	load_waltham_plugin(ivi, ivi->config);
 
 error:
 	free(config.gbm_format);
@@ -1343,7 +1389,7 @@ usage(int error_code)
 		"  --log=FILE\t\tLog to the given file\n"
 		"  -c, --config=FILE\tConfig file to load, defaults to agl-compositor.ini\n"
 		"  --no-config\t\tDo not read agl-compositor.ini\n"
-		"  --debug\t\tEnable debug extension\n"
+		"  --debug\t\tEnable debug extension(s)\n"
 		"  -h, --help\t\tThis help message\n"
 		"\n");
 	exit(error_code);
@@ -1363,6 +1409,7 @@ int main(int argc, char *argv[])
 	int help = 0;
 	int version = 0;
 	int no_config = 0;
+	int debug = 0;
 	char *config_file = NULL;
 	struct weston_log_context *log_ctx = NULL;
 	struct weston_log_subscriber *logger;
@@ -1375,6 +1422,7 @@ int main(int argc, char *argv[])
 		{ WESTON_OPTION_BOOLEAN, "help", 'h', &help },
 		{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
 		{ WESTON_OPTION_BOOLEAN, "no-config", 0, &no_config },
+		{ WESTON_OPTION_BOOLEAN, "debug", 0, &debug },
 		{ WESTON_OPTION_STRING, "config", 'c', &config_file },
 	};
 
@@ -1425,6 +1473,8 @@ int main(int argc, char *argv[])
 		if (!backend)
 			backend = choose_default_backend();
 	}
+	/* from [core] */
+	weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
 
 	display = wl_display_create();
 	loop = wl_display_get_event_loop(display);
@@ -1466,6 +1516,8 @@ int main(int argc, char *argv[])
 	if (ivi_desktop_init(&ivi) < 0)
 		goto error_compositor;
 
+	ivi_seat_init(&ivi);
+
 	if (ivi_policy_init(&ivi) < 0)
 		goto error_compositor;
 
@@ -1479,17 +1531,19 @@ int main(int argc, char *argv[])
 	if (ivi.remoting_api)
 		ivi_enable_remote_outputs(&ivi);
 
-	ivi_shell_init_black_fs(&ivi);
-
 	if (create_listening_socket(display, socket_name) < 0)
 		goto error_compositor;
 
+	ivi_shell_init_black_fs(&ivi);
+
 	ivi.compositor->exit = handle_exit;
 
 	weston_compositor_wake(ivi.compositor);
 
 	ivi_shell_create_global(&ivi);
 	ivi_launch_shell_client(&ivi);
+	if (debug)
+		ivi_screenshooter_create(&ivi);
 	ivi_agl_systemd_notify(&ivi);
 
 	wl_display_run(display);