X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=9981ebbf8024031a3a5b0a4bad2e2835b2930ca8;hb=f825bf9e71ac5adfcbdc6ef7f6c2fef8555ee4a3;hp=c2b17ce62fd1e81172d230bc15be34df5b86b80c;hpb=fc783c19e6f6b9bed1c533dc158f1b0aa32d25c1;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index c2b17ce..9981ebb 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -151,17 +151,40 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output,
 void
 ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
 {
-	ivi_background_init(ivi, output);
+	bool use_default_area = true;
 
-	output->area.x = 0;
-	output->area.y = 0;
-	output->area.width = output->output->width;
-	output->area.height = output->output->height;
+	ivi_background_init(ivi, output);
 
-	ivi_panel_init(ivi, output, output->top);
-	ivi_panel_init(ivi, output, output->bottom);
-	ivi_panel_init(ivi, output, output->left);
-	ivi_panel_init(ivi, output, output->right);
+	if (output->area_activation.width ||
+	    output->area_activation.height ||
+	    output->area_activation.x ||
+	    output->area_activation.y) {
+		/* Sanity check target area is within output bounds */
+		if ((output->area_activation.x + output->area_activation.width) < output->output->width ||
+		    (output->area_activation.y + output->area_activation.height) < output->output->height) {
+			weston_log("Using specified area for output %s, ignoring panels\n",
+				   output->name);
+			output->area.x = output->area_activation.x;
+			output->area.y = output->area_activation.y;
+			output->area.width = output->area_activation.width;
+			output->area.height = output->area_activation.height;
+			use_default_area = false;
+		} else {
+			weston_log("Invalid activation-area position for output %s, ignoring\n",
+				   output->name);
+		}
+	}
+	if (use_default_area) {
+		output->area.x = 0;
+		output->area.y = 0;
+		output->area.width = output->output->width;
+		output->area.height = output->output->height;
+
+		ivi_panel_init(ivi, output, output->top);
+		ivi_panel_init(ivi, output, output->bottom);
+		ivi_panel_init(ivi, output, output->left);
+		ivi_panel_init(ivi, output, output->right);
+	}
 
 	weston_compositor_schedule_repaint(ivi->compositor);
 
@@ -194,6 +217,8 @@ ivi_layout_activate_complete(struct ivi_output *output,
 	struct weston_view *view = surf->view;
 	struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
 	struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+	const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface);
+	bool update_previous = true;
 
 	if (weston_view_is_mapped(view)) {
 		weston_layer_entry_remove(&view->layer_link);
@@ -201,23 +226,87 @@ ivi_layout_activate_complete(struct ivi_output *output,
 		weston_view_update_transform(view);
 	}
 
+	if (output_has_black_curtain(output)) {
+		if (!output->background) {
+			weston_log("Found that we have no background surface "
+				    "for output %s. Using black curtain as background\n",
+				    output->output->name);
+
+			struct weston_view *ev =
+				output->fullscreen_view.fs->view;
+
+			/* use the black curtain as background when we have
+			 * none added by the shell client. */
+			weston_layer_entry_remove(&ev->layer_link);
+			weston_layer_entry_insert(&ivi->normal.view_list,
+						  &ev->layer_link);
+			weston_view_geometry_dirty(ev);
+			weston_surface_damage(ev->surface);
+		} else {
+			remove_black_curtain(output);
+		}
+	}
+
+
 	weston_view_set_output(view, woutput);
-	weston_view_set_position(view,
-				 woutput->x + output->area.x,
-				 woutput->y + output->area.y);
+	/* drop any previous masks set on this view */
+	weston_view_set_mask_infinite(view);
+
+	if (surf->role != IVI_SURFACE_ROLE_BACKGROUND)
+		weston_view_set_position(view,
+					 woutput->x + output->area.x,
+					 woutput->y + output->area.y);
 
 	view->is_mapped = true;
 	surf->mapped = true;
 	view->surface->is_mapped = true;
 
+	/* handle a movement from one output to another */
+	if (surf->current_completed_output &&
+	    surf->current_completed_output != output) {
+
+		/* we're migrating the same surface but to another output */
+		if (surf->current_completed_output->active == surf) {
+			struct weston_view *ev =
+				surf->current_completed_output->active->view;
+
+			weston_layer_entry_remove(&ev->layer_link);
+			surf->current_completed_output->previous_active =
+				surf->current_completed_output->active;
+			surf->current_completed_output->active = NULL;
+
+			/* damage all possible outputs to avoid stale views */
+			weston_compositor_damage_all(ivi->compositor);
+		}
+	}
+
 	if (output->active) {
-		output->active->view->is_mapped = false;
-		output->active->view->surface->is_mapped = false;
+		/* keep the background surface mapped at all times */
+		if (output->active->role != IVI_SURFACE_ROLE_BACKGROUND) {
+			output->active->view->is_mapped = false;
+			output->active->view->surface->is_mapped = false;
+
+			weston_layer_entry_remove(&output->active->view->layer_link);
+		}
+	}
+
+	if (output->previous_active && output->active) {
+		const char *c_app_id =
+			weston_desktop_surface_get_app_id(output->active->dsurface);
 
-		weston_layer_entry_remove(&output->active->view->layer_link);
+		/* if the currently activated app_id is the same as the one
+		 * we're trying to complete activation with means we're
+		 * operating on the same app_id so do update previous_active as
+		 * it will overwrite it with the same value */
+		if (!strcmp(c_app_id, app_id)) {
+			update_previous = false;
+		}
 	}
-	output->previous_active = output->active;
+
+	if (update_previous)
+		output->previous_active = output->active;
 	output->active = surf;
+	surf->current_completed_output = output;
 
 	weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
 	weston_view_geometry_dirty(view);
@@ -238,8 +327,29 @@ ivi_layout_activate_complete(struct ivi_output *output,
 	}
 
 	weston_log("Activation completed for app_id %s, role %s, output %s\n",
-			weston_desktop_surface_get_app_id(surf->dsurface),
+			app_id,
 			ivi_layout_get_surface_role_name(surf), output->name);
+
+	shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_ACTIVATED);
+}
+
+static bool
+ivi_layout_find_output_with_app_id(const char *app_id, struct ivi_output *output)
+{
+	char *cur;
+	size_t app_id_len;
+
+	cur = output->app_ids;
+	app_id_len = strlen(app_id);
+
+	while ((cur = strstr(cur, app_id))) {
+		if ((cur[app_id_len] == ',' || cur[app_id_len] == '\0') &&
+	            (cur == output->app_ids || cur[-1] == ','))
+			return true;
+		cur++;
+	}
+
+	return false;
 }
 
 struct ivi_output *
