X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/e347ae0762d0179f0fb8354f85351e7ddac97b95..7af9364ebd7ad6c143f31e9abe745c6d75f8322b:/avr/cli_readline.c diff --git a/avr/cli_readline.c b/avr/cli_readline.c index 045d16e..2fdc56e 100644 --- a/avr/cli_readline.c +++ b/avr/cli_readline.c @@ -85,13 +85,16 @@ FKEY_TBL_ITEM(6~, KEY_NPAGE), // Next-page key FKEY_TBL_ITEM(5~, KEY_PPAGE), // Previous-page key FKEY_TBL_ITEM(4~, KEY_END), // End key FKEY_TBL_ITEM(Z, KEY_BTAB), // Back tab key +/* */ +FKEY_TBL_ITEM(H, KEY_HOME), // Home key +FKEY_TBL_ITEM(F, KEY_END), // End key /* VT400: */ FKEY_TBL_ITEM(11~, KEY_F(1)), // Function key F1 FKEY_TBL_ITEM(12~, KEY_F(2)), // Function key F2 FKEY_TBL_ITEM(13~, KEY_F(3)), // Function key F3 FKEY_TBL_ITEM(14~, KEY_F(4)), // Function key F4 FKEY_TBL_ITEM(15~, KEY_F(5)), // Function key F5 -/* Linux consoe */ +/* Linux console */ FKEY_TBL_ITEM([A, KEY_F(1)), // Function key F1 FKEY_TBL_ITEM([B, KEY_F(2)), // Function key F2 FKEY_TBL_ITEM([C, KEY_F(3)), // Function key F3 @@ -161,8 +164,10 @@ int vt_parse (void) state = STATE_GROUND; break; case STATE_SS3: - if (ch == 'F') /* weird */ + if (ch == 'F') ch = KEY_END; + if (ch == 'H') + ch = KEY_HOME; state = STATE_GROUND; break; case STATE_CSI_ENTRY: @@ -462,25 +467,23 @@ static void cread_add_char(char ichar, bool insert, uint_fast8_t *num, getcmd_putch(CTL_BACKSPACE); } else { /* echo the character */ - wlen = 1; buf[*num] = ichar; - putnstr(buf + *num, wlen); + putnstr(buf + *num, 1); (*num)++; } } -static void cread_add_str(char *str, uint_fast8_t strsize, bool insert, - uint_fast8_t *num, uint_fast8_t *eol_num, - char *buf, uint_fast8_t len) +static void cread_add_str(char *str, bool insert, uint_fast8_t *num, + uint_fast8_t *eol_num, char *buf, uint_fast8_t len) { - while (strsize--) { - cread_add_char(*str, insert, num, eol_num, buf, len); - str++; - } + char c; + + while ((c = *str++) != '\0') + cread_add_char(c, insert, num, eol_num, buf, len); } static int cread_line(const FLASH char *const prompt, char *buf, - uint_fast8_t *len, bool enable_history) + uint_fast8_t len, bool enable_history) { uint_fast8_t num = 0; uint_fast8_t eol_num = 0; @@ -488,9 +491,8 @@ static int cread_line(const FLASH char *const prompt, char *buf, (void) prompt; - uint_fast8_t init_len = strlen(buf); - if (init_len) - cread_add_str(buf, init_len, 1, &num, &eol_num, buf, *len); + if (buf[0]) + cread_add_str(buf, 1, &num, &eol_num, buf, len); hist_reset(); @@ -510,6 +512,7 @@ static int cread_line(const FLASH char *const prompt, char *buf, beginning_of_line(&num); break; case CTL_CH('c'): /* ^C - break */ + putchar('\n'); *buf = '\0'; /* discard input */ return -1; case KEY_RIGHT: @@ -562,15 +565,14 @@ static int cread_line(const FLASH char *const prompt, char *buf, case DEL7: case 8: /* backward-delete-char */ if (num) { - uint_fast8_t wlen = eol_num - num; - num--; + uint_fast8_t wlen = eol_num - --num; + buf[eol_num] = ' '; memmove(&buf[num], &buf[num+1], wlen); getcmd_putch(CTL_BACKSPACE); putnstr(buf + num, wlen); - getcmd_putch(' '); do { getcmd_putch(CTL_BACKSPACE); - } while (wlen--); + } while (--wlen); eol_num--; } break; @@ -587,17 +589,13 @@ static int cread_line(const FLASH char *const prompt, char *buf, hline = hist_next(); if (hline) { - /* nuke the current line */ /* first, go home */ beginning_of_line(&num); - + /* overwrite current line */ + cread_add_str(hline, 0, &num, &eol_num, buf, len); /* erase to end of line */ erase_to_eol(&num, &eol_num); - /* copy new line into place and display */ - strcpy(buf, hline); - eol_num = strlen(buf); - refresh_to_eol(buf, &num, &eol_num); } else { getcmd_cbeep(); } @@ -609,25 +607,20 @@ static int cread_line(const FLASH char *const prompt, char *buf, case KEY_NPAGE: /* history-search-forward */ if (enable_history) { char *hline; - if (ichar == KEY_PPAGE) hline = hist_search_backward(buf, num); else hline = hist_search_forward(buf, num); if (hline) { + uint_fast8_t num2 = num; + /* overwrite current line from cursor position */ + cread_add_str(hline+num, 0, &num2, &eol_num, buf, len); /* erase to end of line */ - erase_to_eol(&num, &eol_num); - - /* copy new line into place and display */ - strcpy(buf+num, hline+num); - eol_num = strlen(buf); - uint8_t wlen = eol_num - num; - putnstr(buf + num, wlen); - getcmd_putch(' '); - do { + erase_to_eol(&num2, &eol_num); + /* cursor back */ + while (num2-- > num) getcmd_putch(CTL_BACKSPACE); - } while (wlen--); } else { getcmd_cbeep(); } @@ -658,35 +651,21 @@ static int cread_line(const FLASH char *const prompt, char *buf, #endif default: if (isprint(ichar)) - cread_add_char(ichar, insert, &num, &eol_num, buf, - *len); + cread_add_char(ichar, insert, &num, &eol_num, buf, len); break; } } - *len = eol_num; + while (eol_num && buf[eol_num-1] == ' ') + --eol_num; /* remove trailing blanks */ buf[eol_num] = '\0'; /* lose the newline */ if (enable_history && buf[0]) cread_add_to_hist(buf); - return 0; + return eol_num; } /****************************************************************************/ -static int cli_readline_into_buffer(const FLASH char *const prompt, - char *buffer, bool enable_history) -{ - char *p = buffer; - uint_fast8_t len = CONFIG_SYS_CBSIZE; - int rc; - - if (prompt) - my_puts_P(prompt); - - rc = cread_line(prompt, p, &len, enable_history); - return rc < 0 ? rc : (int) len; -} - int cli_readline(const FLASH char *const prompt, bool enable_history) { /* @@ -695,5 +674,8 @@ int cli_readline(const FLASH char *const prompt, bool enable_history) */ console_buffer[0] = '\0'; - return cli_readline_into_buffer(prompt, console_buffer, enable_history); + if (prompt) + my_puts_P(prompt); + + return cread_line(prompt, console_buffer, CONFIG_SYS_CBSIZE, enable_history); }