X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=4ab5e422932d55dad430d123f0bb37df7a3b94bc;hb=b92397ef12626a0d09cb4c9e853d0c038104110f;hp=d91570f75b39baf8e2087cf9f4d164c9b6a0bfdb;hpb=43bdf9a42bac33df174d6ac7ff1ab2e15441c7b5;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index d91570f..4ab5e42 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -47,19 +47,7 @@
 #endif
 
 static void
-create_black_surface_view(struct ivi_output *output);
-
-static struct ivi_surface *
-get_ivi_shell_surface(struct weston_surface *wsurface)
-{
-	if (weston_surface_is_desktop_surface(wsurface)) {
-		struct weston_desktop_surface *dsurface =
-			weston_surface_get_desktop_surface(wsurface);
-		return weston_desktop_surface_get_user_data(dsurface);
-	}
-
-	return NULL;
-}
+create_black_curtain_view(struct ivi_output *output);
 
 void
 agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
@@ -223,7 +211,7 @@ ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 	 * just being added */
 	view = output->fullscreen_view.fs->view;
 	if (view->is_mapped || view->surface->is_mapped)
-		remove_black_surface(output);
+		remove_black_curtain(output);
 
 	if (output->type == OUTPUT_WALTHAM)
 		ivi_output_notify_waltham_plugin(surface);
@@ -479,7 +467,7 @@ ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
 	if (!p_remote)
 		return;
 
-	wl_list_insert(&ivi->remote_pending_apps, &remote->link);
+	wl_list_insert(&ivi->remote_pending_apps, &p_remote->link);
 }
 
 