@@ -251,13 +361,12 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
 		return NULL;
 
 	wl_list_for_each(out, &ivi->outputs, link) {
-		if (!out->app_id)
+		if (!out->app_ids)
 			continue;
 
-		if (!strcmp(app_id, out->app_id))
+		if (ivi_layout_find_output_with_app_id(app_id, out))
 			return out;
 	}
-
 	return NULL;
 }
 
@@ -299,15 +408,47 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
 						ivi_output->area.width,
 						ivi_output->area.height);
 
+		weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
+			   app_id, ivi_layout_get_surface_role_name(surf),
+			   ivi_output->area.width, ivi_output->area.height);
+
+		surf->hidden_layer_output = ivi_output;
+		weston_view_set_output(ev, ivi_output->output);
+		weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
+		weston_log("Placed app_id %s, type %s in hidden layer on output %s\n",
+				app_id, ivi_layout_get_surface_role_name(surf),
+				ivi_output->output->name);
+
+		weston_compositor_schedule_repaint(ivi->compositor);
+		return;
+	}
+
+	/* we might have another output to activate */
+	if (surf->hidden_layer_output &&
+	    surf->hidden_layer_output != ivi_output) {
+		weston_layer_entry_remove(&ev->layer_link);
+
+		if (ivi_output->area.width != surf->hidden_layer_output->area.width &&
+		    ivi_output->area.height != surf->hidden_layer_output->area.height) {
+			weston_desktop_surface_set_maximized(dsurf, true);
+			weston_desktop_surface_set_size(dsurf,
+							ivi_output->area.width,
+							ivi_output->area.height);
+		}
+
 		weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
 				app_id, ivi_layout_get_surface_role_name(surf),
 				ivi_output->area.width, ivi_output->area.height);
 
+		surf->hidden_layer_output = ivi_output;
 		weston_view_set_output(ev, ivi_output->output);
 		weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
