From 3964320a731def870e1c28bc8bae05310decc949 Mon Sep 17 00:00:00 2001
From: Shivesh Mandalia <mail@shivesh.org>
Date: Wed, 22 Sep 2021 20:30:34 +0100
Subject: Proper drawing of ligatures

- Patch st-ligatures-scrollback-0.8.4
	<https://st.suckless.org/patches/ligatures/>
---
 st.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'st.h')

diff --git a/st.h b/st.h
index 9d04b66..1afc05e 100644
--- a/st.h
+++ b/st.h
@@ -11,7 +11,8 @@
 #define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
 #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
+#define ATTRCMP(a, b)		(((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
+				(a).fg != (b).fg || \
 				(a).bg != (b).bg)
 #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
 				(t1.tv_nsec-t2.tv_nsec)/1E6)
@@ -33,6 +34,7 @@ enum glyph_attribute {
 	ATTR_WRAP       = 1 << 8,
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
+	ATTR_LIGA       = 1 << 11,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
 };
 
-- 
cgit v1.2.3