Merge pull request #2466 from RyanDwyer/geometry

Fix geometry

include/sway/desktop.h

@@ -1,8 +1,13 @@
 #include <wlr/types/wlr_surface.h>
 
 struct sway_container;
+struct sway_view;
 
 void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
 	bool whole);
 
 void desktop_damage_whole_container(struct sway_container *con);
+
+void desktop_damage_box(struct wlr_box *box);
+
+void desktop_damage_view(struct sway_view *view);

include/sway/tree/view.h

@@ -88,6 +88,14 @@ struct sway_view {
 	struct wlr_buffer *saved_buffer;
 	int saved_buffer_width, saved_buffer_height;
 
+	// The geometry for whatever the client is committing, regardless of
+	// transaction state. Updated on every commit.
+	struct wlr_box geometry;
+
+	// The "old" geometry during a transaction. Used to damage the old location
+	// when a transaction is applied.
+	struct wlr_box saved_geometry;
+
 	bool destroying;
 
 	list_t *executed_criteria; // struct criteria *
@@ -285,8 +293,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_position(struct sway_view *view, double lx, double ly);
-
 void view_update_size(struct sway_view *view, int width, int height);
 
 void view_child_init(struct sway_view_child *child,

sway/desktop/desktop.c

@@ -22,3 +22,21 @@ void desktop_damage_whole_container(struct sway_container *con) {
 		}
 	}
 }
+
+void desktop_damage_box(struct wlr_box *box) {
+	for (int i = 0; i < root_container.children->length; ++i) {
+		struct sway_container *cont = root_container.children->items[i];
+		output_damage_box(cont->sway_output, box);
+	}
+}
+
+void desktop_damage_view(struct sway_view *view) {
+	desktop_damage_whole_container(view->swayc);
+	struct wlr_box box = {
+		.x = view->swayc->current.view_x - view->geometry.x,
+		.y = view->swayc->current.view_y - view->geometry.y,
+		.width = view->surface->current.width,
+		.height = view->surface->current.height,
+	};
+	desktop_damage_box(&box);
+}

sway/desktop/output.c

@@ -144,15 +144,16 @@ void output_view_for_each_surface(struct sway_output *output,
 		.user_iterator = iterator,
 		.user_data = user_data,
 		.output = output,
-		.ox = view->swayc->current.view_x - output->swayc->current.swayc_x,
+		.ox = view->swayc->current.view_x - output->swayc->current.swayc_x
-		.oy = view->swayc->current.view_y - output->swayc->current.swayc_y,
+			- view->geometry.x,
+		.oy = view->swayc->current.view_y - output->swayc->current.swayc_y
+			- view->geometry.y,
 		.width = view->swayc->current.view_width,
 		.height = view->swayc->current.view_height,
 		.rotation = 0, // TODO
 	};
 
