diff options
author | Mike Crute <mike@crute.us> | 2020-12-22 16:09:42 -0800 |
---|---|---|
committer | Mike Crute <mike@crute.us> | 2023-04-25 20:45:27 -0700 |
commit | 49af5d59d8bed15678c634d11e86364c8801dc82 (patch) | |
tree | 31acbd7d321a0a8303fee0d6b6b65f05100439df /st.h | |
parent | 0ddcd0455171f2c52ae68d92bbddecb834350522 (diff) | |
download | st-patched-49af5d59d8bed15678c634d11e86364c8801dc82.tar.bz2 st-patched-49af5d59d8bed15678c634d11e86364c8801dc82.tar.xz st-patched-49af5d59d8bed15678c634d11e86364c8801dc82.zip |
Apply st-ligatures-boxdraw-20200430-0.8.3
Diffstat (limited to 'st.h')
-rw-r--r-- | st.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -11,7 +11,8 @@ | |||
11 | #define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) | 11 | #define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) |
12 | #define DEFAULT(a, b) (a) = (a) ? (a) : (b) | 12 | #define DEFAULT(a, b) (a) = (a) ? (a) : (b) |
13 | #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) | 13 | #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) |
14 | #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ | 14 | #define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \ |
15 | (a).fg != (b).fg || \ | ||
15 | (a).bg != (b).bg) | 16 | (a).bg != (b).bg) |
16 | #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ | 17 | #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ |
17 | (t1.tv_nsec-t2.tv_nsec)/1E6) | 18 | (t1.tv_nsec-t2.tv_nsec)/1E6) |
@@ -34,6 +35,7 @@ enum glyph_attribute { | |||
34 | ATTR_WIDE = 1 << 9, | 35 | ATTR_WIDE = 1 << 9, |
35 | ATTR_WDUMMY = 1 << 10, | 36 | ATTR_WDUMMY = 1 << 10, |
36 | ATTR_BOXDRAW = 1 << 11, | 37 | ATTR_BOXDRAW = 1 << 11, |
38 | ATTR_LIGA = 1 << 12, | ||
37 | ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, | 39 | ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, |
38 | }; | 40 | }; |
39 | 41 | ||