diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-14 12:01:09 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-14 12:01:09 +0000 |
| commit | f12d7f0d4b4a474acbdec0023156a6a647aa7763 (patch) | |
| tree | 3b82cd796b067638932a9f2432b8a64ecf55f7f7 /tmux.h | |
| parent | 7b4b78b41943082663ba75c7dcfb4e2efa86f4c7 (diff) | |
| parent | 205d15e82d9e4aa90c7980b509d3489ad8eb6c2a (diff) | |
| download | rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.tar.gz rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.tar.bz2 rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -629,6 +629,11 @@ struct utf8_data { u_char width; /* 0xff if invalid */ } __packed; +enum utf8_state { + UTF8_MORE, + UTF8_DONE, + UTF8_ERROR +}; /* Grid attributes. */ #define GRID_ATTR_BRIGHT 0x1 @@ -2194,10 +2199,10 @@ void session_renumber_windows(struct session *); u_int utf8_width(u_int); void utf8_set(struct utf8_data *, u_char); void utf8_copy(struct utf8_data *, const struct utf8_data *); -int utf8_open(struct utf8_data *, u_char); -int utf8_append(struct utf8_data *, u_char); +enum utf8_state utf8_open(struct utf8_data *, u_char); +enum utf8_state utf8_append(struct utf8_data *, u_char); u_int utf8_combine(const struct utf8_data *); -int utf8_split(u_int, struct utf8_data *); +enum utf8_state utf8_split(u_int, struct utf8_data *); u_int utf8_split2(u_int, u_char *); int utf8_strvis(char *, const char *, size_t, int); char *utf8_sanitize(const char *); |