X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=bc489b2b3fef8a579f4014b61e3a40cfd7b65fd7;hb=4af44df30c1784a69b96d310f152133a507bc2e1;hp=dd4abb5d95b0e061e25213a169cd6baebd266424;hpb=9cccfe829aab45fd2ab8475127d62ff22c5fedee;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index dd4abb5..bc489b2 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,7 @@ 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);
 
 	if (weston_view_is_mapped(view)) {
 		weston_layer_entry_remove(&view->layer_link);
@@ -201,23 +225,70 @@ 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);
+
+	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);
+			weston_layer_entry_remove(&output->active->view->layer_link);
+		}
 	}
 	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 +309,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 +343,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;
 }
 
@@ -275,6 +366,73 @@ ivi_layout_find_bg_output(struct ivi_compositor *ivi)
 	return NULL;
 }
 
+
+static void
+ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
+			       struct ivi_output *ivi_output)
+{
+	struct weston_desktop_surface *dsurf = surf->dsurface;
+	struct weston_view *ev = surf->view;
+	struct ivi_compositor *ivi = surf->ivi;
+	const char *app_id = weston_desktop_surface_get_app_id(dsurf);
+
+	/*
+	 * If the view isn't mapped, we put it onto the hidden layer so it will
+	 * start receiving frame events, and will be able to act on our
+	 * configure event.
+	 */
+	if (!weston_view_is_mapped(ev)) {
+		ev->is_mapped = true;
+		ev->surface->is_mapped = true;
+
+		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 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 on output %s\n",
+				app_id, ivi_layout_get_surface_role_name(surf),
+				ivi_output->output->name);
+	}
+
+	weston_compositor_schedule_repaint(ivi->compositor);
+}
+
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf)
 {
@@ -316,7 +474,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);
 		}
 
 
@@ -336,6 +494,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		if (!surf->ivi->activate_by_default) {
 			weston_log("Refusing to activate surface role %d, app_id %s\n",
 					surf->role, app_id);
+
+			if (!weston_desktop_surface_get_maximized(dsurf) ||
+			    geom.width != r_output->area.width ||
+			    geom.height != r_output->area.height)
+				ivi_layout_add_to_hidden_layer(surf, r_output);
+
 			return;
 		}
 
@@ -378,9 +542,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;
@@ -622,6 +788,19 @@ 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;
+	}
+
+	return false;
+}
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -648,16 +827,21 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 	    !surface->mapped)
 		return;
 
-	if (surface->view->is_mapped)
+	if (surface->view->is_mapped || surface->state == HIDDEN)
 		return;
 
 	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,
 				   surface->popup.x, surface->popup.y, &new_x, &new_y);
 	weston_view_set_position(view, new_x, new_y);
+	weston_view_update_transform(view);
 
 	/* only clip the pop-up dialog window if we have a valid
 	 * width and height being passed on. Users might not want to have one
@@ -706,6 +890,7 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
 	if (!surface->mapped)
 		surface->mapped = true;
 
+	surface->state = NORMAL;
 	ivi_layout_popup_committed(surface);
 }
 
@@ -737,12 +922,10 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 {
 	struct ivi_compositor *ivi = output->ivi;
 	struct weston_desktop_surface *dsurf;
-	struct weston_view *view;
 	struct weston_geometry geom;
 	struct ivi_policy *policy = output->ivi->policy;
 
 	dsurf = surf->dsurface;
-	view = surf->view;
 
 	const char *app_id = weston_desktop_surface_get_app_id(dsurf);
 
@@ -755,8 +938,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) {
@@ -766,13 +949,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)
@@ -791,28 +980,14 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 		return;
 	}
 
-	weston_desktop_surface_set_maximized(dsurf, true);
-	weston_desktop_surface_set_size(dsurf,
-					output->area.width,
-					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),
-			output->area.width, output->area.height);
-	/*
-	 * If the view isn't mapped, we put it onto the hidden layer so it will
-	 * start receiving frame events, and will be able to act on our
-	 * configure event.
-	 */
-	if (!weston_view_is_mapped(view)) {
-		view->is_mapped = true;
-		view->surface->is_mapped = true;
-
-		weston_view_set_output(view, output->output);
-		weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
-		weston_log("Placed app_id %s, type %s in hidden layer\n",
-				app_id, ivi_layout_get_surface_role_name(surf));
+	/* 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);
 }
 
 void
@@ -924,8 +1099,13 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 	} else if (surf->role == IVI_SURFACE_ROLE_POPUP) {
 		struct weston_view *view  = surf->view;
 
+		weston_view_unmap(view);
+		surf->state = HIDDEN;
+
 		weston_layer_entry_remove(&view->layer_link);
 		weston_view_geometry_dirty(view);
 		weston_surface_damage(view->surface);
 	}
+
+      shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED);
 }