X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=b5f13b46f00e914bdba595beddbdbacdc7ff1894;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Fadd-waltham-support;hp=4886a0a4f15f2c74dcd7ae2d54986a03808c1a35;hpb=faea097edab0971709e847193e1bf1837ab8030c;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 4886a0a..b5f13b4 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -42,6 +42,10 @@
 #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);
 
@@ -95,6 +99,41 @@ 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);
+	api->surface_push_to_remote(weston_surface, app_id, trans_remote, NULL);
+}
+
 static void
 ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 {
@@ -115,6 +154,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);
 }
 
@@ -366,24 +408,28 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 	ret = ivi_check_pending_desktop_surface_popup(surface);
 	if (ret) {
 		ivi_set_desktop_surface_popup(surface);
+		ivi_layout_popup_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_split(surface);
 	if (ret) {
 		ivi_set_desktop_surface_split(surface);
+		ivi_layout_split_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_fullscreen(surface);
 	if (ret) {
 		ivi_set_desktop_surface_fullscreen(surface);
+		ivi_layout_fullscreen_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_remote(surface);
 	if (ret) {
 		ivi_set_desktop_surface_remote(surface);
+		ivi_layout_desktop_committed(surface);
 		return;
 	}
 
@@ -565,6 +611,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);
 
@@ -612,9 +661,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;
 	}
@@ -789,8 +838,7 @@ shell_set_panel(struct wl_client *client,
 	weston_desktop_surface_set_size(dsurface, width, height);
 }
 
-
-static void
+void
 shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
 			  const char *data, uint32_t app_state)
 {