aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-04-25 17:55:00 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-04-26 15:41:38 +0000
commit1e87dbc4dc87c9567a7851135d91728796b0696f (patch)
tree3aa04e539af27a5ef584d6bee58d4f93d60812ce
parentMerge branch 'search-crashes' (diff)
search: work around Sway sub-surface unmap bug
Unmapping a sub-surface in Sway does not damage the underlying surface. As a result, "committing" a scrollback search will typically leave most of the foot window dimmed. It can be seen when "cancelling" a search as well, but there it's less obvious - only the margins are left dimmed. This is because cancelling a search damaged the current viewport (something that shouldn't be needed). Out of sway, river, weston and mutter, only Sway needs this workaround. This is a workaround for https://github.com/swaywm/sway/issues/6960
-rw-r--r--search.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/search.c b/search.c
index 09b59d50..72c589f2 100644
--- a/search.c
+++ b/search.c
@@ -116,6 +116,11 @@ search_cancel_keep_selection(struct terminal *term)
term_xcursor_update(term);
render_refresh(term);
+
+ /* Work around Sway bug - unmapping a sub-surface does not damage
+ * the underlying surface */
+ term_damage_margins(term);
+ term_damage_view(term);
}
void
@@ -795,7 +800,6 @@ execute_binding(struct seat *seat, struct terminal *term,
grid->view = ensure_view_is_allocated(
term, term->search.original_view);
}
- term_damage_view(term);
search_cancel(term);
return true;