-		weston_log("Placed app_id %s, type %s in hidden layer\n",
-				app_id, ivi_layout_get_surface_role_name(surf));
+		weston_log("Placed app_id %s, type %s in hidden layer on output %s\n",
+				app_id, ivi_layout_get_surface_role_name(surf),
+				ivi_output->output->name);
 	}
+
+	weston_compositor_schedule_repaint(ivi->compositor);
 }
 
 void
@@ -351,7 +492,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		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);
+				remove_black_curtain(r_output);
 		}
 
 
@@ -419,9 +560,11 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 			return;
 
 		if (app_id) {
-			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));
+			weston_log("Surface with app_id %s, role %s activating "
+				   "by default on output %s\n",
+				   weston_desktop_surface_get_app_id(surf->dsurface),
+				   ivi_layout_get_surface_role_name(surf),
+				   output->output->name);
 			ivi_layout_activate(output, app_id);
 		}
 		return;
@@ -469,7 +612,8 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 
 	assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
 
-	if (weston_view_is_mapped(view))
+
+	if (surface->state == FULLSCREEN && weston_view_is_mapped(view))
 		return;
 
 	/* if we still get here but we haven't resized so far, send configure
@@ -505,7 +649,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 	}
 
 	/* this implies we resized correctly */
-	if (!weston_view_is_mapped(view)) {
+	if (!weston_view_is_mapped(view) || surface->state != FULLSCREEN) {
 		weston_layer_entry_remove(&view->layer_link);
 
 		weston_view_set_output(view, woutput);
@@ -663,6 +807,24 @@ ivi_compute_popup_position(const struct weston_output *output, struct weston_vie
 }
 
 
+static bool
+ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface)
+{
+	struct weston_view *ev;
+
+	wl_list_for_each(ev, &ivi->hidden.view_list.link, layer_link.link) {
+		if (ev == surface->view)
+			return true;
+	}
+
+	wl_list_for_each(ev, &ivi->fullscreen.view_list.link, layer_link.link) {
+		if (ev == surface->view)
+			return true;
+	}
+
+	return false;
+}
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -694,6 +856,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 
 	assert(surface->role == IVI_SURFACE_ROLE_POPUP);
 
+	/* remove it from hidden layer if present */
+	if (ivi_surf_in_hidden_layer(ivi, surface))
+		weston_layer_entry_remove(&view->layer_link);
+
 	weston_view_set_output(view, woutput);
 
 	ivi_compute_popup_position(woutput, view,
@@ -796,8 +962,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 	}
 
 #ifdef AGL_COMP_DEBUG
-	weston_log("Activating app_id %s, type %s\n", app_id,
-			ivi_layout_get_surface_role_name(surf));
+	weston_log("Activating app_id %s, type %s, on output %s\n", app_id,
+			ivi_layout_get_surface_role_name(surf), output->output->name);
 #endif
 
 	if (surf->role == IVI_SURFACE_ROLE_POPUP) {
@@ -807,13 +973,19 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 
 	/* do not 're'-activate surfaces that are split or active */
 	if (surf == output->active ||
-	    ivi_layout_surface_is_split_or_fullscreen(surf))
+	    ivi_layout_surface_is_split_or_fullscreen(surf)) {
+		weston_log("Application %s is already active on output %s\n",
+				app_id, output->output->name);
 		return;
+	}
 
 	if (surf->role == IVI_SURFACE_ROLE_REMOTE) {
 		struct ivi_output *remote_output =
 			ivi_layout_find_with_app_id(app_id, ivi);
 
+		weston_log("Changed activation for app_id %s, type %s, on output %s\n", app_id,
+				ivi_layout_get_surface_role_name(surf), output->output->name);
+
 		/* if already active on a remote output do not
 		 * attempt to activate it again */
 		if (remote_output && remote_output->active == surf)
@@ -832,6 +1004,13 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 		return;
 	}
 
+	/* the background surface is already "maximized" so we don't need to
+	 * add to the hidden layer */
+	if (surf->role == IVI_SURFACE_ROLE_BACKGROUND) {
+		ivi_layout_activate_complete(output, surf);
+		return;
+	}
+
 	ivi_layout_add_to_hidden_layer(surf, output);
 }
 
@@ -951,4 +1130,6 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 		weston_view_geometry_dirty(view);
 		weston_surface_damage(view->surface);
 	}
+
+      shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED);
 }