X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=031923a447097eee5be5aaf3145345580de922d1;hb=b92397ef12626a0d09cb4c9e853d0c038104110f;hp=aa3241549f2d31482c1b05223c651118974c9906;hpb=62e020b90b0627e7f24428d5db7b6790b3a161b0;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index aa32415..031923a 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -192,17 +192,44 @@ ivi_layout_activate_complete(struct ivi_output *output,
 	struct ivi_compositor *ivi = output->ivi;
 	struct weston_output *woutput = 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);
 
 	if (weston_view_is_mapped(view)) {
 		weston_layer_entry_remove(&view->layer_link);
+	} else {
+		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);
 
 	view->is_mapped = true;
+	surf->mapped = true;
 	view->surface->is_mapped = true;
 
 	if (output->active) {
@@ -213,11 +240,15 @@ ivi_layout_activate_complete(struct ivi_output *output,
 	}
 	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);
 	weston_surface_damage(view->surface);
 
+	if (ivi_seat)
+		ivi_shell_activate_surface(surf, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
+
 	/*
 	 * the 'remote' role now makes use of this part so make sure we don't
 	 * trip the enum such that we might end up with a modified output for
@@ -253,8 +284,7 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
 	return NULL;
 }
 
-
-static struct ivi_output *
+struct ivi_output *
 ivi_layout_find_bg_output(struct ivi_compositor *ivi)
 {
 	struct ivi_output *out;
@@ -268,6 +298,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)
 {
@@ -284,7 +381,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 	 * we can't make use here of the ivi_layout_get_output_from_surface()
 	 * due to the fact that we'll always land here when a surface performs
 	 * a commit and pending_output will not bet set. This works in tandem
-	 * with 'activated_by_default' at this point to avoid tripping over
+	 * with 'mapped' at this point to avoid tripping over
 	 * to a surface that continuously updates its content
 	 */
 	if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
@@ -300,7 +397,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 			return;
 
 		/* we can only activate it again by using the protocol */
-		if (surf->activated_by_default)
+		if (surf->mapped)
 			return;
 
 		/* check first if there aren't any outputs being set */
@@ -309,7 +406,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);
 		}
 
 
@@ -329,6 +426,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;
 		}
 
@@ -340,7 +443,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 					weston_desktop_surface_get_app_id(surf->dsurface),
 					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
@@ -352,7 +454,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 				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;
 			}
 		}
 
@@ -369,15 +470,16 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 		 * ivi_layout_activate_complete() terminates so we use the
 		 * current active surface to avoid hitting this again and again
 		 * */
-		if (surf->activated_by_default && output->active == surf)
+		if (surf->mapped && output->active == 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);
-			surf->activated_by_default = true;
 		}
 		return;
 	}
@@ -403,41 +505,89 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 
 	struct ivi_output *output = surface->split.output;
 	struct weston_output *woutput = output->output;
+	struct ivi_output *bg_output = ivi_layout_find_bg_output(ivi);
 
 	struct weston_view *view = surface->view;
-	struct weston_geometry geom;
+	struct weston_geometry geom =
+		weston_desktop_surface_get_geometry(dsurface);
+
+	struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
+	struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+
+	bool is_fullscreen = weston_desktop_surface_get_fullscreen(dsurface);
+	bool is_dim_same =
+		geom.width == bg_output->output->width &&
+		geom.height == bg_output->output->height;
 
 	if (policy && policy->api.surface_activate_by_default &&
 	    !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-	    !surface->activated_by_default)
+	    !surface->mapped)
 		return;
 
-	if (surface->view->is_mapped)
+	assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
+
+	if (weston_view_is_mapped(view))
 		return;
 
-	geom = weston_desktop_surface_get_geometry(dsurface);
-	weston_log("(fs) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
-			geom.width, geom.height);
+	/* if we still get here but we haven't resized so far, send configure
+	 * events to do so */
+	if (surface->state != RESIZING && (!is_fullscreen || !is_dim_same)) {
+		struct ivi_output *bg_output =
+			ivi_layout_find_bg_output(surface->ivi);
 
-	assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
+		weston_log("Placing fullscreen app_id %s, type %s in hidden layer\n",
+				app_id, ivi_layout_get_surface_role_name(surface));
+		weston_desktop_surface_set_fullscreen(dsurface, true);
+		weston_desktop_surface_set_size(dsurface,
+						bg_output->output->width,
+						bg_output->output->height);
 
-	weston_desktop_surface_set_fullscreen(dsurface, true);
+		surface->state = RESIZING;
+		weston_view_set_output(view, output->output);
+		weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
+		return;
+	}
 
-	weston_view_set_output(view, woutput);
-	weston_view_set_position(view, woutput->x, woutput->y);
-	weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
+	/* eventually, we would set the surface fullscreen, but the client
+	 * hasn't resized correctly by this point, so terminate connection */
+	if (surface->state == RESIZING && is_fullscreen && !is_dim_same) {
+		struct weston_desktop_client *desktop_client =
+			weston_desktop_surface_get_client(dsurface);
+		struct wl_client *client =
+			weston_desktop_client_get_client(desktop_client);
+		wl_client_post_implementation_error(client,
+				"can not display surface due to invalid geometry."
+				" Client should perform a geometry resize!");
+		return;
+	}
 
