X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=640cc73a79e25c6b4ba8ad4cc0fdf3f4b5f1fdd2;hb=53a039ff1c4b05aaacce118a04563620e676d7c6;hp=ab74f69f194d5cdb1abf874757500cee82803024;hpb=05bb0384732480a9f24a8d9093ac2da20081e307;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index ab74f69..640cc73 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -802,7 +802,8 @@ ivi_shell_finalize(struct ivi_compositor *ivi)
 	weston_layer_fini(&ivi->popup);
 
 	wl_list_for_each(output, &ivi->outputs, link) {
-		if (output->fullscreen_view.fs->view) {
+		if (output->fullscreen_view.fs &&
+		    output->fullscreen_view.fs->view) {
 			weston_surface_destroy(output->fullscreen_view.fs->view->surface);
 			output->fullscreen_view.fs->view = NULL;
 		}
@@ -1097,9 +1098,10 @@ remove_black_curtain(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->fullscreen_view.fs) {
 		weston_log("Output %s doesn't have a surface installed!\n", output->name);
 		return;
 	}
@@ -1126,7 +1128,8 @@ insert_black_curtain(struct ivi_output *output)
 
 	if ((!output &&
 	    !output->fullscreen_view.fs &&
-	    !output->fullscreen_view.fs->view) || !output->output) {
+	    !output->fullscreen_view.fs->view) || !output->output ||
+	    !output->fullscreen_view.fs) {
 		weston_log("Output %s doesn't have a surface installed!\n", output->name);
 		return;
 	}
@@ -1148,6 +1151,22 @@ insert_black_curtain(struct ivi_output *output)
 	weston_log("Added black curtain to output %s\n", output->output->name);
 }
 
+void
+shell_send_app_state(struct ivi_compositor *ivi, const char *app_id,
+		     enum agl_shell_app_state state)
+{
+	if (app_id && wl_resource_get_version(ivi->shell_client.resource) >=
+	    AGL_SHELL_APP_STATE_SINCE_VERSION) {
+
+		agl_shell_send_app_state(ivi->shell_client.resource,
+					 app_id, state);
+
+		if (ivi->shell_client.resource_ext)
+			agl_shell_send_app_state(ivi->shell_client.resource_ext,
+						 app_id, state);
+	}
+}
+
 static void
 shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 {
@@ -1155,7 +1174,8 @@ 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 &&
+	if (wl_resource_get_version(shell_res) >=
+	    AGL_SHELL_BOUND_OK_SINCE_VERSION &&
 	    ivi->shell_client.status == BOUND_FAILED) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1192,11 +1212,7 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 		surface->checked_pending = true;
 		app_id = weston_desktop_surface_get_app_id(surface->dsurface);
 
-		if (app_id &&
-		    wl_resource_get_version(ivi->shell_client.resource) >=
-		    AGL_SHELL_APP_STATE_SINCE_VERSION)
-			agl_shell_send_app_state(ivi->shell_client.resource,
-						 app_id, AGL_SHELL_APP_STATE_STARTED);
+		shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
 	}
 }
 
