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

diff --git a/src/layout.c b/src/layout.c
index b1d8b3d..dd4abb5 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -192,9 +192,13 @@ 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);
 	}
 
 	weston_view_set_output(view, woutput);
@@ -203,6 +207,7 @@ ivi_layout_activate_complete(struct ivi_output *output,
 				 woutput->y + output->area.y);
 
 	view->is_mapped = true;
+	surf->mapped = true;
 	view->surface->is_mapped = true;
 
 	if (output->active) {
@@ -215,10 +220,11 @@ ivi_layout_activate_complete(struct ivi_output *output,
 	output->active = surf;
 
 	weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
-	weston_view_update_transform(view);
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
 
-	/* force repaint of the entire output */
-	weston_output_damage(output->output);
+	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
@@ -255,8 +261,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;
@@ -286,7 +291,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)
@@ -302,7 +307,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 */
@@ -342,7 +347,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
@@ -354,7 +358,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;
 			}
 		}
 
@@ -371,7 +374,7 @@ 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) {
@@ -379,7 +382,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(output, app_id);
-			surf->activated_by_default = true;
 		}
 		return;
 	}
@@ -405,41 +407,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
@@ -458,8 +508,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
@@ -476,6 +527,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;
 
@@ -487,7 +541,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)
@@ -504,9 +558,7 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 
 	switch (surface->role) {
 	case IVI_SURFACE_ROLE_SPLIT_V:
-		if (geom.width == woutput->width &&
-		    geom.height == woutput->height)
-			geom.width = (output->area.width / 2);
+		geom.width = (output->area.width / 2);
 
 		x += woutput->width - geom.width;
 		output->area.width -= geom.width;
@@ -517,9 +569,7 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 
 		break;
 	case IVI_SURFACE_ROLE_SPLIT_H:
-		if (geom.width == woutput->width &&
-		    geom.height == woutput->height)
-			geom.height = (output->area.height / 2);
+		geom.height = (output->area.height / 2);
 
 		y = output->area.y;
 		output->area.y += geom.height;
@@ -547,8 +597,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;
@@ -560,6 +613,15 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 			app_id, ivi_layout_get_surface_role_name(surface), output->name);
 }
 
+static void
+ivi_compute_popup_position(const struct weston_output *output, struct weston_view *view,
+			   int initial_x, int initial_y, int *new_x, int *new_y)
+{
+	*new_x = output->x + initial_x;
+	*new_y = output->y + initial_y;
+}
+
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -571,14 +633,19 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 		weston_desktop_surface_get_surface(dsurface);
 	const char *app_id = weston_desktop_surface_get_app_id(dsurface);
 
+	int new_x, new_y;
+
 	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)
@@ -587,7 +654,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 	assert(surface->role == IVI_SURFACE_ROLE_POPUP);
 
 	weston_view_set_output(view, woutput);
-	weston_view_set_position(view, surface->popup.x, surface->popup.y);
+
+	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);
 
 	/* 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
@@ -598,8 +668,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;
@@ -630,8 +703,8 @@ 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;
 
 	ivi_layout_popup_committed(surface);
 }
@@ -649,8 +722,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)
@@ -737,11 +810,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 
 		weston_view_set_output(view, output->output);
 		weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
-		/* force repaint of the entire output */
-
 		weston_log("Placed app_id %s, type %s in hidden layer\n",
 				app_id, ivi_layout_get_surface_role_name(surf));
-		weston_output_damage(output->output);
 	}
 }
 
@@ -838,7 +908,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_output_damage(ivi_output->output);
+				weston_view_geometry_dirty(view);
+				weston_surface_damage(view->surface);
 				ivi_output->active = NULL;
 			}
 		} else {
@@ -854,6 +925,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 		struct weston_view *view  = surf->view;
 
 		weston_layer_entry_remove(&view->layer_link);
-		weston_view_damage_below(view);
+		weston_view_geometry_dirty(view);
+		weston_surface_damage(view->surface);
 	}
 }