diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-03-01 12:02:09 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-03-01 12:02:09 +0000 |
| commit | ecd3b3ce586e228059ba6a2e926cf2129c7e2f5a (patch) | |
| tree | 34b9eb0140183bb98d70a984a496dfb06ba5b3c8 /usr.bin/tmux/tmux.h | |
| parent | ebc61935f4a4be4cf5fff2e500cc34a27361eb5b (diff) | |
Use system wcwidth() instead of carrying around UTF-8 width tables.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 11670e28747..dfa1d6d921b 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.620 2016/01/31 09:57:41 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.621 2016/03/01 12:02:08 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -32,6 +32,7 @@ #include <stdint.h> #include <stdio.h> #include <termios.h> +#include <wchar.h> #include "xmalloc.h" @@ -2311,14 +2312,13 @@ void session_group_synchronize1(struct session *, struct session *); void session_renumber_windows(struct session *); /* utf8.c */ -u_int utf8_width(u_int); void utf8_set(struct utf8_data *, u_char); void utf8_copy(struct utf8_data *, const struct utf8_data *); 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 *); -enum utf8_state utf8_split(u_int, struct utf8_data *); -u_int utf8_split2(u_int, u_char *); +u_int utf8_width(wchar_t); +wchar_t utf8_combine(const struct utf8_data *); +enum utf8_state utf8_split(wchar_t, struct utf8_data *); int utf8_strvis(char *, const char *, size_t, int); char *utf8_sanitize(const char *); struct utf8_data *utf8_fromcstr(const char *); |