djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try too make new utf-8 code smaller again

Browse Source
This commit is contained in:
George Waters 2020-08-03 15:09:54 -04:00
parent 41ccbbd4e9
commit 93829e57b2
No known key found for this signature in database
GPG Key ID: D993F8B1CC21DB25
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/mp-readline/readline.c
View File

@ -222,32 +222,26 @@ int readline_process_char(int c) {
redraw_step_forward = compl_len; redraw_step_forward = compl_len;
} }
#endif #endif
} else if (32 <= c && c <= 126) { } else if (32 <= c) {
// printable character // printable character
vstr_ins_char(rl.line, rl.cursor_pos, c); char lcp = rl.line->buf[rl.cursor_pos];
// set redraw parameters uint8_t cont_need = 0;
redraw_from_cursor = true; if (!UTF8_IS_CONT(c)) {
redraw_step_forward = 1; // ASCII or Lead code point
}else if (c >= 128) {
// utf-8 character
if (c >= 0xc0 && c < 0xf8) {
// Lead code point
vstr_ins_char(rl.line, rl.cursor_pos, c);
rl.utf8_cont_chars = 0; rl.utf8_cont_chars = 0;
}else if (UTF8_IS_CONT(c)) { lcp = c;
char lcp = rl.line->buf[rl.cursor_pos]; }else {
// Check for valid lead code point rl.utf8_cont_chars += 1;
if (lcp >= 0xc0 && lcp < 0xf8) { }
rl.utf8_cont_chars += 1; if (lcp >= 0xc0 && lcp < 0xf8) {
vstr_ins_char(rl.line, rl.cursor_pos+rl.utf8_cont_chars, c); cont_need = (0xe5 >> ((lcp >> 3) & 0x6)) & 3; // From unicode.c L195
// set redraw parameters if we have the entire character }
uint8_t need = (0xe5 >> ((lcp >> 3) & 0x6)) & 3; // From unicode.c L195 vstr_ins_char(rl.line, rl.cursor_pos+rl.utf8_cont_chars, c);
if (rl.utf8_cont_chars == need) { // set redraw parameters if we have the entire character
redraw_from_cursor = true; if (rl.utf8_cont_chars == cont_need) {
redraw_step_forward = rl.utf8_cont_chars+1; redraw_from_cursor = true;
cont_chars = rl.utf8_cont_chars; redraw_step_forward = rl.utf8_cont_chars+1;
} cont_chars = rl.utf8_cont_chars;
}
} }
} }
} else if (rl.escape_seq == ESEQ_ESC) { } else if (rl.escape_seq == ESEQ_ESC) {
@ -274,7 +268,7 @@ up_arrow_key:
#endif #endif
// up arrow // up arrow
if (rl.hist_cur + 1 < (int)READLINE_HIST_SIZE && MP_STATE_PORT(readline_hist)[rl.hist_cur + 1] != NULL) { if (rl.hist_cur + 1 < (int)READLINE_HIST_SIZE && MP_STATE_PORT(readline_hist)[rl.hist_cur + 1] != NULL) {
// Check for continuation characters through the cursor_pos // Check for continuation characters
cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos); cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos);
// increase hist num // increase hist num
rl.hist_cur += 1; rl.hist_cur += 1;
@ -292,7 +286,7 @@ down_arrow_key:
#endif #endif
// down arrow // down arrow
if (rl.hist_cur >= 0) { if (rl.hist_cur >= 0) {
// Check for continuation characters through the cursor_pos // Check for continuation characters
cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos); cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos);
// decrease hist num // decrease hist num
rl.hist_cur -= 1; rl.hist_cur -= 1;
@ -390,7 +384,7 @@ delete_key:
// erase old chars // erase old chars
mp_hal_erase_line_from_cursor(last_line_len - rl.cursor_pos); mp_hal_erase_line_from_cursor(last_line_len - rl.cursor_pos);
} }
// Check for continuation characters from the new cursor_pos to the EOL // Check for continuation characters
cont_chars = count_cont_bytes(rl.line->buf+rl.cursor_pos+redraw_step_forward, rl.line->buf+rl.line->len); cont_chars = count_cont_bytes(rl.line->buf+rl.cursor_pos+redraw_step_forward, rl.line->buf+rl.line->len);
// draw new chars // draw new chars
mp_hal_stdout_tx_strn(rl.line->buf + rl.cursor_pos, rl.line->len - rl.cursor_pos); mp_hal_stdout_tx_strn(rl.line->buf + rl.cursor_pos, rl.line->len - rl.cursor_pos);