Skip to content

Convert wc back to mb when handling escape codes #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
inzanity wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Convert wc back to mb when handling escape codes #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89f2492
Convert wc back to mb when handling escape codes
inzanity Aug 8, 2019
ee001a5
Save cursor position on primary buffer with CSI priv 1049
inzanity Aug 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions vt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,11 +970,13 @@ static void interpret_csi_priv_mode(Vt *t, int param[], int pcount, bool set)
case 1047:
if (!set)
buffer_clear(&t->buffer_alternate);
if (set && param[i] == 1049)
cursor_save(t);
t->buffer = set ? &t->buffer_alternate : &t->buffer_normal;
if (!set && param[i] == 1049)
cursor_restore(t);
vt_dirty(t);
if (param[i] != 1049)
break;
/* fall through */
break;
case 1048: /* save/restore cursor */
if (set)
cursor_save(t);
Expand Down Expand Up @@ -1351,9 +1353,15 @@ static void put_wc(Vt *t, wchar_t wc)
}

if (t->escaped) {
if (t->elen + 1 < sizeof(t->ebuf)) {
t->ebuf[t->elen] = wc;
t->ebuf[++t->elen] = '\0';
char buf[MB_CUR_MAX];
size_t s = wcrtomb(buf, wc, NULL);
if (s == (size_t)-1) {
buf[0] = wc;
s = 1;
}
if (t->elen + s < sizeof(t->ebuf)) {
memcpy(t->ebuf + t->elen, buf, s);
t->ebuf[t->elen += s] = '\0';
try_interpret_escape_seq(t);
} else {
cancel_escape_sequence(t);
Expand Down