X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=0c65b6db655c3dcc93cb41db5bf49aa257a91933;hb=a17bac48464b5f2b6359856a75caae882d9a48f6;hp=030e8b433a3b1274ed2e1b4ea428632052724c5a;hpb=e5027ce09a4440b6bff25e45091fe07c8e7961d6;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 030e8b4..0c65b6d 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -28,8 +28,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #define AGL_COMP_DEBUG
 
@@ -114,9 +114,28 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output,
 			panel->panel.edge, view, x, y);
 #endif
 
+	/* this is necessary for cases we already mapped it desktop_committed()
+	 * but we not running the older qtwayland, so we still have a chance
+	 * for this to run at the next test */
+	if (view->surface->is_mapped) {
+		weston_layer_entry_remove(&view->layer_link);
+
+		view->is_mapped = false;
+		view->surface->is_mapped = false;
+	}
+
+	/* give ivi_layout_panel_committed() a chance to map the view/surface
+	 * instead */
+	if ((geom.width == geom.height && geom.width == 0) &&
+	    (geom.x == geom.y && geom.x == 0) &&
+	    panel->panel.edge != AGL_SHELL_EDGE_TOP)
+		return;
+
 	view->is_mapped = true;
 	view->surface->is_mapped = true;
-
+#ifdef AGL_COMP_DEBUG
+	weston_log("panel type %d inited\n", panel->panel.edge);
+#endif
 	weston_layer_entry_insert(&ivi->panel.view_list, &view->layer_link);
 }
 
@@ -193,9 +212,24 @@ ivi_layout_activate_complete(struct ivi_output *output,
 
 	/* force repaint of the entire output */
 	weston_output_damage(output->output);
+	surf->desktop.last_output = surf->desktop.pending_output;
 	surf->desktop.pending_output = NULL;
 }
 
+static struct ivi_output *
+ivi_layout_find_bg_output(struct ivi_compositor *ivi)
+{
+	struct ivi_output *out;
+
+	wl_list_for_each(out, &ivi->outputs, link) {
+		if (out->background &&
+		    out->background->role == IVI_SURFACE_ROLE_BACKGROUND)
+			return out;
+	}
+
+	return NULL;
+}
+
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf)
 {
@@ -206,8 +240,27 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 	assert(surf->role == IVI_SURFACE_ROLE_DESKTOP);
 
 	output = surf->desktop.pending_output;
-	if (!output)
+	if (!output) {
+		struct ivi_output *ivi_bg_output;
+
+		/* FIXME: This should be changed to determine if the policy
+		 * database allows that to happen */
+		if (!surf->ivi->quirks.activate_apps_by_default)
+			return;
+
+		ivi_bg_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)
+				ivi_layout_activate(ivi_bg_output, app_id);
+		}
+
 		return;
+	}
 
 	if (!weston_desktop_surface_get_maximized(dsurf) ||
 	    geom.width != output->area.width ||
@@ -217,6 +270,73 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 	ivi_layout_activate_complete(output, surf);
 }
 
+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;
+}
+
 void
 ivi_layout_activate(struct ivi_output *output, const char *app_id)
 {