X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=e00cf1274bdcd65737d4a01fe8b478d1453e913d;hb=fd9fc2da91e56a64e9ddb87eb46151c186f6c79f;hp=590742aa4388bd63858a1b0b2b16b0b75f59ccc3;hpb=a04518d86f8b048902bae0167c6a6bc9f2276e89;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 590742a..e00cf12 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;
 
@@ -102,6 +106,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 +562,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 +748,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 +841,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 +1384,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 +1404,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 +1417,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 +1468,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 +1511,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;
 
@@ -1476,20 +1523,22 @@ int main(int argc, char *argv[])
 
 	weston_compositor_flush_heads_changed(ivi.compositor);
 
-	ivi_shell_init_black_fs(&ivi);
-
 	if (ivi.remoting_api)
 		ivi_enable_remote_outputs(&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);