X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=4a501af9c1cad5b4a10b5f9feb6a4c35644fc1cb;hb=0a22dff42d49d1a38137fc47c747620fdb3f3814;hp=94fdb669aae8c21fe1605675b3cc320353ef3254;hpb=abe3abc327b7d770b81f976d79f12112010e6a4e;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 94fdb66..4a501af 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -42,15 +42,22 @@
 #include "agl-shell-server-protocol.h"
 #include "agl-shell-desktop-server-protocol.h"
 
+#ifdef HAVE_WALTHAM
+#include <waltham-transmitter/transmitter_api.h>
+#endif
+
 static void
 create_black_surface_view(struct ivi_output *output);
 
-static void
+void
 agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
 					   struct ivi_surface *surface)
 {
 	struct desktop_client *dclient;
 
+	if (surface->advertised_on_launch)
+		return;
+
 	/* advertise to all desktop clients the new surface */
 	wl_list_for_each(dclient, &ivi->desktop_clients, link) {
 		const char *app_id =
@@ -60,6 +67,7 @@ agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
 			return;
 		}
 		agl_shell_desktop_send_application(dclient->resource, app_id);
+		surface->advertised_on_launch = true;
 	}
 }
 
@@ -99,6 +107,61 @@ ivi_set_desktop_surface_fullscreen(struct ivi_surface *surface)
 	agl_shell_desktop_advertise_application_id(ivi, surface);
 }
 
+static void
+ivi_output_notify_waltham_plugin(struct ivi_surface *surface)
+{
+	struct ivi_compositor *ivi = surface->ivi;
+	const struct weston_transmitter_api *api = ivi->waltham_transmitter_api;
+	struct weston_transmitter *transmitter;
+	struct weston_transmitter_remote *trans_remote;
+	struct weston_surface *weston_surface;
+	struct weston_output *woutput = surface->remote.output->output;
+	const char *app_id;
+
+	if (!api)
+		return;
+
+	transmitter = api->transmitter_get(ivi->compositor);
+	if (!transmitter)
+		return;
+
+	trans_remote = api->get_transmitter_remote(woutput->name, transmitter);
+	if (!trans_remote) {
+		weston_log("Could not find a valie weston_transmitter_remote "
+				"that matches the output %s\n", woutput->name);
+		return;
+	}
+
+	app_id = weston_desktop_surface_get_app_id(surface->dsurface);
+	weston_surface =
+		weston_desktop_surface_get_surface(surface->dsurface);
+
+	weston_log("Forwarding app_id %s to remote %s\n", app_id, woutput->name);
+
+	/* this will have the effect of informing the remote side to create a
+	 * surface with the name app_id. W/ xdg-shell the following happens:
+	 *
+	 * compositor (server):
+	 * surface_push_to_remote():
+	 * 	waltham-transmitter plug-in
+	 * 		-> wthp_ivi_app_id_surface_create()
+	 *
+	 * client -- on the receiver side:
+	 * 	-> wthp_ivi_app_id_surface_create()
+	 * 		-> wth_receiver_weston_main()
+	 * 			-> wl_compositor_create_surface()
+	 * 			-> xdg_wm_base_get_xdg_surface
+	 * 			-> xdg_toplevel_set_app_id()
+	 * 			-> gst_init()
+	 * 			-> gst_parse_launch()
+	 *
+	 * wth_receiver_weston_main() will be invoked from the handler of
+	 * wthp_ivi_app_id_surface_create() and is responsible for setting-up
+	 * the gstreamer pipeline as well.
+	 */
+	api->surface_push_to_remote(weston_surface, app_id, trans_remote, NULL);
+}
+
 static void
 ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 {
@@ -119,6 +182,9 @@ ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 	if (view->is_mapped || view->surface->is_mapped)
 		remove_black_surface(output);
 
+	if (output->type == OUTPUT_WALTHAM)
+		ivi_output_notify_waltham_plugin(surface);
+
 	wl_list_insert(&ivi->surfaces, &surface->link);
 }
 
@@ -577,6 +643,9 @@ create_black_surface_view(struct ivi_output *output)
 	struct weston_compositor *wc= ivi->compositor;
 	struct weston_output *woutput = output->output;
 
+	if (!woutput)
+		return;
+
 	surface = weston_surface_create(wc);
 	view = weston_view_create(surface);
 
@@ -624,9 +693,9 @@ insert_black_surface(struct ivi_output *output)
 {
 	struct weston_view *view;
 
-	if (!output &&
+	if ((!output &&
 	    !output->fullscreen_view.fs &&
-	    !output->fullscreen_view.fs->view) {
+	    !output->fullscreen_view.fs->view) || !output->output) {
 		weston_log("Output %s doesn't have a surface installed!\n", output->name);
 		return;
 	}