X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Flayout.c;h=ea1e68403f23acb81d60e58bb38c47c2dff3d71e;hb=refs%2Fchanges%2F63%2F24663%2F4;hp=a142609dd2eb23d510fbc29f140c50eb4c1ebd0d;hpb=f235042e4cd88197ade414795382ba227f924332;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index a142609..ea1e684 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -255,6 +255,23 @@ ivi_layout_activate_complete(struct ivi_output *output,
 			ivi_layout_get_surface_role_name(surf));
 }
 
+static struct ivi_output *
+ivi_layout_find_app_id(const char *app_id, struct ivi_compositor *ivi)
+{
+	struct ivi_output *out;
+
+	wl_list_for_each(out, &ivi->outputs, link) {
+		if (!out->app_id)
+			continue;
+
+		if (!strcmp(app_id, out->app_id))
+			return out;
+	}
+
+	return NULL;
+}
+
+
 static struct ivi_output *
 ivi_layout_find_bg_output(struct ivi_compositor *ivi)
 {
@@ -276,6 +293,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 	struct weston_geometry geom = weston_desktop_surface_get_geometry(dsurf);
 	struct ivi_policy *policy = surf->ivi->policy;
 	struct ivi_output *output;
+	const char *app_id = weston_desktop_surface_get_app_id(dsurf);
 
 	assert(surf->role == IVI_SURFACE_ROLE_DESKTOP ||
 	       surf->role == IVI_SURFACE_ROLE_REMOTE);
@@ -293,7 +311,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		output = surf->remote.output;
 
 	if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
-		struct ivi_output *ivi_bg_output;
+		struct ivi_output *r_output;
 
 		if (policy && policy->api.surface_activate_by_default &&
 		    !policy->api.surface_activate_by_default(surf, surf->ivi))
@@ -303,18 +321,28 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		if (surf->activated_by_default)
 			return;
 
-		ivi_bg_output = ivi_layout_find_bg_output(surf->ivi);
+		/* check first if there aren't any outputs being set */
+		r_output = ivi_layout_find_app_id(app_id, surf->ivi);
+
+		if (r_output) {
+			struct weston_view *view = r_output->fullscreen_view.fs->view;
+			if (view->is_mapped || view->surface->is_mapped)
+				remove_black_surface(r_output);
+		}
+
+
+		/* try finding an output with a background and use that */
+		if (!r_output)
+			r_output = ivi_layout_find_bg_output(surf->ivi);
 
 		/* use the output of the bg to activate the app on start-up by
 		 * default */
-		if (surf->view && ivi_bg_output) {
-			const char *app_id =
-				weston_desktop_surface_get_app_id(dsurf);
-			if (app_id && ivi_bg_output) {
+		if (surf->view && r_output) {
+			if (app_id && r_output) {
 				weston_log("Surface with app_id %s, role %s activating by default\n",
 					weston_desktop_surface_get_app_id(surf->dsurface),
 					ivi_layout_get_surface_role_name(surf));
-				ivi_layout_activate(ivi_bg_output, app_id);
+				ivi_layout_activate(r_output, app_id);
 				surf->activated_by_default = true;
 			}
 		}
@@ -323,7 +351,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 	}
 
 	if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) {
-		const char *app_id;
 		if (policy && policy->api.surface_activate_by_default &&
 		    !policy->api.surface_activate_by_default(surf, surf->ivi))
 			return;
@@ -336,7 +363,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		if (surf->activated_by_default && output->active == surf)
 			return;
 
-		app_id = weston_desktop_surface_get_app_id(dsurf);
 		if (app_id) {
 			weston_log("Surface with app_id %s, role %s activating by default\n",
 					weston_desktop_surface_get_app_id(surf->dsurface),
@@ -555,73 +581,6 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
 	ivi_layout_popup_committed(surface);
 }
 
-void
-ivi_layout_panel_committed(struct ivi_surface *surface)
-{
-	struct ivi_compositor *ivi = surface->ivi;
-	struct ivi_output *output = surface->bg.output;
-	struct weston_output *woutput = output->output;
-	struct weston_desktop_surface *dsurface = surface->dsurface;
-	struct weston_surface *wsurface =
-		weston_desktop_surface_get_surface(dsurface);
-	struct weston_geometry geom;
-	int x = woutput->x;
-	int y = woutput->y;
-
-	assert(surface->role == IVI_SURFACE_ROLE_PANEL);
-
-	/*
-	 * If the desktop_surface geometry is not set and the panel is not a
-	 * top one, we'll give this a chance to run, as some qtwayland version
-	 * seem to have a 'problem', where the panel initilization part will
-	 * have a desktop surface with 0 as geometry for *all* its members
-	 * (width/height). Doing that will result in the panel not being
-	 * displayed at all.
-	 *
-	 * Later versions of qtwayland do have the correct window geometry for
-	 * the desktop surface so the weston_surface is already mapped in
-	 * ivi_panel_init().
-	 */
-	if (wsurface->is_mapped)
-		return;
-
-	geom = weston_desktop_surface_get_geometry(dsurface);
-
-#ifdef AGL_COMP_DEBUG
-	weston_log("geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
-			geom.width, geom.height, geom.x, geom.y);
-#endif
-
-	switch (surface->panel.edge) {
-	case AGL_SHELL_EDGE_TOP:
-		/* Do nothing */
-		break;
-	case AGL_SHELL_EDGE_BOTTOM:
-		y += woutput->height - geom.height;
-		break;
-	case AGL_SHELL_EDGE_LEFT:
-		/* Do nothing */
-		break;
-	case AGL_SHELL_EDGE_RIGHT:
-		x += woutput->width - geom.width;
-		break;
-	}
-#ifndef AGL_COMP_DEBUG
-	weston_log("panel type %d commited\n", surface->panel.edge);
-#endif
-
-	weston_view_set_output(surface->view, woutput);
-	weston_view_set_position(surface->view, x, y);
-	weston_layer_entry_insert(&ivi->panel.view_list,
-				  &surface->view->layer_link);
-
-	weston_view_update_transform(surface->view);
-	weston_view_schedule_repaint(surface->view);
-
-	wsurface->is_mapped = true;
-	surface->view->is_mapped = true;
-}
-
 static bool
 ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
 {