aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-04-26 15:44:16 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-04-26 15:44:16 +0000
commit29f07c791e7ec4d1d6ba4136edeb0a3ad71d33c9 (patch)
tree19e91983d9ea5bb498ba4f153ad74898c61b3c41
parentMerge branch 'search-crashes' (diff)
parentchangelog: workaround for Sway bug #6960 (diff)
Merge branch 'sway-sub-surface-damage-workaround'
Closes #1046
-rw-r--r--CHANGELOG.md9
-rw-r--r--search.c6
-rw-r--r--terminal.c6
3 files changed, 19 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c19a0e..47ca1107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,15 @@
## Unreleased
### Added
+
+* Workaround for Sway bug [#6960][sway-6960]: scrollback search and
+ the OSC-555 (“flash”) escape sequence leaves dimmed (search )and
+ yellow (flash) artifacts ([#1046][1046]).
+
+[sway-6960]: https://github.com/swaywm/sway/issues/6960
+[1046]: https://codeberg.org/dnkl/foot/issues/1046
+
+
### Changed
### Deprecated
### Removed
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;
diff --git a/terminal.c b/terminal.c
index 7d230cdf..9199aa31 100644
--- a/terminal.c
+++ b/terminal.c
@@ -355,8 +355,12 @@ fdm_flash(struct fdm *fdm, int fd, int events, void *data)
(unsigned long long)expiration_count);
term->flash.active = false;
- term_damage_view(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);
return true;
}