X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=68227c317f0041904087e771acf54eddf3c2b33f;hb=refs%2Fheads%2Foctopus;hp=aaf04688a7e1d00fb17586b8c3fcac660e9a5e35;hpb=0b766cf978b8b100caecd4c61464e1a683685072;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index aaf0468..68227c3 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;
 		}
@@ -1087,7 +1088,8 @@ create_black_curtain_view(struct ivi_output *output)
 bool
 output_has_black_curtain(struct ivi_output *output)
 {
-	return (output->fullscreen_view.fs->view &&
+	return (output->fullscreen_view.fs &&
+		output->fullscreen_view.fs->view &&
 		output->fullscreen_view.fs->view->is_mapped &&
 	        output->fullscreen_view.fs->view->surface->is_mapped);
 }
@@ -1097,9 +1099,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 +1129,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;
 	}
@@ -1171,7 +1175,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. "
@@ -1225,8 +1231,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. "
@@ -1288,7 +1296,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,
@@ -1400,12 +1410,24 @@ shell_activate_app(struct wl_client *client,
 		   const char *app_id,
 		   struct wl_resource *output_res)
 {
-	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);
+	struct weston_head *head;
+	struct weston_output *woutput;
+	struct ivi_compositor *ivi;
+	struct ivi_output *output;
+
+	head = weston_head_from_resource(output_res);
+	if (!head) {
+		weston_log("Invalid output to activate '%s' on\n", app_id);
+		return;
+	}
+
+	woutput = weston_head_get_output(head);
+	ivi = wl_resource_get_user_data(shell_res);
+	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. "
@@ -1450,7 +1472,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;
 }
 
@@ -1591,19 +1614,26 @@ 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) {
+
 		/* reset the active surf if there's one present */
 		if (output->active) {
+			struct weston_geometry area = {};
+
 			output->active->view->is_mapped = false;
 			output->active->view->surface->is_mapped = false;
 
 			weston_layer_entry_remove(&output->active->view->layer_link);
 			output->active = NULL;
+
+			output->area_activation = area;
 		}
 
 		insert_black_curtain(output);
@@ -1702,6 +1732,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;
 	}
 }