X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshell.c;h=2b6bd63f8e09dd9c64693a21f9001d70fd74f40e;hb=699bdf5e69517f2e7d7238377b41121b1470af3f;hp=f5dc3e3458e022733b20ca61a23b572e221a4948;hpb=ca537df2c52990acf97fb1c42ec2d993c60eae2d;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index f5dc3e3..2b6bd63 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1108,8 +1108,8 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 	    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");
+				       "agl_shell (ready quest) has already "
+				       "been bound. Check out bound_fail event");
 		return;
 	}
 
@@ -1165,8 +1165,8 @@ shell_set_background(struct wl_client *client,
 	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound. "
-				       "Check out bound_fail event");
+				       "agl_shell (set_background) has already "
+				       "been bound. Check out bound_fail event");
 		return;
 	}
 
@@ -1230,7 +1230,7 @@ shell_set_panel(struct wl_client *client,
 	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound. "
+				       "agl_shell (set_panel) has already been bound. "
 				       "Check out bound_fail event");
 		return;
 	}
@@ -1622,9 +1622,8 @@ shell_set_app_output(struct wl_client *client, struct wl_resource *res,
 	struct weston_output *woutput = weston_head_get_output(head);
 	struct ivi_output *ioutput = to_ivi_output(woutput);
 	struct ivi_surface *surf = ivi_find_app(ivi, app_id);
-	struct ivi_output *desktop_last_output = surf->desktop.last_output;
-	struct ivi_output *current_completed_output =
-		surf->current_completed_output;
+	struct ivi_output *desktop_last_output;
+	struct ivi_output *current_completed_output;
 
 	if (!app_id || !ioutput)
 		return;
@@ -1636,6 +1635,9 @@ shell_set_app_output(struct wl_client *client, struct wl_resource *res,
 		return;
 	}
 
+	desktop_last_output = surf->desktop.last_output;
+	current_completed_output = surf->current_completed_output;
+
 	if (surf->remote.output)
 		surf->hidden_layer_output = surf->remote.output;
 	else
@@ -1696,6 +1698,9 @@ shell_set_app_scale(struct wl_client *client, struct wl_resource *res,
 static void
 shell_ext_destroy(struct wl_client *client, struct wl_resource *res)
 {
+	struct 	ivi_compositor *ivi = wl_resource_get_user_data(res);
+
+	ivi->shell_client_ext.doas_requested = false;
 	wl_resource_destroy(res);
 }
 
@@ -1705,8 +1710,17 @@ shell_ext_doas(struct wl_client *client, struct wl_resource *res)
 	struct 	ivi_compositor *ivi = wl_resource_get_user_data(res);
 
 	ivi->shell_client_ext.doas_requested = true;
-	agl_shell_ext_send_doas_done(ivi->shell_client_ext.resource,
-				     AGL_SHELL_EXT_DOAS_SHELL_CLIENT_STATUS_SUCCESS);
+
+	if (ivi->shell_client_ext.resource && ivi->shell_client.resource) {
+		ivi->shell_client_ext.doas_requested_pending_bind = true;
+
+		agl_shell_ext_send_doas_done(ivi->shell_client_ext.resource,
+					     AGL_SHELL_EXT_DOAS_SHELL_CLIENT_STATUS_SUCCESS);
+	} else {
+		agl_shell_ext_send_doas_done(ivi->shell_client_ext.resource,
+					     AGL_SHELL_EXT_DOAS_SHELL_CLIENT_STATUS_FAILED);
+	}
+
 }
 
 static const struct agl_shell_interface agl_shell_implementation = {
@@ -1858,6 +1872,7 @@ unbind_agl_shell(struct wl_resource *resource)
 
 	ivi->shell_client.ready = false;
 	ivi->shell_client.resource = NULL;
+	ivi->shell_client.resource_ext = NULL;
 	ivi->shell_client.client = NULL;
 }
 
@@ -1867,6 +1882,8 @@ unbind_agl_shell_ext(struct wl_resource *resource)
 	struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
 
 	ivi->shell_client_ext.resource = NULL;
+	ivi->shell_client.resource_ext = NULL;
+	ivi->shell_client_ext.doas_requested = false;
 }
 
 static void
@@ -1893,54 +1910,55 @@ bind_agl_shell(struct wl_client *client,
 		return;
 	}
 
-	if (ivi->shell_client.resource) {
-		if (wl_resource_get_version(resource) == 1) {
-			wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
-					       "agl_shell has already been bound");
-			return;
-		}
-
-		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;
+	if (ivi->shell_client.resource && wl_resource_get_version(resource) == 1) {
+		wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+				"agl_shell has already been bound (version 1)");
+		wl_resource_destroy(resource);
+		return;
+	}
 
-			wl_resource_set_implementation(resource, &agl_shell_implementation,
-						       ivi, NULL);
-			ivi->shell_client.resource_ext = resource;
+	// for agl_shell client proxy
+	if (ivi->shell_client.resource &&
+	    ivi->shell_client_ext.doas_requested_pending_bind) {
 
-			ivi->shell_client_ext.status = BOUND_OK;
-			agl_shell_send_bound_ok(ivi->shell_client.resource_ext);
+		ivi->shell_client_ext.doas_requested_pending_bind = false;
 
-			return;
-		} else {
-			wl_resource_set_implementation(resource, &agl_shell_implementation,
-						       ivi, NULL);
-			agl_shell_send_bound_fail(resource);
-			ivi->shell_client.status = BOUND_FAILED;
+		// if there's one connected
+		if (ivi->shell_client.resource_ext) {
+			ivi->shell_client_ext.status = BOUND_FAILED;
+			agl_shell_send_bound_fail(ivi->shell_client.resource_ext);
+			wl_resource_destroy(resource);
 			return;
 		}
+
+		wl_resource_set_implementation(resource, &agl_shell_implementation,
+					       ivi, NULL);
+		ivi->shell_client.resource_ext = resource;
+		ivi->shell_client_ext.status = BOUND_OK;
+		agl_shell_send_bound_ok(ivi->shell_client.resource_ext);
+		return;
 	}
 
 
+	// if we already have an agl_shell client
+	if (ivi->shell_client.resource) {
+		agl_shell_send_bound_fail(resource);
+		ivi->shell_client.status = BOUND_FAILED;
+		wl_resource_destroy(resource);
+		return;
+	}
+
+	// default agl_shell client
+	wl_resource_set_implementation(resource, &agl_shell_implementation,
+				       ivi, unbind_agl_shell);
+	ivi->shell_client.resource = resource;
+
 	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;
 	}
 }