diff options
Diffstat (limited to 'src/libsystemd-terminal')
| -rw-r--r-- | src/libsystemd-terminal/subterm.c | 5 | ||||
| -rw-r--r-- | src/libsystemd-terminal/term-parser.c | 43 | ||||
| -rw-r--r-- | src/libsystemd-terminal/term-screen.c | 3 | ||||
| -rw-r--r-- | src/libsystemd-terminal/term.h | 1 | ||||
| -rw-r--r-- | src/libsystemd-terminal/test-term-parser.c | 3 |
5 files changed, 7 insertions, 48 deletions
diff --git a/src/libsystemd-terminal/subterm.c b/src/libsystemd-terminal/subterm.c index 78efc9d7c0..7c119ac58a 100644 --- a/src/libsystemd-terminal/subterm.c +++ b/src/libsystemd-terminal/subterm.c @@ -41,6 +41,7 @@ #include "sd-event.h" #include "term-internal.h" #include "util.h" +#include "utf8.h" typedef struct Output Output; typedef struct Terminal Terminal; @@ -459,7 +460,7 @@ static int output_draw_cell_fn(term_screen *screen, output_printf(o, " "); } else { for (k = 0; k < n_ch; ++k) { - ulen = term_utf8_encode(utf8, ch[k]); + ulen = utf8_encode_unichar(utf8, ch[k]); output_write(o, utf8, ulen); } } @@ -625,7 +626,7 @@ static int terminal_push_tmp(Terminal *t, uint32_t ucs4) { assert(t); - len = term_utf8_encode(buf, ucs4); + len = utf8_encode_unichar(buf, ucs4); if (len < 1) return 0; diff --git a/src/libsystemd-terminal/term-parser.c b/src/libsystemd-terminal/term-parser.c index d8206a46ba..8dc1da2f9c 100644 --- a/src/libsystemd-terminal/term-parser.c +++ b/src/libsystemd-terminal/term-parser.c @@ -152,49 +152,6 @@ void term_attr_to_argb32(const term_attr *attr, uint32_t *fg, uint32_t *bg, cons } /** - * term_utf8_encode() - Encode single UCS-4 character as UTF-8 - * @out_utf8: output buffer of at least 4 bytes or NULL - * @g: UCS-4 character to encode - * - * This encodes a single UCS-4 character as UTF-8 and writes it into @out_utf8. - * The length of the character is returned. It is not zero-terminated! If the - * output buffer is NULL, only the length is returned. - * - * Returns: The length in bytes that the UTF-8 representation does or would - * occupy. - */ -size_t term_utf8_encode(char *out_utf8, uint32_t g) { - if (g < (1 << 7)) { - if (out_utf8) - out_utf8[0] = g & 0x7f; - return 1; - } else if (g < (1 << 11)) { - if (out_utf8) { - out_utf8[0] = 0xc0 | ((g >> 6) & 0x1f); - out_utf8[1] = 0x80 | (g & 0x3f); - } - return 2; - } else if (g < (1 << 16)) { - if (out_utf8) { - out_utf8[0] = 0xe0 | ((g >> 12) & 0x0f); - out_utf8[1] = 0x80 | ((g >> 6) & 0x3f); - out_utf8[2] = 0x80 | (g & 0x3f); - } - return 3; - } else if (g < (1 << 21)) { - if (out_utf8) { - out_utf8[0] = 0xf0 | ((g >> 18) & 0x07); - out_utf8[1] = 0x80 | ((g >> 12) & 0x3f); - out_utf8[2] = 0x80 | ((g >> 6) & 0x3f); - out_utf8[3] = 0x80 | (g & 0x3f); - } - return 4; - } else { - return 0; - } -} - -/** * term_utf8_decode() - Try decoding the next UCS-4 character * @p: decoder object to operate on or NULL * @out_len: output storage for pointer to decoded UCS-4 string or NULL diff --git a/src/libsystemd-terminal/term-screen.c b/src/libsystemd-terminal/term-screen.c index f021ffee23..0e38ff41c6 100644 --- a/src/libsystemd-terminal/term-screen.c +++ b/src/libsystemd-terminal/term-screen.c @@ -51,6 +51,7 @@ #include "macro.h" #include "term-internal.h" #include "util.h" +#include "utf8.h" int term_screen_new(term_screen **out, term_screen_write_fn write_fn, void *write_fn_data, term_screen_cmd_fn cmd_fn, void *cmd_fn_data) { _cleanup_(term_screen_unrefp) term_screen *screen = NULL; @@ -4107,7 +4108,7 @@ static char *screen_map_key(term_screen *screen, /* map unicode keys */ for (i = 0; i < n_syms; ++i) - p += term_utf8_encode(p, ucs4[i]); + p += utf8_encode_unichar(p, ucs4[i]); return p; } diff --git a/src/libsystemd-terminal/term.h b/src/libsystemd-terminal/term.h index eae6c6352f..1a78a81184 100644 --- a/src/libsystemd-terminal/term.h +++ b/src/libsystemd-terminal/term.h @@ -112,7 +112,6 @@ struct term_utf8 { unsigned int valid : 1; }; -size_t term_utf8_encode(char *out_utf8, uint32_t g); size_t term_utf8_decode(term_utf8 *p, uint32_t **out_buf, char c); /* diff --git a/src/libsystemd-terminal/test-term-parser.c b/src/libsystemd-terminal/test-term-parser.c index e8d5dcfbf2..e22614d06d 100644 --- a/src/libsystemd-terminal/test-term-parser.c +++ b/src/libsystemd-terminal/test-term-parser.c @@ -30,6 +30,7 @@ #include "macro.h" #include "term-internal.h" #include "util.h" +#include "utf8.h" static void test_term_utf8_invalid(void) { term_utf8 p = { }; @@ -74,7 +75,7 @@ static void test_term_utf8_range(void) { /* Convert all ucs-4 chars to utf-8 and back */ for (i = 0; i < 0x10FFFF; ++i) { - ulen = term_utf8_encode(u8, i); + ulen = utf8_encode_unichar(u8, i); if (!ulen) continue; |