circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Use the internal representation for UTF-8 keys instead of wchar_t and

Browse Source 
drop some code only needed for that.
This commit is contained in:
nicm
2020-05-25 18:57:24 +00:00
parent 35779d655d
commit 6f03e49e68
9 changed files with 48 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd-parse.y
View File

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <wchar.h>
#include "tmux.h"
@ -1251,10 +1252,9 @@ error:
static int
yylex_token_escape(char **buf, size_t *len)
{
int ch, type, o2, o3;
u_int size, i, tmp;
char s[9];
struct utf8_data ud;
int ch, type, o2, o3, mlen;
u_int size, i, tmp;
char s[9], m[MB_LEN_MAX];
ch = yylex_getc();
@ -1339,11 +1339,12 @@ unicode:
yyerror("invalid \\%c argument", type);
return (0);
}
if (utf8_split(tmp, &ud) != UTF8_DONE) {
mlen = wctomb(m, tmp);
if (mlen <= 0 || mlen > (int)sizeof m) {
yyerror("invalid \\%c argument", type);
return (0);
}
yylex_append(buf, len, ud.data, ud.size);
yylex_append(buf, len, m, mlen);
return (1);
}