@@ -638,14 +626,9 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 	const char *app_id =
 		weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (!app_id) {
-		*role = IVI_SURFACE_ROLE_NONE;
-		return;
-	}
-
 	role_pending_list = &ivi->popup_pending_apps;
 	wl_list_for_each(p_popup, role_pending_list, link) {
-		if (!strcmp(app_id, p_popup->app_id)) {
+		if (app_id && !strcmp(app_id, p_popup->app_id)) {
 			*role = IVI_SURFACE_ROLE_POPUP;
 			return;
 		}
@@ -653,7 +636,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->split_pending_apps;
 	wl_list_for_each(p_split, role_pending_list, link) {
-		if (!strcmp(app_id, p_split->app_id)) {
+		if (app_id && !strcmp(app_id, p_split->app_id)) {
 			*role = IVI_SURFACE_ROLE_SPLIT_V;
 			return;
 		}
@@ -661,7 +644,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->fullscreen_pending_apps;
 	wl_list_for_each(p_fullscreen, role_pending_list, link) {
-		if (!strcmp(app_id, p_fullscreen->app_id)) {
+		if (app_id && !strcmp(app_id, p_fullscreen->app_id)) {
 			*role = IVI_SURFACE_ROLE_FULLSCREEN;
 			return;
 		}
@@ -669,7 +652,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->remote_pending_apps;
 	wl_list_for_each(p_remote, role_pending_list, link) {
-		if (!strcmp(app_id, p_remote->app_id)) {
+		if (app_id && !strcmp(app_id, p_remote->app_id)) {
 			*role = IVI_SURFACE_ROLE_REMOTE;
 			return;
 		}
@@ -725,8 +708,8 @@ ivi_shell_init_black_fs(struct ivi_compositor *ivi)
 	struct ivi_output *out;
 
 	wl_list_for_each(out, &ivi->outputs, link) {
-		create_black_surface_view(out);
-		insert_black_surface(out);
+		create_black_curtain_view(out);
+		insert_black_curtain(out);
 	}
 }
 
@@ -787,6 +770,8 @@ ivi_shell_destroy_views_on_layer(struct weston_layer *layer)
 void
 ivi_shell_finalize(struct ivi_compositor *ivi)
 {
+	struct ivi_output *output;
+
 	ivi_shell_destroy_views_on_layer(&ivi->hidden);
 	weston_layer_fini(&ivi->hidden);
 
@@ -801,6 +786,14 @@ ivi_shell_finalize(struct ivi_compositor *ivi)
 
 	ivi_shell_destroy_views_on_layer(&ivi->popup);
 	weston_layer_fini(&ivi->popup);
+
+	wl_list_for_each(output, &ivi->outputs, link) {
+		if (output->fullscreen_view.fs->view) {
+			weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+			output->fullscreen_view.fs->view = NULL;
+		}
+	}
+	weston_layer_fini(&ivi->fullscreen);
 }
 
 static void
@@ -915,7 +908,7 @@ ivi_launch_shell_client(struct ivi_compositor *ivi)
 }
 
 static void
-destroy_black_view(struct wl_listener *listener, void *data)
+destroy_black_curtain_view(struct wl_listener *listener, void *data)
 {
 	struct fullscreen_view *fs =
 		wl_container_of(listener, fs, fs_destroy);
@@ -929,7 +922,7 @@ destroy_black_view(struct wl_listener *listener, void *data)
 
 
 static void
-create_black_surface_view(struct ivi_output *output)
+create_black_curtain_view(struct ivi_output *output)
 {
 	struct weston_surface *surface = NULL;
 	struct weston_view *view;
@@ -960,13 +953,21 @@ create_black_surface_view(struct ivi_output *output)
 	}
 	output->fullscreen_view.fs->view = view;
 
-	output->fullscreen_view.fs_destroy.notify = destroy_black_view;
+	output->fullscreen_view.fs_destroy.notify = destroy_black_curtain_view;
 	wl_signal_add(&woutput->destroy_signal,
 		      &output->fullscreen_view.fs_destroy);
 }
 
+bool
+output_has_black_curtain(struct ivi_output *output)
+{
+	return (output->fullscreen_view.fs->view &&
+		output->fullscreen_view.fs->view->is_mapped &&
+	        output->fullscreen_view.fs->view->surface->is_mapped);
+}
+
 void
-remove_black_surface(struct ivi_output *output)
+remove_black_curtain(struct ivi_output *output)
 {
 	struct weston_view *view;
 
@@ -988,10 +989,12 @@ remove_black_surface(struct ivi_output *output)
 	weston_view_update_transform(view);
 
 	weston_view_damage_below(view);
+
+	weston_log("Removed black curtain from output %s\n", output->output->name);
 }
 
 void
-insert_black_surface(struct ivi_output *output)
+insert_black_curtain(struct ivi_output *output)
 {
 	struct weston_view *view;
 
@@ -1015,6 +1018,8 @@ insert_black_surface(struct ivi_output *output)
 
 	weston_view_update_transform(view);
 	weston_view_damage_below(view);
+
+	weston_log("Added black curtain to output %s\n", output->output->name);
 }
 
 static void
@@ -1024,15 +1029,25 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 	struct ivi_output *output;
 	struct ivi_surface *surface, *tmp;
 
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client.status == BOUND_FAILED) {
+		wl_resource_post_error(shell_res,
+				       WL_DISPLAY_ERROR_INVALID_OBJECT,
+				       "agl_shell has already been bound. "
+				       "Check out bound_fail event");
+		return;
+	}
+
 	/* Init already finished. Do nothing */
 	if (ivi->shell_client.ready)
 		return;
 
+
 	ivi->shell_client.ready = true;
 
 	wl_list_for_each(output, &ivi->outputs, link) {
 		if (output->background)
-			remove_black_surface(output);
+			remove_black_curtain(output);
 		ivi_layout_init(ivi, output);
 	}
 
@@ -1054,9 +1069,19 @@ shell_set_background(struct wl_client *client,
 	struct weston_output *woutput = weston_head_get_output(head);
 	struct ivi_output *output = to_ivi_output(woutput);
 	struct weston_surface *wsurface = wl_resource_get_user_data(surface_res);
+	struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
 	struct weston_desktop_surface *dsurface;
 	struct ivi_surface *surface;
 
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client.status == BOUND_FAILED) {
+		wl_resource_post_error(shell_res,
+				       WL_DISPLAY_ERROR_INVALID_OBJECT,
+				       "agl_shell has already been bound. "
+				       "Check out bound_fail event");
+		return;
+	}
+
 	dsurface = weston_surface_get_desktop_surface(wsurface);
 	if (!dsurface) {
 		wl_resource_post_error(shell_res,
@@ -1105,11 +1130,21 @@ shell_set_panel(struct wl_client *client,
 	struct weston_output *woutput = weston_head_get_output(head);
 	struct ivi_output *output = to_ivi_output(woutput);
 	struct weston_surface *wsurface = wl_resource_get_user_data(surface_res);
+	struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
 	struct weston_desktop_surface *dsurface;
 	struct ivi_surface *surface;
 	struct ivi_surface **member;
 	int32_t width = 0, height = 0;
 
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client.status == BOUND_FAILED) {
+		wl_resource_post_error(shell_res,
+				       WL_DISPLAY_ERROR_INVALID_OBJECT,
+				       "agl_shell has already been bound. "
+				       "Check out bound_fail event");
+		return;
+	}
+
 	dsurface = weston_surface_get_desktop_surface(wsurface);
 	if (!dsurface) {
 		wl_resource_post_error(shell_res,
@@ -1215,8 +1250,18 @@ shell_activate_app(struct wl_client *client,
 {
 	struct weston_head *head = weston_head_from_resource(output_res);
 	struct weston_output *woutput = weston_head_get_output(head);
+	struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
 	struct ivi_output *output = to_ivi_output(woutput);
 
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client.status == BOUND_FAILED) {
+		wl_resource_post_error(shell_res,
+				       WL_DISPLAY_ERROR_INVALID_OBJECT,
+				       "agl_shell has already been bound. "
+				       "Check out bound_fail event");
+		return;
+	}
+
 	ivi_layout_activate(output, app_id);
 }
 
@@ -1248,7 +1293,14 @@ shell_deactivate_app(struct wl_client *client,
 				  NULL, AGL_SHELL_DESKTOP_APP_STATE_DEACTIVATED);
 }
 
+/* stub, no usage for the time being */
+static void
+shell_destroy(struct wl_client *client, struct wl_resource *res)
+{
+}
+
 static const struct agl_shell_interface agl_shell_implementation = {
+	.destroy = shell_destroy,
 	.ready = shell_ready,
 	.set_background = shell_set_background,
 	.set_panel = shell_set_panel,
@@ -1341,6 +1393,14 @@ unbind_agl_shell(struct wl_resource *resource)
 	struct ivi_surface *surf, *surf_tmp;
 
 	ivi = wl_resource_get_user_data(resource);
+
+	/* reset status to allow other clients issue legit requests */
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client.status == BOUND_FAILED) {
+		ivi->shell_client.status = BOUND_OK;
+		return;
+	}
+
 	wl_list_for_each(output, &ivi->outputs, link) {
 		/* reset the active surf if there's one present */
 		if (output->active) {
@@ -1351,7 +1411,7 @@ unbind_agl_shell(struct wl_resource *resource)
 			output->active = NULL;
 		}
 
-		insert_black_surface(output);
+		insert_black_curtain(output);
 	}
 
 	wl_list_for_each_safe(surf, surf_tmp, &ivi->surfaces, link) {
@@ -1390,22 +1450,30 @@ bind_agl_shell(struct wl_client *client,
 		return;
 	}
 
-	resource = wl_resource_create(client, &agl_shell_interface,
-				      1, id);
+	resource = wl_resource_create(client, &agl_shell_interface, version, id);
 	if (!resource) {
 		wl_client_post_no_memory(client);
 		return;
 	}
 
 	if (ivi->shell_client.resource) {
-		wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound");
-		return;
+		if (wl_resource_get_version(resource) == 1) {
+			wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+					       "agl_shell has already been bound");
+			return;
+		}
+
+		agl_shell_send_bound_fail(resource);
+		ivi->shell_client.status = BOUND_FAILED;
 	}
 
 	wl_resource_set_implementation(resource, &agl_shell_implementation,
 				       ivi, unbind_agl_shell);
 	ivi->shell_client.resource = resource;
+
+	if (ivi->shell_client.status == BOUND_OK &&
+	    wl_resource_get_version(resource) >= AGL_SHELL_BOUND_OK_SINCE_VERSION)
+		agl_shell_send_bound_ok(ivi->shell_client.resource);
 }
 
 static void
@@ -1464,7 +1532,7 @@ int
 ivi_shell_create_global(struct ivi_compositor *ivi)
 {
 	ivi->agl_shell = wl_global_create(ivi->compositor->wl_display,
-					  &agl_shell_interface, 1,
+					  &agl_shell_interface, 2,
 					  ivi, bind_agl_shell);
 	if (!ivi->agl_shell) {
 		weston_log("Failed to create wayland global.\n");