X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fshell.c;h=640cc73a79e25c6b4ba8ad4cc0fdf3f4b5f1fdd2;hb=refs%2Fchanges%2F85%2F28385%2F1;hp=1418d95fedd2571599870f7c68172b79852fd085;hpb=79eac214d4866d840767b6a430c6168e55a214c0;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 1418d95..640cc73 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1174,7 +1174,9 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 	struct ivi_output *output;
 	struct ivi_surface *surface, *tmp;
 
-	if (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) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
 				       "agl_shell has already been bound. "
@@ -1228,8 +1230,10 @@ shell_set_background(struct wl_client *client,
 	struct weston_desktop_surface *dsurface;
 	struct ivi_surface *surface;
 
-	if (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. "
@@ -1291,7 +1295,9 @@ shell_set_panel(struct wl_client *client,
 	struct ivi_surface **member;
 	int32_t width = 0, height = 0;
 
-	if (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,
@@ -1408,7 +1414,9 @@ 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.status == BOUND_FAILED) {
+	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,
 				       "agl_shell has already been bound. "
@@ -1453,7 +1461,8 @@ 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 (ivi->shell_client.status == BOUND_FAILED)
+	if (wl_resource_get_version(res) >= AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+	    ivi->shell_client.status == BOUND_FAILED)
 		ivi->shell_client.status = BOUND_OK;
 }
 
@@ -1594,12 +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.status == BOUND_FAILED) {
+	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;
@@ -1609,6 +1622,7 @@ unbind_agl_shell(struct wl_resource *resource)
 			output->active = NULL;
 		}
 
+		output->area_activation = area;
 		insert_black_curtain(output);
 	}
 
@@ -1705,6 +1719,11 @@ bind_agl_shell(struct wl_client *client,
 		   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;
 	}
 }