X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=16d924c2d9932108461fb4d608d57ec9d4a9c2c8;hb=e7ccf51adc37748d3ca000109d16d0495dc0a7e8;hp=7f445e635a00724711a4adf0b7c86ee8020d5182;hpb=09fa5536e759792c80341305a536cd59aa801c6d;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 7f445e6..16d924c 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -49,13 +49,12 @@
 static void
 create_black_curtain_view(struct ivi_output *output);
 
-static void
-_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
-			     uint32_t orientation, bool to_activate);
-
 static uint32_t
 reverse_orientation(uint32_t orientation);
 
+const char *
+split_orientation_to_string(uint32_t orientation);
+
 void
 agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
 					   struct ivi_surface *surface)
@@ -655,8 +654,18 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 
 		// handle the currently active surface
 		if (papp->ioutput->active) {
+			int width_prev_app = 0;
+
+			if (papp_tile->width > 0) {
+				if (papp_tile->orientation == AGL_SHELL_TILE_ORIENTATION_TOP ||
+				    papp_tile->orientation == AGL_SHELL_TILE_ORIENTATION_BOTTOM)
+					width_prev_app = papp->ioutput->area.height - papp_tile->width;
+				else
+					width_prev_app = papp->ioutput->area.width - papp_tile->width;
+			}
 			_ivi_set_shell_surface_split(papp->ioutput->active, NULL,
-					reverse_orientation(papp_tile->orientation), false);
+					reverse_orientation(papp_tile->orientation),
+					width_prev_app, false, false);
 		}
 
 		surface->role = IVI_SURFACE_ROLE_TILE;
@@ -664,7 +673,8 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 		wl_list_insert(&surface->ivi->surfaces, &surface->link);
 
 		_ivi_set_shell_surface_split(surface, papp->ioutput,
-				papp_tile->orientation, true);
+					     papp_tile->orientation, papp_tile->width,
+					     papp_tile->sticky, true);
 
 		/* remove it from pending */
 		wl_list_remove(&papp->link);
@@ -1770,6 +1780,27 @@ _ivi_set_pending_desktop_surface_split(struct wl_resource *output,
 }
 
 
+const char *
+split_orientation_to_string(uint32_t orientation)
+{
+	switch (orientation) {
+	case AGL_SHELL_TILE_ORIENTATION_LEFT:
+		return "tile_left";
+	break;
+	case AGL_SHELL_TILE_ORIENTATION_RIGHT:
+		return "tile_right";
+	break;
+	case AGL_SHELL_TILE_ORIENTATION_TOP:
+		return "title_top";
+	break;
+	case AGL_SHELL_TILE_ORIENTATION_BOTTOM:
+		return "tile_bottom";
+	break;
+	default:
+		return "none";
+	}
+}
+
 static uint32_t
 reverse_orientation(uint32_t orientation)
 {
@@ -1792,15 +1823,17 @@ reverse_orientation(uint32_t orientation)
 	}
 }
 
-static void
+void
 _ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *ioutput,
