circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-04 19:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2024-07-12 14:01:09 +01:00
commit d02254f754
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmux.h
View File

@ -3316,6 +3316,7 @@ void session_renumber_windows(struct session *);
/* utf8.c */ /* utf8.c */
enum utf8_state utf8_towc (const struct utf8_data *, wchar_t *); enum utf8_state utf8_towc (const struct utf8_data *, wchar_t *);
enum utf8_state utf8_fromwc(wchar_t wc, struct utf8_data *);
int utf8_in_table(wchar_t, const wchar_t *, u_int); int utf8_in_table(wchar_t, const wchar_t *, u_int);
utf8_char utf8_build_one(u_char); utf8_char utf8_build_one(u_char);
enum utf8_state utf8_from_data(const struct utf8_data *, utf8_char *); enum utf8_state utf8_from_data(const struct utf8_data *, utf8_char *);

11
tty-keys.c
View File

@ -911,6 +911,8 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
cc_t bspace; cc_t bspace;
key_code nkey; key_code nkey;
key_code onlykey; key_code onlykey;
struct utf8_data ud;
utf8_char uc;
*size = 0; *size = 0;
@ -960,6 +962,15 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
else else
nkey = number; nkey = number;
/* Convert UTF-32 codepoint into internal representation. */
if (nkey & ~0x7f) {
if (utf8_fromwc(nkey, &ud) == UTF8_DONE &&
utf8_from_data(&ud, &uc) == UTF8_DONE)
nkey = uc;
else
return (-1);
}
/* Update the modifiers. */ /* Update the modifiers. */
if (modifiers > 0) { if (modifiers > 0) {
modifiers--; modifiers--;

22
utf8.c
View File

@ -449,6 +449,28 @@ utf8_towc(const struct utf8_data *ud, wchar_t *wc)
return (UTF8_DONE); return (UTF8_DONE);
} }
/* Convert wide character to UTF-8 character. */
enum utf8_state
utf8_fromwc(wchar_t wc, struct utf8_data *ud)
{
int size, width;
size = wctomb(ud->data, wc);
if (size < 0) {
log_debug("UTF-8 %d, wctomb() %d", wc, errno);
wctomb(NULL, 0);
return (UTF8_ERROR);
}
if (size == 0)
return (UTF8_ERROR);
ud->size = ud->have = size;
if (utf8_width(ud, &width) == UTF8_DONE) {
ud->width = width;
return (UTF8_DONE);
}
return (UTF8_ERROR);
}
/* /*
* Open UTF-8 sequence. * Open UTF-8 sequence.
* *