X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=164b45b87315c64c28aa47afa55a096a160468d3;hb=991714fc7f92aea3d07c7225247a821e3461027e;hp=de2188f049cb63fde4a77c366bff6f0a7487ff3c;hpb=9f2f83ea833dbc4da0bc026b22873a32e221664c;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index de2188f..164b45b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -101,6 +101,12 @@ ivi_output_configure_app_id(struct ivi_output *ivi_output)
 						 "agl-shell-app-id",
 						 &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);
 	}
 }
 
@@ -564,6 +570,9 @@ drm_backend_remoted_output_configure(struct weston_output *output,
 	char *host = NULL;
 	char *pipeline = NULL;
 	int port, ret;
+	int32_t scale = 1;
+	uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
+	char *trans;
 
 	ret = api->set_mode(output, modeline);
 	if (ret < 0) {
@@ -573,9 +582,15 @@ drm_backend_remoted_output_configure(struct weston_output *output,
 		return -1;
 	}
 
-	/* FIXME: retrieve the scale and the transform from config file */
-	weston_output_set_scale(output, 1);
-	weston_output_set_transform(output, WL_OUTPUT_TRANSFORM_NORMAL);
+	weston_config_section_get_int(section, "scale", &scale, 1);
+	weston_output_set_scale(output, scale);
+
+	weston_config_section_get_string(section, "transform", &trans, "normal");
+	if (parse_transform(trans, &transform) < 0) {
+		weston_log("Invalid transform \"%s\" for output %s\n",
+			   trans, output->name);
+	}
+	weston_output_set_transform(output, transform);
 
 	weston_config_section_get_string(section, "gbm-format",
 					 &gbm_format, NULL);
@@ -663,25 +678,12 @@ err:
 	return ret;
 }
 
-static int
-load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
+static void
+ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 {
-	struct weston_compositor *compositor = ivi->compositor;
-	int (*module_init)(struct weston_compositor *wc);
 	struct weston_config_section *remote_section = NULL;
 	const char *section_name;
-
-	module_init = weston_load_module("remoting-plugin.so",
-					 "weston_module_init");
-	if (!module_init)
-		return -1;
-
-	if (module_init(compositor) < 0)
-		return -1;
-
-	ivi->remoting_api = weston_remoting_get_api(compositor);
-	if (!ivi->remoting_api)
-		return -1;
+	struct weston_config *config = ivi->config;
 
 	while (weston_config_next_section(config, &remote_section, &section_name)) {
 		if (strcmp(section_name, "remote-output"))
@@ -691,7 +693,8 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
 		bool output_found = false;
 		char *_name = NULL;
 
-		weston_config_section_get_string(remote_section, "name", &_name, NULL);
+		weston_config_section_get_string(remote_section,
+						 "name", &_name, NULL);
 		wl_list_for_each(ivi_output, &ivi->outputs, link) {
 			if (!strcmp(ivi_output->name, _name)) {
 				output_found = true;
@@ -710,7 +713,7 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
 		ivi_output->name = _name;
 		ivi_output->config = remote_section;
 
-		if (remote_output_init(ivi_output, compositor,
+		if (remote_output_init(ivi_output, ivi->compositor,
 				       remote_section, ivi->remoting_api)) {
 			free(ivi_output->name);
 			free(ivi_output);
@@ -722,13 +725,32 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
 						   &ivi_output->output_destroy);
 
 		wl_list_insert(&ivi->outputs, &ivi_output->link);
+		ivi_output_configure_app_id(ivi_output);
 	}
+}
+
+static int
+load_remoting_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("remoting-plugin.so",
+					 "weston_module_init");
+	if (!module_init)
+		return -1;
+
+	if (module_init(compositor) < 0)
+		return -1;
 
+	ivi->remoting_api = weston_remoting_get_api(compositor);
+	if (!ivi->remoting_api)
+		return -1;
 	return 0;
 }
 #else
 static int
-load_remoting(struct weston_compositor *compositor, struct weston_config *config)
+load_remoting_plugin(struct weston_compositor *compositor, struct weston_config *config)
 {
 	return -1;
 }
@@ -781,7 +803,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 		goto error;
 	}
 
-	load_remoting(ivi, ivi->config);
+	load_remoting_plugin(ivi, ivi->config);
 
 error:
 	free(config.gbm_format);
@@ -1457,6 +1479,9 @@ int main(int argc, char *argv[])
 
 	weston_compositor_flush_heads_changed(ivi.compositor);
 
+	if (ivi.remoting_api)
+		ivi_enable_remote_outputs(&ivi);
+
 	ivi_shell_init_black_fs(&ivi);
 
 	if (create_listening_socket(display, socket_name) < 0)
@@ -1468,6 +1493,7 @@ int main(int argc, char *argv[])
 
 	ivi_shell_create_global(&ivi);
 	ivi_launch_shell_client(&ivi);
+	ivi_screenshooter_create(&ivi);
 	ivi_agl_systemd_notify(&ivi);
 
 	wl_display_run(display);