-	weston_view_update_transform(view);
-	weston_view_damage_below(view);
+	/* this implies we resized correctly */
+	if (!weston_view_is_mapped(view)) {
+		weston_layer_entry_remove(&view->layer_link);
 
-	wsurface->is_mapped = true;
-	surface->view->is_mapped = true;
+		weston_view_set_output(view, woutput);
+		weston_view_set_position(view, woutput->x, woutput->y);
+		weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
 
-	shell_advertise_app_state(ivi, app_id,
-				  NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
+		wsurface->is_mapped = true;
+		surface->view->is_mapped = true;
+		surface->state = FULLSCREEN;
 
-	weston_log("Activation completed for app_id %s, role %s, output %s\n",
-			app_id, ivi_layout_get_surface_role_name(surface), output->name);
+		weston_view_geometry_dirty(view);
+		weston_surface_damage(view->surface);
+
+		if (ivi_seat)
+			ivi_shell_activate_surface(surface, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
+
+		shell_advertise_app_state(ivi, app_id,
+				NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
+
+		weston_log("Activation completed for app_id %s, role %s, "
+			   "output %s\n", app_id,
+			   ivi_layout_get_surface_role_name(surface),
+			   output->name);
+
+	}
 }
 
 void
@@ -456,8 +606,9 @@ ivi_layout_desktop_resize(struct ivi_surface *surface,
 					width, height);
 
 	weston_view_set_position(view, x, y);
-	weston_view_update_transform(view);
-	weston_view_damage_below(view);
+
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
 }
 
 void
@@ -474,6 +625,9 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 	struct ivi_output *output = surface->split.output;
 	struct weston_output *woutput = output->output;
 
+	struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
+	struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+
 	struct weston_view *view = surface->view;
 	struct weston_geometry geom;
 
@@ -485,7 +639,7 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 
 	if (policy && policy->api.surface_activate_by_default &&
 	    !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-	    !surface->activated_by_default)
+	    !surface->mapped)
 		return;
 
 	if (surface->view->is_mapped)
@@ -541,8 +695,11 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 	weston_view_set_position(view, x, y);
 	weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
 
-	weston_view_update_transform(view);
-	weston_view_damage_below(view);
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
+
+	if (ivi_seat)
+		ivi_shell_activate_surface(surface, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
 
 	wsurface->is_mapped = true;
 	surface->view->is_mapped = true;
@@ -579,14 +736,17 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 	struct ivi_output *output = surface->popup.output;
 	struct weston_output *woutput = output->output;
 
+	struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
+	struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+
 	struct weston_view *view = surface->view;
 
 	if (policy && policy->api.surface_activate_by_default &&
 	    !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-	    !surface->activated_by_default)
+	    !surface->mapped)
 		return;
 
-	if (surface->view->is_mapped)
+	if (surface->view->is_mapped || surface->state == HIDDEN)
 		return;
 
 	assert(surface->role == IVI_SURFACE_ROLE_POPUP);
@@ -596,6 +756,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 	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
@@ -606,8 +767,11 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 
 	weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
 
-	weston_view_update_transform(view);
-	weston_view_damage_below(view);
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
+
+	if (ivi_seat)
+		ivi_shell_activate_surface(surface, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
 
 	wsurface->is_mapped = true;
 	surface->view->is_mapped = true;
@@ -638,9 +802,10 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
 
 	/* reset the activate by default in order to (still) allow the surface
 	 * to be activaved using the request */
-	if (!surface->activated_by_default)
-		surface->activated_by_default = true;
+	if (!surface->mapped)
+		surface->mapped = true;
 
+	surface->state = NORMAL;
 	ivi_layout_popup_committed(surface);
 }
 
@@ -657,8 +822,8 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
 
 	/* reset the activate by default in order to (still) allow the surface
 	 * to be activaved using the request */
-	if (!surf->activated_by_default)
-		surf->activated_by_default = true;
+	if (!surf->mapped)
+		surf->mapped = true;
 
 	wl_list_for_each(is, &ivi->surfaces, link)
 		if (is == surf)
@@ -672,12 +837,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);
 
@@ -690,8 +853,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) {
@@ -726,28 +889,7 @@ 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));
-	}
+	ivi_layout_add_to_hidden_layer(surf, output);
 }
 
 void
@@ -843,7 +985,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 				view->surface->is_mapped = false;
 
 				weston_layer_entry_remove(&view->layer_link);
-				weston_view_damage_below(view);
+				weston_view_geometry_dirty(view);
+				weston_surface_damage(view->surface);
 				ivi_output->active = NULL;
 			}
 		} else {
@@ -858,7 +1001,11 @@ 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_damage_below(view);
+		weston_view_geometry_dirty(view);
+		weston_surface_damage(view->surface);
 	}
 }