1 files changed, 23 insertions, 28 deletions

diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index cdac9c72..5cf8abc0 100644
--- a/sway/desktop/render.c
+++ b/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,
-			view->swayc->current.view_x - output->wlr_output->lx,
-			view->swayc->current.view_y - output->wlr_output->ly,
+	double ox =
+		view->swayc->current.view_x - output->wlr_output->lx - view->geometry.x;
+	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,
-		.y = view->swayc->current.view_y - output->swayc->current.swayc_y,
+		.x = view->swayc->current.view_x - output->swayc->current.swayc_x -
+			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,
 	};
@@ -266,7 +270,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
 		render_view_toplevels(view, output, damage, view->swayc->alpha);
 	}
 
-	if (view->using_csd) {
+	if (view->swayc->current.using_csd) {
 		return;
 	}
 
@@ -585,7 +589,7 @@ static void render_container_simple(struct sway_output *output,
 				marks_texture = view->marks_unfocused;
 			}
 
-			if (!view->using_csd) {
+			if (!view->swayc->current.using_csd) {
 				if (state->border == B_NORMAL) {
 					render_titlebar(output, damage, child, state->swayc_x,
 							state->swayc_y, state->swayc_width, colors,
@@ -750,8 +754,6 @@ static void render_container(struct sway_output *output,
 	case L_TABBED:
 		render_container_tabbed(output, damage, con, parent_focused);
 		break;
-	case L_FLOATING:
-		sway_assert(false, "Didn't expect to see floating here");
 	}
 }
 
@@ -777,7 +779,7 @@ static void render_floating_container(struct sway_output *soutput,
 			marks_texture = view->marks_unfocused;
 		}
 
-		if (!view->using_csd) {
+		if (!view->swayc->current.using_csd) {
 			if (con->current.border == B_NORMAL) {
 				render_titlebar(soutput, damage, con, con->current.swayc_x,
 						con->current.swayc_y, con->current.swayc_width, colors,
@@ -802,8 +804,7 @@ static void render_floating(struct sway_output *soutput,
 			if (!workspace_is_visible(ws)) {
 				continue;
 			}
-			list_t *floating =
-				ws->current.ws_floating->current.children;
+			list_t *floating = ws->current.ws_floating;
 			for (int k = 0; k < floating->length; ++k) {
 				struct sway_container *floater = floating->items[k];
 				render_floating_container(soutput, damage, floater);
@@ -812,8 +813,6 @@ static void render_floating(struct sway_output *soutput,
 	}
 }
 
-const char *damage_debug = NULL;
-
 void output_render(struct sway_output *output, struct timespec *when,
 		pixman_region32_t *damage) {
 	struct wlr_output *wlr_output = output->wlr_output;
@@ -827,21 +826,17 @@ void output_render(struct sway_output *output, struct timespec *when,
 
 	wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
 
-	bool damage_whole_before_swap = false;
 	if (!pixman_region32_not_empty(damage)) {
 		// Output isn't damaged but needs buffer swap
 		goto renderer_end;
 	}
 
-	if (damage_debug != NULL) {
-		if (strcmp(damage_debug, "highlight") == 0) {
-			wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
-			damage_whole_before_swap = true;
-		} else if (strcmp(damage_debug, "rerender") == 0) {
-			int width, height;
-			wlr_output_transformed_resolution(wlr_output, &width, &height);
-			pixman_region32_union_rect(damage, damage, 0, 0, width, height);
-		}
+	if (debug.damage == DAMAGE_HIGHLIGHT) {
+		wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
+	} else if (debug.damage == DAMAGE_RERENDER) {
+		int width, height;
+		wlr_output_transformed_resolution(wlr_output, &width, &height);
+		pixman_region32_union_rect(damage, damage, 0, 0, width, height);
 	}
 
 	struct sway_container *workspace = output_get_active_workspace(output);
@@ -915,12 +910,12 @@ render_overlay:
 	render_drag_icons(output, damage, &root_container.sway_root->drag_icons);
 
 renderer_end:
-	if (root_container.sway_root->debug_tree) {
+	if (debug.render_tree) {
+		wlr_renderer_scissor(renderer, NULL);
 		wlr_render_texture(renderer, root_container.sway_root->debug_tree,
-			wlr_output->transform_matrix, 0, 0, 1);
+			wlr_output->transform_matrix, 0, 40, 1);
 	}
-
-	if (damage_whole_before_swap || root_container.sway_root->debug_tree) {
+	if (debug.damage == DAMAGE_HIGHLIGHT) {
 		int width, height;
 		wlr_output_transformed_resolution(wlr_output, &width, &height);
 		pixman_region32_union_rect(damage, damage, 0, 0, width, height);