X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=5a8cc42215f7d257c1ed00f7971ef2288387b8a0;hb=bdd8dd718496dc8e4330209c46c196442bcf7d3e;hp=e1aac8dd99b810f3853b6e0d20ed831ec076c803;hpb=5c90f1639cada9e0d41bd1538bf62c0a12152ace;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index e1aac8d..5a8cc42 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -42,27 +42,51 @@
 #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);
 
 void
-ivi_set_desktop_surface(struct ivi_surface *surface)
+agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
+					   struct ivi_surface *surface)
 {
 	struct desktop_client *dclient;
-	struct ivi_compositor *ivi = surface->ivi;
-	assert(surface->role == IVI_SURFACE_ROLE_NONE);
+	static bool display_adv = false;
 
-	surface->role = IVI_SURFACE_ROLE_DESKTOP;
-	wl_list_insert(&surface->ivi->surfaces, &surface->link);
+	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 =
 			weston_desktop_surface_get_app_id(surface->dsurface);
+		if (app_id == NULL) {
+			if (!display_adv) {
+				weston_log("WARNING app_is is null, unable to advertise\n");
+				display_adv = true;
+			}
+			return;
+		}
 		agl_shell_desktop_send_application(dclient->resource, app_id);
+		surface->advertised_on_launch = true;
 	}
 }
 
+void
+ivi_set_desktop_surface(struct ivi_surface *surface)
+{
+	struct ivi_compositor *ivi = surface->ivi;
+	assert(surface->role == IVI_SURFACE_ROLE_NONE);
+
+	surface->role = IVI_SURFACE_ROLE_DESKTOP;
+	wl_list_insert(&surface->ivi->surfaces, &surface->link);
+
+	agl_shell_desktop_advertise_application_id(ivi, surface);
+}
+
 static void
 ivi_set_desktop_surface_popup(struct ivi_surface *surface)
 {
@@ -71,6 +95,8 @@ ivi_set_desktop_surface_popup(struct ivi_surface *surface)
 
 	surface->role = IVI_SURFACE_ROLE_POPUP;
 	wl_list_insert(&ivi->surfaces, &surface->link);
+
+	agl_shell_desktop_advertise_application_id(ivi, surface);
 }
 
 static void
@@ -81,8 +107,92 @@ ivi_set_desktop_surface_fullscreen(struct ivi_surface *surface)
 
 	surface->role = IVI_SURFACE_ROLE_FULLSCREEN;
 	wl_list_insert(&ivi->surfaces, &surface->link);
+
+	agl_shell_desktop_advertise_application_id(ivi, surface);
+}
+
+#ifdef HAVE_WALTHAM
+void
+ivi_destroy_waltham_destroy(struct ivi_surface *surface)
+{
+	struct ivi_compositor *ivi = surface->ivi;
+	const struct weston_transmitter_api *api =
+		ivi->waltham_transmitter_api;
+
+	if (!api)
+		return;
+
+	if (surface->waltham_surface.transmitter_surface)
+		api->surface_destroy(surface->waltham_surface.transmitter_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.
+	 */
+	surface->waltham_surface.transmitter_surface =
+	    api->surface_push_to_remote(weston_surface, app_id, trans_remote, NULL);
+}
+
+#else
+void
+ivi_destroy_waltham_destroy(struct ivi_surface *surface)
+{
+}
+static void
+ivi_output_notify_waltham_plugin(struct ivi_surface *surface)
+{
+}
+#endif
+
 static void
 ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 {
@@ -103,6 +213,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);
 }
 
@@ -119,11 +232,14 @@ ivi_set_desktop_surface_split(struct ivi_surface *surface)
 		surface->role = IVI_SURFACE_ROLE_SPLIT_H;
 
 	wl_list_insert(&ivi->surfaces, &surface->link);
+
+	agl_shell_desktop_advertise_application_id(ivi, surface);
 }
 
 static void
 ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
