X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=0345807f3a3f9b85df7bd368824a0708684641ef;hb=9c605257e22e0f28939c6b679324488b2719999d;hp=fa49163c850b1719803d6bb992ee6f6d88fd868f;hpb=c7bc55dce459ea25f725410fc1b86dd9534a9ed5;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index fa49163..0345807 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -241,6 +241,9 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
 {
 	struct ivi_output *out;
 
+	if (!app_id)
+		return NULL;
+
 	wl_list_for_each(out, &ivi->outputs, link) {
 		if (!out->app_id)
 			continue;
@@ -316,6 +319,15 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		if (!r_output)
 			r_output = ivi_layout_find_bg_output(surf->ivi);
 
+		/* if we couldn't still find an output by this point, there's
+		 * something wrong so we abort with a protocol error */
+		if (!r_output) {
+			wl_resource_post_error(surf->ivi->shell_client.resource,
+					       AGL_SHELL_ERROR_INVALID_ARGUMENT,
+					       "No valid output found to activate surface by default");
+			return;
+		}
+
 		/* use the output of the bg to activate the app on start-up by
 		 * default */
 		if (surf->view && r_output) {
@@ -325,6 +337,18 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 					ivi_layout_get_surface_role_name(surf));
 				ivi_layout_activate(r_output, app_id);
 				surf->activated_by_default = true;
+			} else if (!app_id) {
+				/*
+				 * applications not setting an app_id, or
+				 * setting an app_id but at a later point in
+				 * time, might fall-back here so give them a
+				 * chance to receive the configure event and
+				 * act upon it
+				 */
+				weston_log("Surface no app_id, role %s activating by default\n",
+					ivi_layout_get_surface_role_name(surf));
+				ivi_layout_activate_by_surf(r_output, surf);
+				surf->activated_by_default = true;
 			}
 		}
 
@@ -630,16 +654,19 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
 }
 
 void
-ivi_layout_activate(struct ivi_output *output, const char *app_id)
+ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 {
 	struct ivi_compositor *ivi = output->ivi;
-	struct ivi_surface *surf;
 	struct weston_desktop_surface *dsurf;
 	struct weston_view *view;
 	struct weston_geometry geom;
 	struct ivi_policy *policy = output->ivi->policy;
 
-	surf = ivi_find_app(ivi, app_id);
+	dsurf = surf->dsurface;
+	view = surf->view;
+
+	const char *app_id = weston_desktop_surface_get_app_id(dsurf);
+
 	if (!surf)
 		return;
 
@@ -674,8 +701,6 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
 	}
 
 
-	dsurf = surf->dsurface;
-	view = surf->view;
 	geom = weston_desktop_surface_get_geometry(dsurf);
 
 	if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
@@ -714,6 +739,19 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
 	}
 }
 
+void
+ivi_layout_activate(struct ivi_output *output, const char *app_id)
+{
+	struct ivi_surface *surf;
+	struct ivi_compositor *ivi = output->ivi;
+
+	surf = ivi_find_app(ivi, app_id);
+	if (!surf)
+		return;
+
+	ivi_layout_activate_by_surf(output, surf);
+}
+
 struct ivi_output *
 ivi_layout_get_output_from_surface(struct ivi_surface *surf)
 {
@@ -789,6 +827,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 
 				weston_layer_entry_remove(&view->layer_link);
 				weston_output_damage(ivi_output->output);
+				ivi_output->active = NULL;
 			}
 		} else {
 			struct weston_desktop_surface *dsurface;