From 398d96fdb2a18f7652c116639dc17741f5e24404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 26 Apr 2022 17:24:55 +0200
Subject: [PATCH] term: flash: work around Sway sub-surface unmap bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unmapping a sub-surface in Sway does not damage the underlying
surface.

As a result, the OSC-555 escape (“flash”) will leave yellow margins on
~every second frame.

Out of sway, river, weston and mutter, only Sway needs this
workaround.

This is a workaround for https://github.com/swaywm/sway/issues/6960

Closes #1046
---
 terminal.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
 }