-				      int x, int y, const char *app_id)
+				      int x, int y, int bx, int by, int width, int height,
+				      const char *app_id)
 {
 	struct ivi_compositor *ivi = ioutput->ivi;
 	size_t len_app_id = strlen(app_id);
@@ -136,6 +252,11 @@ ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
 	p_popup->x = x;
 	p_popup->y = y;
 
+	p_popup->bb.x = bx;
+	p_popup->bb.y = by;
+	p_popup->bb.width = width;
+	p_popup->bb.height = height;
+
 	wl_list_insert(&ivi->popup_pending_apps, &p_popup->link);
 }
 
@@ -186,7 +307,7 @@ ivi_set_pending_desktop_surface_split(struct ivi_output *ioutput,
 	wl_list_insert(&ivi->split_pending_apps, &split->link);
 }
 
-static void
+void
 ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
 		const char *app_id)
 {
@@ -244,7 +365,7 @@ ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->popup_pending_apps))
+	if (wl_list_empty(&ivi->popup_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(p_popup, next_p_popup,
@@ -253,6 +374,12 @@ ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
 			surface->popup.output = p_popup->ioutput;
 			surface->popup.x = p_popup->x;
 			surface->popup.y = p_popup->y;
+
+			surface->popup.bb.x = p_popup->bb.x;
+			surface->popup.bb.y = p_popup->bb.y;
+			surface->popup.bb.width = p_popup->bb.width;
+			surface->popup.bb.height = p_popup->bb.height;
+
 			ivi_remove_pending_desktop_surface_popup(p_popup);
 			return true;
 		}
@@ -269,7 +396,7 @@ ivi_check_pending_desktop_surface_split(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->split_pending_apps))
+	if (wl_list_empty(&ivi->split_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(split_surf, next_split_surf,
@@ -293,7 +420,7 @@ ivi_check_pending_desktop_surface_fullscreen(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->fullscreen_pending_apps))
+	if (wl_list_empty(&ivi->fullscreen_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(fs_surf, next_fs_surf,
@@ -316,7 +443,7 @@ ivi_check_pending_desktop_surface_remote(struct ivi_surface *surface)
 	const char *_app_id =
 		weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->remote_pending_apps))
+	if (wl_list_empty(&ivi->remote_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(remote_surf, next_remote_surf,
@@ -340,24 +467,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;
 	}
 
@@ -412,6 +543,10 @@ ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource
 	wl_list_for_each(surface, &ivi->surfaces, link) {
 		const char *app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
+		if (app_id == NULL) {
+			weston_log("WARNING app_is is null, unable to advertise\n");
+			return;
+		}
 		agl_shell_desktop_send_application(resource, app_id);
 	}
 }
@@ -519,13 +654,8 @@ destroy_black_view(struct wl_listener *listener, void *data)
 
 
 	if (fs && fs->fs) {
-		if (fs->fs->view && fs->fs->view->surface) {
-			weston_surface_destroy(fs->fs->view->surface);
-			fs->fs->view = NULL;
-		}
-
-		free(fs->fs);
 		wl_list_remove(&fs->fs_destroy.link);
+		free(fs->fs);
 	}
 }
 
@@ -539,6 +669,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);
 
@@ -559,8 +692,16 @@ create_black_surface_view(struct ivi_output *output)
 void
 remove_black_surface(struct ivi_output *output)
 {
-	struct weston_view *view = output->fullscreen_view.fs->view;
+	struct weston_view *view;
+
+	if (!output &&
+	    !output->fullscreen_view.fs &&
+	    !output->fullscreen_view.fs->view) {
+		weston_log("Output %s doesn't have a surface installed!\n", output->name);
+		return;
+	}
 
+	view = output->fullscreen_view.fs->view;
 	assert(view->is_mapped == true ||
 	       view->surface->is_mapped == true);
 
@@ -576,8 +717,16 @@ remove_black_surface(struct ivi_output *output)
 void
 insert_black_surface(struct ivi_output *output)
 {
-	struct weston_view *view = output->fullscreen_view.fs->view;
+	struct weston_view *view;
 
+	if ((!output &&
+	    !output->fullscreen_view.fs &&
+	    !output->fullscreen_view.fs->view) || !output->output) {
+		weston_log("Output %s doesn't have a surface installed!\n", output->name);
+		return;
+	}
+
+	view = output->fullscreen_view.fs->view;
 	if (view->is_mapped || view->surface->is_mapped)
 		return;
 
@@ -606,13 +755,16 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 	ivi->shell_client.ready = true;
 
 	wl_list_for_each(output, &ivi->outputs, link) {
-		remove_black_surface(output);
+		if (output->background)
+			remove_black_surface(output);
 		ivi_layout_init(ivi, output);
 	}
 
 	wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
 		wl_list_remove(&surface->link);
+		wl_list_init(&surface->link);
 		ivi_check_pending_desktop_surface(surface);
+		surface->checked_pending = true;
 	}
 }
 
@@ -652,6 +804,7 @@ shell_set_background(struct wl_client *client,
 		return;
 	}
 
+	surface->checked_pending = true;
 	surface->role = IVI_SURFACE_ROLE_BACKGROUND;
 	surface->bg.output = output;
 	wl_list_remove(&surface->link);
@@ -724,6 +877,7 @@ shell_set_panel(struct wl_client *client,
 		return;
 	}
 
+	surface->checked_pending = true;
 	surface->role = IVI_SURFACE_ROLE_PANEL;
 	surface->panel.output = output;
 	surface->panel.edge = edge;
@@ -746,8 +900,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)
 {
@@ -761,6 +914,9 @@ shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
 	if (!surf)
 		return;
 
+	if (!app_id)
+		return;
+
 	if (policy && policy->api.surface_advertise_state_change &&
 	    !policy->api.surface_advertise_state_change(surf, surf->ivi)) {
 		return;
@@ -827,7 +983,9 @@ static void
 shell_desktop_set_app_property(struct wl_client *client,
 			       struct wl_resource *shell_res,
 			       const char *app_id, uint32_t role,
-			       int x, int y, struct wl_resource *output_res)
+			       int x, int y, int bx, int by,
+			       int width, int height,
+			       struct wl_resource *output_res)
 {
 	struct weston_head *head = weston_head_from_resource(output_res);
 	struct weston_output *woutput = weston_head_get_output(head);
@@ -835,7 +993,8 @@ shell_desktop_set_app_property(struct wl_client *client,
 
 	switch (role) {
 	case AGL_SHELL_DESKTOP_APP_ROLE_POPUP:
-		ivi_set_pending_desktop_surface_popup(output, x, y, app_id);
+		ivi_set_pending_desktop_surface_popup(output, x, y, bx, by,
+						      width, height, app_id);
 		break;
 	case AGL_SHELL_DESKTOP_APP_ROLE_FULLSCREEN:
 		ivi_set_pending_desktop_surface_fullscreen(output, app_id);
@@ -903,6 +1062,17 @@ bind_agl_shell(struct wl_client *client,
 {
 	struct ivi_compositor *ivi = data;
 	struct wl_resource *resource;
+	struct ivi_policy *policy;
+	void *interface;
+
+	policy = ivi->policy;
+	interface = (void *) &agl_shell_interface;
+	if (policy && policy->api.shell_bind_interface &&
+	    !policy->api.shell_bind_interface(client, interface)) {
+		wl_client_post_implementation_error(client,
+				       "client not authorized to use agl_shell");
+		return;
+	}
 
 	resource = wl_resource_create(client, &agl_shell_interface,
 				      1, id);
@@ -945,8 +1115,20 @@ bind_agl_shell_desktop(struct wl_client *client,
 {
 	struct ivi_compositor *ivi = data;
 	struct wl_resource *resource;
-	struct desktop_client *dclient = zalloc(sizeof(*dclient));
+	struct ivi_policy *policy;
+	struct desktop_client *dclient;
+	void *interface;
+
+	policy = ivi->policy;
+	interface  = (void *) &agl_shell_desktop_interface;
+	if (policy && policy->api.shell_bind_interface &&
+	    !policy->api.shell_bind_interface(client, interface)) {
+		wl_client_post_implementation_error(client,
+				"client not authorized to use agl_shell_desktop");
+		return;
+	}
 
+	dclient = zalloc(sizeof(*dclient));
 	if (!dclient) {
 		wl_client_post_no_memory(client);
 		return;