Apply ligatures patch

[st.git] / st.h

diff --git a/st.h b/st.h
index fa2eddff864f5be9382b2477ddfd630d0f76e4c8..ddc0d2161e7b7713e1c454dd1202d90bf3befbc7 100644 (file)
--- 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,
 };