Don't track damage for views on inactive tabs

2 files changed, 26 insertions, 4 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 62dca487..5c1f42c2 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -522,10 +522,7 @@ static struct sway_container *container_at_tabbed(struct sway_container *parent,
 	}
 
 	// Surfaces
-	struct sway_container *current = seat_get_focus_inactive(seat, parent);
-	while (current->parent != parent) {
-		current = current->parent;
-	}
+	struct sway_container *current = seat_get_active_child(seat, parent);
 
 	return container_at(current, ox, oy, surface, sx, sy);
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 636abb25..51316507 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -865,3 +865,28 @@ void view_update_marks_textures(struct sway_view *view) {
 			&config->border_colors.urgent);
 	container_damage_whole(view->swayc);
 }
+
+bool view_is_visible(struct sway_view *view) {
+	if (!view->swayc) {
+		return false;
+	}
+	// Check view isn't in a tabbed or stacked container on an inactive tab
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *container = view->swayc;
+	while (container->type != C_WORKSPACE) {
+		if (container->parent->layout == L_TABBED ||
+				container->parent->layout == L_STACKED) {
+			if (seat_get_active_child(seat, container->parent) != container) {
+				return false;
+			}
+		}
+		container = container->parent;
+	}
+	// Check view isn't hidden by another fullscreen view
+	struct sway_container *workspace = container;
+	if (workspace->sway_workspace->fullscreen && !view->is_fullscreen) {
+		return false;
+	}
+	// Check the workspace is visible
+	return workspace_is_visible(workspace);
+}