-	view_for_each_surface(view,
+	view_for_each_surface(view, output_for_each_surface_iterator, &data);
-		output_for_each_surface_iterator, &data);
 }
 
 void output_view_for_each_popup(struct sway_output *output,

sway/desktop/render.c

@@ -193,9 +193,11 @@ static void render_view_toplevels(struct sway_view *view,
 		.alpha = alpha,
 	};
 	// Render all toplevels without descending into popups
-	output_surface_for_each_surface(output, view->surface,
+	double ox =
-			view->swayc->current.view_x - output->wlr_output->lx,
+		view->swayc->current.view_x - output->wlr_output->lx - view->geometry.x;
-			view->swayc->current.view_y - output->wlr_output->ly,
+	double oy =
+		view->swayc->current.view_y - output->wlr_output->ly - view->geometry.y;
+	output_surface_for_each_surface(output, view->surface, ox, oy,
 			render_surface_iterator, &data);
 }
 
@@ -227,8 +229,10 @@ static void render_saved_view(struct sway_view *view,
 		return;
 	}
 	struct wlr_box box = {
-		.x = view->swayc->current.view_x - output->swayc->current.swayc_x,
+		.x = view->swayc->current.view_x - output->swayc->current.swayc_x -
-		.y = view->swayc->current.view_y - output->swayc->current.swayc_y,
+			view->saved_geometry.x,
+		.y = view->swayc->current.view_y - output->swayc->current.swayc_y -
+			view->saved_geometry.y,
 		.width = view->saved_buffer_width,
 		.height = view->saved_buffer_height,
 	};

sway/desktop/transaction.c

@@ -6,6 +6,7 @@
 #include <time.h>
 #include <wlr/types/wlr_buffer.h>
 #include "sway/debug.h"
+#include "sway/desktop.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
 #include "sway/output.h"
@@ -169,25 +170,17 @@ static void transaction_apply(struct sway_transaction *transaction) {
 			transaction->instructions->items[i];
 		struct sway_container *container = instruction->container;
 
-		// Damage the old and new locations
+		// Damage the old location
-		struct wlr_box old_box = {
+		desktop_damage_whole_container(container);
-			.x = container->current.swayc_x,
+		if (container->type == C_VIEW && container->sway_view->saved_buffer) {
-			.y = container->current.swayc_y,
+			struct sway_view *view = container->sway_view;
-			.width = container->current.swayc_width,
+			struct wlr_box box = {
-			.height = container->current.swayc_height,
+				.x = container->current.view_x - view->saved_geometry.x,
-		};
+				.y = container->current.view_y - view->saved_geometry.y,
-		struct wlr_box new_box = {
+				.width = view->saved_buffer_width,
-			.x = instruction->state.swayc_x,
+				.height = view->saved_buffer_height,
-			.y = instruction->state.swayc_y,
+			};
-			.width = instruction->state.swayc_width,
+			desktop_damage_box(&box);
-			.height = instruction->state.swayc_height,
-		};
-		for (int j = 0; j < root_container.current.children->length; ++j) {
-			struct sway_container *output = root_container.current.children->items[j];
-			if (output->sway_output) {
-				output_damage_box(output->sway_output, &old_box);
-				output_damage_box(output->sway_output, &new_box);
-			}
 		}
 
 		// There are separate children lists for each instruction state, the
@@ -204,6 +197,20 @@ static void transaction_apply(struct sway_transaction *transaction) {
 			view_remove_saved_buffer(container->sway_view);
 		}
 
+		// Damage the new location
+		desktop_damage_whole_container(container);
+		if (container->type == C_VIEW && container->sway_view->surface) {
+			struct sway_view *view = container->sway_view;
+			struct wlr_surface *surface = view->surface;
+			struct wlr_box box = {
+				.x = container->current.view_x - view->geometry.x,
+				.y = container->current.view_y - view->geometry.y,
+				.width = surface->current.width,
+				.height = surface->current.height,
+			};
+			desktop_damage_box(&box);
+		}
+
 		container->instruction = NULL;
 	}
 }
@@ -297,6 +304,8 @@ static void transaction_commit(struct sway_transaction *transaction) {
 		}
 		if (con->type == C_VIEW) {
 			view_save_buffer(con->sway_view);
+			memcpy(&con->sway_view->saved_geometry, &con->sway_view->geometry,
+					sizeof(struct wlr_box));
 		}
 		con->instruction = instruction;
 	}
@@ -355,7 +364,9 @@ static void set_instruction_ready(
 	}
 
 	instruction->container->instruction = NULL;
-	transaction_progress_queue();
+	if (!txn_debug) {
+		transaction_progress_queue();
+	}
 }
 
 void transaction_notify_view_ready_by_serial(struct sway_view *view,

sway/desktop/xdg_shell.c

@@ -7,6 +7,7 @@
 #include <wlr/util/edges.h>
 #include "log.h"
 #include "sway/decoration.h"
+#include "sway/desktop.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/server.h"
@@ -107,7 +108,8 @@ static void get_constraints(struct sway_view *view, double *min_width,
 	*max_height = state->max_height > 0 ? state->max_height : DBL_MAX;
 }
 
-static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
+static const char *get_string_prop(struct sway_view *view,
+		enum sway_view_prop prop) {
 	if (xdg_shell_view_from_view(view) == NULL) {
 		return NULL;
 	}
@@ -255,8 +257,24 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 	}
 
 	if (view->swayc->instruction) {
+		wlr_xdg_surface_get_geometry(xdg_surface, &view->geometry);
 		transaction_notify_view_ready_by_serial(view,
 				xdg_surface->configure_serial);
+	} else {
+		struct wlr_box new_geo;
+		wlr_xdg_surface_get_geometry(xdg_surface, &new_geo);
+
+		if ((new_geo.width != view->width || new_geo.height != view->height) &&
+				container_is_floating(view->swayc)) {
+			// A floating view has unexpectedly sent a new size
+			desktop_damage_view(view);
+			view_update_size(view, new_geo.width, new_geo.height);
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+			desktop_damage_view(view);
+			transaction_commit_dirty();
+		} else {
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+		}
 	}
 
 	view_damage_from(view);

sway/desktop/xdg_shell_v6.c

@@ -6,6 +6,7 @@
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include "log.h"
 #include "sway/decoration.h"
+#include "sway/desktop.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/server.h"
@@ -106,7 +107,8 @@ static void get_constraints(struct sway_view *view, double *min_width,
 	*max_height = state->max_height > 0 ? state->max_height : DBL_MAX;
 }
 
-static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
+static const char *get_string_prop(struct sway_view *view,
+		enum sway_view_prop prop) {
 	if (xdg_shell_v6_view_from_view(view) == NULL) {
 		return NULL;
 	}
@@ -250,9 +252,26 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 	if (!view->swayc) {
 		return;
 	}
+
 	if (view->swayc->instruction) {
+		wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &view->geometry);
 		transaction_notify_view_ready_by_serial(view,
 				xdg_surface_v6->configure_serial);
+	} else {
+		struct wlr_box new_geo;
+		wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &new_geo);
+
+		if ((new_geo.width != view->width || new_geo.height != view->height) &&
+				container_is_floating(view->swayc)) {
+			// A floating view has unexpectedly sent a new size
+			desktop_damage_view(view);
+			view_update_size(view, new_geo.width, new_geo.height);
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+			desktop_damage_view(view);
+			transaction_commit_dirty();
+		} else {
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+		}
 	}
 
 	view_damage_from(view);

