aboutsummaryrefslogtreecommitdiff
path: root/terminal.h
diff options
context:
space:
mode:
Diffstat (limited to 'terminal.h')
-rw-r--r--terminal.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/terminal.h b/terminal.h
index 2292e927..395557db 100644
--- a/terminal.h
+++ b/terminal.h
@@ -77,21 +77,16 @@ struct damage {
int lines;
};
-#if FOOT_UNICODE_MAX_COMBINING_CHARS > 0
-struct combining_chars {
+struct composed {
+ wchar_t base;
+ wchar_t combining[5];
uint8_t count;
- wchar_t chars[FOOT_UNICODE_MAX_COMBINING_CHARS];
-} __attribute__((packed));
-#endif
+};
struct row {
struct cell *cells;
bool dirty;
bool linebreak;
-
-#if FOOT_UNICODE_MAX_COMBINING_CHARS > 0
- struct combining_chars *comb_chars;
-#endif
};
struct sixel {
@@ -221,6 +216,11 @@ struct terminal {
struct grid alt;
struct grid *grid;
+ #define COMB_CHARS_LO 0x40000000ul
+ #define COMB_CHARS_HI 0x400ffffful
+ size_t composed_count;
+ struct composed *composed;
+
struct fcft_font *fonts[4];
int font_dpi;
int font_adjustments;