@@ -1214,9 +1230,10 @@ shell_set_background(struct wl_client *client,
 	struct weston_desktop_surface *dsurface;
 	struct ivi_surface *surface;
 
-	if ((ivi->shell_client.resource &&
-	     ivi->shell_client.status == BOUND_FAILED) ||
-	     ivi->shell_client.resource_ext == shell_res) {
+	if ((wl_resource_get_version(shell_res) >=
+	    AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+	    ivi->shell_client.status == BOUND_FAILED) ||
+	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
 				       "agl_shell has already been bound. "
@@ -1278,8 +1295,9 @@ shell_set_panel(struct wl_client *client,
 	struct ivi_surface **member;
 	int32_t width = 0, height = 0;
 
-	if ((ivi->shell_client.resource &&
-	    ivi->shell_client.status == BOUND_FAILED) ||
+	if ((wl_resource_get_version(shell_res) >=
+	     AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+	     ivi->shell_client.status == BOUND_FAILED) ||
 	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1396,7 +1414,8 @@ shell_activate_app(struct wl_client *client,
 	struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
 	struct ivi_output *output = to_ivi_output(woutput);
 
-	if (ivi->shell_client.resource &&
+	if (wl_resource_get_version(shell_res) >=
+	    AGL_SHELL_BOUND_OK_SINCE_VERSION &&
 	    ivi->shell_client.status == BOUND_FAILED) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1436,10 +1455,15 @@ 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)
 {
+	struct 	ivi_compositor *ivi = wl_resource_get_user_data(res);
+
+	/* reset status in case bind_fail was sent */
+	if (wl_resource_get_version(res) >= AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+	    ivi->shell_client.status == BOUND_FAILED)
+		ivi->shell_client.status = BOUND_OK;
 }
 
 static void
@@ -1579,13 +1603,16 @@ unbind_agl_shell(struct wl_resource *resource)
 	ivi = wl_resource_get_user_data(resource);
 
 	/* reset status to allow other clients issue legit requests */
-	if (ivi->shell_client.resource &&
+	if (wl_resource_get_version(resource) >=
+	    AGL_SHELL_BOUND_OK_SINCE_VERSION &&
 	    ivi->shell_client.status == BOUND_FAILED) {
 		ivi->shell_client.status = BOUND_OK;
 		return;
 	}
 
 	wl_list_for_each(output, &ivi->outputs, link) {
+		struct weston_geometry area = {};
+
 		/* reset the active surf if there's one present */
 		if (output->active) {
 			output->active->view->is_mapped = false;
@@ -1595,6 +1622,7 @@ unbind_agl_shell(struct wl_resource *resource)
 			output->active = NULL;
 		}
 
+		output->area_activation = area;
 		insert_black_curtain(output);
 	}
 
@@ -1658,31 +1686,45 @@ bind_agl_shell(struct wl_client *client,
 		if (ivi->shell_client_ext.resource && 
 		    ivi->shell_client_ext.doas_requested) {
 
+			/* reset status in case client-ext doesn't send an
+			 * explicit agl_shell_destroy request, see
+			 * shell_destroy() */
+			if (ivi->shell_client.status == BOUND_FAILED)
+				ivi->shell_client.status = BOUND_OK;
+
 			wl_resource_set_implementation(resource, &agl_shell_implementation,
 						       ivi, NULL);
-			ivi->shell_client_ext.resource = resource;
+			ivi->shell_client.resource_ext = resource;
 
-			if (ivi->shell_client.status == BOUND_OK &&
-			    wl_resource_get_version(resource) >= AGL_SHELL_BOUND_OK_SINCE_VERSION) {
-				weston_log("Sent agl_shell_send_bound_ok to client ext\n");
-				ivi->shell_client_ext.status = BOUND_OK;
-				agl_shell_send_bound_ok(ivi->shell_client_ext.resource);
-			}
+			ivi->shell_client_ext.status = BOUND_OK;
+			agl_shell_send_bound_ok(ivi->shell_client.resource_ext);
 
 			return;
 		} else {
+			wl_resource_set_implementation(resource, &agl_shell_implementation,
+						       ivi, NULL);
 			agl_shell_send_bound_fail(resource);
 			ivi->shell_client.status = BOUND_FAILED;
+			return;
 		}
 	}
 
-	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)
+	if (wl_resource_get_version(resource) >=
+	    AGL_SHELL_BOUND_OK_SINCE_VERSION) {
+		wl_resource_set_implementation(resource, &agl_shell_implementation,
+					       ivi, unbind_agl_shell);
+		ivi->shell_client.resource = resource;
+		/* if we land here we'll have BOUND_OK by default,
+		   but still do the assignment */
+		ivi->shell_client.status = BOUND_OK;
 		agl_shell_send_bound_ok(ivi->shell_client.resource);
+	} else {
+		/* fallback for just version 1 of the protocol */
+		wl_resource_set_implementation(resource, &agl_shell_implementation,
+					       ivi, unbind_agl_shell);
+		ivi->shell_client.resource = resource;
+	}
 }
 
 static void