X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=340d0e08de2dba3f0eaaa4b08df69b575c0da6ee;hb=61dff3ff317c4d686b481cb808f98c51f7b743c3;hp=431d1d47dd136cf8fda3539bc2b998a925f75ce2;hpb=36d2a12f8176ef1feb54405b777e81d6b15af35c;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 431d1d4..340d0e0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,7 @@
 
 #include <libweston/backend-drm.h>
 #include <libweston/backend-wayland.h>
+#include <libweston/backend-headless.h>
 #ifdef HAVE_BACKEND_X11
 #include <libweston/backend-x11.h>
 #endif
@@ -289,6 +290,8 @@ windowed_configure_output(struct ivi_output *output)
 		return -1;
 	}
 
+	weston_log("Configured windowed_output_api to %dx%d\n", width, height);
+
 	return 0;
 }
 
@@ -771,6 +774,58 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 	}
 }
 
+static void
+ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
+{
+	struct weston_config_section *transmitter_section = NULL;
+	const char *sect_name;
+	struct weston_config *config = ivi->config;
+
+	while (weston_config_next_section(config, &transmitter_section, &sect_name)) {
+		if (strcmp(sect_name, "transmitter-output"))
+			continue;
+
+		struct ivi_output *ivi_output = NULL;
+		bool output_found = false;
+		char *_name = NULL;
+
+		weston_config_section_get_string(transmitter_section,
+				"name", &_name, NULL);
+		wl_list_for_each(ivi_output, &ivi->outputs, link) {
+			if (!strcmp(ivi_output->name, _name)) {
+				output_found = true;
+				break;
+			}
+		}
+
+		if (output_found) {
+			free(_name);
+			continue;
+		}
+
+		ivi_output = zalloc(sizeof(*ivi_output));
+
+		ivi_output->ivi = ivi;
+		ivi_output->name = _name;
+		ivi_output->config = transmitter_section;
+
+		if (remote_output_init(ivi_output, ivi->compositor,
+					transmitter_section, ivi->remoting_api)) {
+			free(ivi_output->name);
+			free(ivi_output);
+			continue;
+		}
+
+		ivi_output->type = OUTPUT_WALTHAM;
+		ivi_output->output_destroy.notify = handle_output_destroy;
+		weston_output_add_destroy_listener(ivi_output->output,
+				&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)
 {
@@ -1032,6 +1087,54 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 }
 #endif
 
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+	struct weston_headless_backend_config config = {};
+	int ret = 0;
+
+	bool use_pixman;
+	bool fullscreen;
+	bool use_gl;
+	int output_count;
+
+	struct weston_compositor *c = ivi->compositor;
+
+	const struct weston_option options[] = {
+		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
+		{ WESTON_OPTION_BOOLEAN, "use-gl", 0, &use_gl },
+	};
+
+	windowed_parse_common_options(ivi, argc, argv, &use_pixman,
+			&fullscreen, &output_count);
+
+	parse_options(options, ARRAY_LENGTH(options), argc, argv);
+	config.use_pixman = use_pixman;
+	config.use_gl = use_gl;
+
+	config.base.struct_version = WESTON_HEADLESS_BACKEND_CONFIG_VERSION;
+	config.base.struct_size = sizeof(struct weston_headless_backend_config);
+
+	/* load the actual headless-backend and configure it */
+	ret = weston_compositor_load_backend(c, WESTON_BACKEND_HEADLESS,
+					     &config.base);
+	if (ret < 0)
+		return ret;
+
+	ivi->window_api = weston_windowed_output_get_api(c);
+	if (!ivi->window_api) {
+		weston_log("Cannot use weston_windowed_output_api.\n");
+		return -1;
+	}
+
+	if (ivi->window_api->create_head(c, "headless") < 0) {
+		weston_log("Cannot create headless back-end\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int
 load_backend(struct ivi_compositor *ivi, const char *backend,
 	     int *argc, char *argv[])
@@ -1042,6 +1145,8 @@ load_backend(struct ivi_compositor *ivi, const char *backend,
 		return load_wayland_backend(ivi, argc, argv);
 	} else if (strcmp(backend, "x11-backend.so") == 0) {
 		return load_x11_backend(ivi, argc, argv);
+	} else if (strcmp(backend, "headless-backend.so") == 0) {
+		return load_headless_backend(ivi, argc, argv);
 	}
 
 	weston_log("fatal: unknown backend '%s'.\n", backend);
@@ -1385,6 +1490,7 @@ usage(int error_code)
 			"\t\t\t\tdrm-backend.so\n"
 			"\t\t\t\twayland-backend.so\n"
 			"\t\t\t\tx11-backend.so\n"
+			"\t\t\t\theadless-backend.so\n"
 		"  -S, --socket=NAME\tName of socket to listen on\n"
 		"  --log=FILE\t\tLog to the given file\n"
 		"  -c, --config=FILE\tConfig file to load, defaults to agl-compositor.ini\n"
@@ -1475,6 +1581,7 @@ int main(int argc, char *argv[])
 	}
 	/* from [core] */
 	weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
+	weston_config_section_get_bool(section, "activate-by-default", &ivi.activate_by_default, true);
 
 	display = wl_display_create();
 	loop = wl_display_get_event_loop(display);
@@ -1531,6 +1638,9 @@ int main(int argc, char *argv[])
 	if (ivi.remoting_api)
 		ivi_enable_remote_outputs(&ivi);
 
+	if (ivi.waltham_transmitter_api)
+		ivi_enable_waltham_outputs(&ivi);
+
 	if (create_listening_socket(display, socket_name) < 0)
 		goto error_compositor;