X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=62e422cd8d079d556e20e79ba054464da86c21a2;hb=26e72fa379d1b1c0c131cbc85e46d371c3d926ef;hp=4ffcb167f837cf2bde46c2ce1336f43b6624144e;hpb=483d363b9e724a0ab84c771b1a6530e3e46deb4c;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 4ffcb16..62e422c 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -215,9 +215,8 @@ 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_damage_below(view);
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
 
 	/*
 	 * the 'remote' role now makes use of this part so make sure we don't
@@ -254,8 +253,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;
@@ -404,6 +402,7 @@ 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;
@@ -417,19 +416,26 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 		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);
-
 	assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
 
-	weston_desktop_surface_set_fullscreen(dsurface, true);
+	if (!weston_desktop_surface_get_fullscreen(dsurface) ||
+	    geom.width != bg_output->output->width ||
+	    geom.height != bg_output->output->height) {
+		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");
+		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);
 
-	weston_view_update_transform(view);
-	weston_view_damage_below(view);
+	weston_view_geometry_dirty(view);
+	weston_surface_damage(view->surface);
 
 	wsurface->is_mapped = true;
 	surface->view->is_mapped = true;
@@ -457,8 +463,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
@@ -542,8 +549,8 @@ 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);
 
 	wsurface->is_mapped = true;
 	surface->view->is_mapped = true;
@@ -555,6 +562,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)
 {
@@ -566,6 +582,8 @@ 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;
 
@@ -582,7 +600,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
@@ -593,8 +614,8 @@ 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);
 
 	wsurface->is_mapped = true;
 	surface->view->is_mapped = true;
@@ -732,8 +753,6 @@ 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));
 	}
@@ -832,7 +851,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 {
@@ -848,6 +868,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);
 	}
 }