X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=dd7e75f0e3060f36c2d23ccc4a1be5b20668e38e;hb=794a54e763b293da7743c23311c276601554c759;hp=b7f9d4a9e7153df16a3d3704a1b041bb90e0f40b;hpb=8769c76e59ec448bc081f4e89f68622e7185f884;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index b7f9d4a..dd7e75f 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -334,6 +334,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;
 			}
 		}
 
@@ -639,16 +651,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;
 
@@ -683,8 +698,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)
@@ -723,6 +736,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)
 {