-			     uint32_t orientation, bool to_activate)
+			     uint32_t orientation, uint32_t width, int32_t sticky,
+			     bool to_activate)
 {
 	struct ivi_compositor *ivi = surface->ivi;
+	struct weston_view *ev = surface->view;
 	struct weston_geometry geom = {};
 	struct ivi_output *output = NULL;
 
-	int width, height;
+	int new_width, new_height;
 	int x, y;
 
 	geom = weston_desktop_surface_get_geometry(surface->dsurface);
@@ -1809,19 +1842,51 @@ _ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *iou
 	if (!output)
 		output = ioutput;
 
-	width = output->area.width;
-	height = output->area.height;
-
+	// if we don't supply a width we automatically default to doing a half
+	// split, each window taking half of the current output
 	switch (orientation) {
 	case AGL_SHELL_TILE_ORIENTATION_LEFT:
 	case AGL_SHELL_TILE_ORIENTATION_RIGHT:
-		width /= 2;
+		if (width == 0) {
+			new_width = output->area.width / 2;
+			new_height = output->area.height;
+		} else {
+			new_width = width;
+			new_height = output->area.height;
+		}
 	break;
 	case AGL_SHELL_TILE_ORIENTATION_TOP:
 	case AGL_SHELL_TILE_ORIENTATION_BOTTOM:
-		height /= 2;
+		if (width == 0) {
+			new_width = output->area.width;
+			new_height = output->area.height / 2;
+		} else {
+			new_width = output->area.width;
+			new_height = width;
+		}
 	break;
 	case AGL_SHELL_TILE_ORIENTATION_NONE:
+		/* use the current_completed_output because the sticky window
+		 * might have changed the output area */
+		new_width = surface->current_completed_output->area_activation.width;
+		new_height = surface->current_completed_output->area_activation.height;
+
+		if (new_width != output->area.width)
+			output->area.width = new_width;
+
+		if (new_height != output->area.height)
+			output->area.height = new_height;
+
+		weston_log("Adjusting activation area "
+			   "to %dX%d\n", output->area.width, output->area.height);
+
+		if (surface->sticky) {
+			surface->sticky = 0;
+			weston_log("Resetting sticky window\n");
+		}
+
+		surface->role = surface->prev_role;
+		weston_log("Resetting tile role to previous role\n");
 	break;
 	default:
 		/* nothing */
@@ -1833,12 +1898,12 @@ _ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *iou
 	y = output->area.y - geom.y;
 
 	if (orientation == AGL_SHELL_TILE_ORIENTATION_RIGHT)
-		x += width;
+		x += output->area.width - new_width;
 	else if (orientation == AGL_SHELL_TILE_ORIENTATION_BOTTOM)
-		y += height;
+		y += output->area.height - new_height;
+
 
 	if (to_activate) {
-		struct weston_view *ev = surface->view;
 		struct ivi_shell_seat *ivi_seat = NULL;
 		struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
 
@@ -1872,15 +1937,34 @@ _ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *iou
 	}
 
 	weston_view_set_position(surface->view, x, y);
-	weston_desktop_surface_set_size(surface->dsurface, width, height);
+	weston_desktop_surface_set_size(surface->dsurface, new_width, new_height);
 	weston_desktop_surface_set_orientation(surface->dsurface, orientation);
 	surface->orientation = orientation;
 
 	weston_compositor_schedule_repaint(ivi->compositor);
 
-	weston_log("%s() Setting to x=%d, y=%d, width=%d, height=%d, orientation=%d\n",
-			__func__, x, y, width, height, orientation);
+	if (sticky)
+		surface->sticky = sticky;
+
+	if (orientation != AGL_SHELL_TILE_ORIENTATION_NONE) {
+		surface->prev_role = surface->role;
+		surface->role = IVI_SURFACE_ROLE_TILE;
+		weston_log("Found split orientation different that none, "
+			   "setting surface role to orientation tile\n");
+	}
+
+	if (surface->sticky) {
+		if (orientation == AGL_SHELL_TILE_ORIENTATION_LEFT ||
+		    orientation == AGL_SHELL_TILE_ORIENTATION_RIGHT)
+			output->area.width -= new_width;
 
+		if (orientation == AGL_SHELL_TILE_ORIENTATION_TOP ||
+		    orientation == AGL_SHELL_TILE_ORIENTATION_BOTTOM)
+			output->area.height -= new_height;
+
+		weston_log("Found sticky window, adjusting activation area "
+			   "to %dX%d\n", output->area.width, output->area.height);
+	}
 }
 
 static int
@@ -1900,8 +1984,8 @@ shell_ivi_surf_count_split_surfaces(struct ivi_compositor *ivi)
 
 static
 void shell_set_app_split(struct wl_client *client, struct wl_resource *res,
-			 const char *app_id, uint32_t orientation,
-			 struct wl_resource *output_res)
+			 const char *app_id, uint32_t orientation, int32_t width,
+			 int32_t sticky, struct wl_resource *output_res)
 {
 	struct ivi_surface *surf;
 	struct ivi_compositor *ivi = wl_resource_get_user_data(res);
@@ -1925,31 +2009,62 @@ void shell_set_app_split(struct wl_client *client, struct wl_resource *res,
 		return;
 	}
 
-	/* otherwise, take actions now */
-	weston_log("%s() added split surface for app_id '%s' with orientation %d\n",
-			__func__, app_id, orientation);
-
-	if (output->previous_active) {
+	if (output->previous_active && output->background != output->previous_active) {
+		int width_prev_app = 0;
 		struct weston_view *ev = output->previous_active->view;
+		const char *prev_app_id = 
+			weston_desktop_surface_get_app_id(output->previous_active->dsurface);
+
+		if (orientation != AGL_SHELL_TILE_ORIENTATION_NONE)  {
+			if (!weston_view_is_mapped(ev))
+				weston_view_update_transform(ev);
+			else
+				weston_layer_entry_remove(&ev->layer_link);
+
+			ev->is_mapped = true;
+			ev->surface->is_mapped = true;
+			output->previous_active->mapped = true;
+
+			weston_view_set_output(ev, woutput);
+			weston_layer_entry_insert(&ivi->normal.view_list,
+						  &ev->layer_link);
+		} else {
+			ev->is_mapped = false;
+			ev->surface->is_mapped = false;
 
-		if (!weston_view_is_mapped(ev))
-			weston_view_update_transform(ev);
-		else
 			weston_layer_entry_remove(&ev->layer_link);
 
-		ev->is_mapped = true;
-		ev->surface->is_mapped = true;
-		output->previous_active->mapped = true;
+			weston_view_geometry_dirty(ev);
+			weston_surface_damage(ev->surface);
+		}
 
-		weston_view_set_output(ev, woutput);
+		/* a 0 width means we have no explicit width set-up */
+		if (width > 0) {
+			if (orientation == AGL_SHELL_TILE_ORIENTATION_TOP ||
+			    orientation == AGL_SHELL_TILE_ORIENTATION_BOTTOM)
+				width_prev_app = output->area.height - width;
+			else
+				width_prev_app = output->area.width - width;
+		}
 
-		weston_layer_entry_insert(&ivi->normal.view_list, &ev->layer_link);
+		weston_log("Setting previous application '%s' to orientation '%s' width %d, not sticky\n",
+			   prev_app_id, split_orientation_to_string(reverse_orientation(orientation)),
+			   width_prev_app);
 
 		_ivi_set_shell_surface_split(output->previous_active, NULL,
-					     reverse_orientation(orientation), false);
+					     reverse_orientation(orientation),
+					     width_prev_app, false, false);
+
+		if (orientation == AGL_SHELL_TILE_ORIENTATION_NONE &&
+		    output->active == surf) {
+			output->active = output->previous_active;
+		}
 	}
 
-	_ivi_set_shell_surface_split(surf, NULL, orientation, false);
+	weston_log("Setting application '%s' to orientation '%s' width %d, %s\n",
+		   app_id, split_orientation_to_string(orientation),
+		   width, sticky == 1 ? "sticky" : "not sticky");
+	_ivi_set_shell_surface_split(surf, NULL, orientation, width, sticky, false);
 }
 
 static void