sway/desktop/xwayland.c

@@ -277,18 +277,44 @@ static const struct sway_view_impl view_impl = {
 	.destroy = destroy,
 };
 
+static void get_geometry(struct sway_view *view, struct wlr_box *box) {
+	box->x = box->y = 0;
+	if (view->surface) {
+		box->width = view->surface->current.width;
+		box->height = view->surface->current.height;
+	} else {
+		box->width = 0;
+		box->height = 0;
+	}
+}
+
 static void handle_commit(struct wl_listener *listener, void *data) {
 	struct sway_xwayland_view *xwayland_view =
 		wl_container_of(listener, xwayland_view, commit);
 	struct sway_view *view = &xwayland_view->view;
 	struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-	struct wlr_surface_state *surface_state = &xsurface->surface->current;
+	struct wlr_surface_state *state = &xsurface->surface->current;
 
 	if (view->swayc->instruction) {
+		get_geometry(view, &view->geometry);
 		transaction_notify_view_ready_by_size(view,
-				surface_state->width, surface_state->height);
+				state->width, state->height);
-	} else if (container_is_floating(view->swayc)) {
+	} else {
-		view_update_size(view, surface_state->width, surface_state->height);
+		struct wlr_box new_geo;
+		get_geometry(view, &new_geo);
+
+		if ((new_geo.width != view->width || new_geo.height != view->height) &&
+				container_is_floating(view->swayc)) {
+			// A floating view has unexpectedly sent a new size
+			// eg. The Firefox "Save As" dialog when downloading a file
+			desktop_damage_view(view);
+			view_update_size(view, new_geo.width, new_geo.height);
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+			desktop_damage_view(view);
+			transaction_commit_dirty();
+		} else {
+			memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+		}
 	}
 
 	view_damage_from(view);

sway/tree/container.c

@@ -509,8 +509,8 @@ static void surface_at_view(struct sway_container *swayc, double lx, double ly,
 		return;
 	}
 	struct sway_view *sview = swayc->sway_view;
-	double view_sx = lx - sview->x;
+	double view_sx = lx - sview->x + sview->geometry.x;
-	double view_sy = ly - sview->y;
+	double view_sy = ly - sview->y + sview->geometry.y;
 
 	double _sx, _sy;
 	struct wlr_surface *_surface = NULL;
@@ -1065,6 +1065,7 @@ void container_set_geometry_from_floating_view(struct sway_container *con) {
 	con->y = view->y - top;
 	con->width = view->width + border_width * 2;
 	con->height = top + view->height + border_width;
+	container_set_dirty(con);
 }
 
 bool container_is_floating(struct sway_container *container) {

sway/tree/view.c

@@ -615,34 +615,16 @@ void view_unmap(struct sway_view *view) {
 	view->surface = NULL;
 }
 
-void view_update_position(struct sway_view *view, double lx, double ly) {
-	if (view->x == lx && view->y == ly) {
-		return;
-	}
-	container_damage_whole(view->swayc);
-	view->x = lx;
-	view->y = ly;
-	view->swayc->current.view_x = lx;
-	view->swayc->current.view_y = ly;
-	if (container_is_floating(view->swayc)) {
-		container_set_geometry_from_floating_view(view->swayc);
-	}
-	container_damage_whole(view->swayc);
-}
-
 void view_update_size(struct sway_view *view, int width, int height) {
-	if (view->width == width && view->height == height) {
+	if (!sway_assert(container_is_floating(view->swayc),
+				"Expected a floating container")) {
 		return;
 	}
-	container_damage_whole(view->swayc);
 	view->width = width;
 	view->height = height;
 	view->swayc->current.view_width = width;
 	view->swayc->current.view_height = height;
-	if (container_is_floating(view->swayc)) {
+	container_set_geometry_from_floating_view(view->swayc);
-		container_set_geometry_from_floating_view(view->swayc);
-	}
-	container_damage_whole(view->swayc);
 }
 
 static void view_subsurface_create(struct sway_view *view,