/*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014-2016 Leo C. <erbl259-lmu@yahoo.de>
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* SPDX-License-Identifier: GPL-2.0
*/
+#include "cli_readline.h"
#include "common.h"
#include <string.h>
#include <stdio.h>
#include "con-utils.h"
#include "print-utils.h"
#include "command.h"
-#include "cli_readline.h"
+char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */
+
+#define CTL_CH(c) ((c) - 'a' + 1)
+#define CTL_BACKSPACE ('\b')
+#define DEL ((char)255)
+#define DEL7 ((char)127)
+
+
/************************************************************************************************/
/* TODO:
*
static const FLASH struct fkey_tbl_s fkey_table[] = {
FKEY_TBL_ITEM(B, KEY_DOWN), // Down arrow key
-FKEY_TBL_ITEM(A, KEY_UP), // Up arrow key
+FKEY_TBL_ITEM(A, KEY_UP), // Up arrow key
FKEY_TBL_ITEM(D, KEY_LEFT), // Left arrow key
-FKEY_TBL_ITEM(C, KEY_RIGHT), // Right arrow key
+FKEY_TBL_ITEM(C, KEY_RIGHT), // Right arrow key
FKEY_TBL_ITEM(1~, KEY_HOME), // Home key
-FKEY_TBL_ITEM(3~, KEY_DC), // Delete character key
-FKEY_TBL_ITEM(2~, KEY_IC), // Ins char/toggle ins mode key
-FKEY_TBL_ITEM(6~, KEY_NPAGE), // Next-page key
-FKEY_TBL_ITEM(5~, KEY_PPAGE), // Previous-page key
+FKEY_TBL_ITEM(3~, KEY_DC), // Delete character key
+FKEY_TBL_ITEM(2~, KEY_IC), // Ins char/toggle ins mode key
+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
FKEY_TBL_ITEM(18~, KEY_F(7)), // Function key F7
FKEY_TBL_ITEM(19~, KEY_F(8)), // Function key F8
FKEY_TBL_ITEM(20~, KEY_F(9)), // Function key F9
-FKEY_TBL_ITEM(21~, KEY_F(10)), // Function key F10
-FKEY_TBL_ITEM(23~, KEY_F(11)), // Function key F11
-FKEY_TBL_ITEM(24~, KEY_F(12)), // Function key F12
+FKEY_TBL_ITEM(21~, KEY_F(10)), // Function key F10
+FKEY_TBL_ITEM(23~, KEY_F(11)), // Function key F11
+FKEY_TBL_ITEM(24~, KEY_F(12)), // Function key F12
{ NULL } /* Mark end of table */
};
typedef enum {
STATE_GROUND,
STATE_ESCAPE,
- STATE_CSI_ENTRY
+ STATE_CSI_ENTRY,
+ STATE_SS3
} vtparse_state_t;
#define CHB_SIZE 15
i_param = 0;
continue;
}
+ if (ch == 'O') {
+ state = STATE_SS3;
+ continue;
+ }
+ state = STATE_GROUND;
+ break;
+ case STATE_SS3:
+ if (ch == 'F')
+ ch = KEY_END;
+ if (ch == 'H')
+ ch = KEY_HOME;
state = STATE_GROUND;
break;
case STATE_CSI_ENTRY:
/************************************************************************************************/
-
-char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */
-
/*
* cmdline-editing related codes from vivi.
* Author: Janghoon Lyu <nandy@mizi.com>
*/
-static void putnstr(char *str, int n)
+
+struct hist_node_s {
+ struct hist_node_s *next;
+ char line[];
+};
+typedef struct hist_node_s hist_node;
+
+
+static hist_node *hist_head;
+static hist_node *hist_cur;
+
+static void hist_reset(void)
{
- /* printf_P(PSTR("%.*s"), (int)n, str) */
- while (n-- && *str)
- putchar(*str++);
+ hist_cur = hist_head;
}
+static hist_node *hist_search_node(char *line)
+{
+ hist_node *p = hist_head;
-#define CTL_CH(c) ((c) - 'a' + 1)
-#define CTL_BACKSPACE ('\b')
-#define DEL ((char)255)
-#define DEL7 ((char)127)
+ while (p && strcmp(p->line, line))
+ p = p->next;
+ return p;
+}
-#define getcmd_putch(ch) putchar(ch)
-#define getcmd_getch() vt_parse()
-#define getcmd_cbeep() getcmd_putch('\a')
+#if 0
+static hist_node *hist_insert(char *line)
+{
+ hist_node *p = (hist_node *) malloc(sizeof (hist_node) + strlen(line) + 1);
-#define HIST_MAX 20
+ if (p) {
+ strcpy(p->line, line);
+ p->next = hist_head;
+ hist_head = p;
+ }
+ return p;
+}
+#endif
-static int_fast8_t hist_max;
-static int_fast8_t hist_add_idx;
-static int_fast8_t hist_cur = -1;
+static hist_node *hist_new(char *line)
+{
+ hist_node *p = (hist_node *) malloc(sizeof (hist_node) + strlen(line) + 1);
-static char *hist_list[HIST_MAX];
+ if (p) {
+ strcpy(p->line, line);
+ p->next = NULL;
+ }
+ return p;
+}
-static void cread_add_to_hist(char *line)
+static hist_node *hist_delete(void)
{
- if (hist_max) {
- int_fast8_t last = hist_add_idx;
- if (--last < 0)
- last = hist_max;
+ hist_node *p = NULL;
+ hist_node *q = hist_head;
- if (!strcmp(line, hist_list[last]))
- return;
+ if (q) {
+ while(q->next) {
+ p = q;
+ q = q->next;
+ }
+ free(q);
+ if (p)
+ p->next = NULL;
}
+ return p;
+}
- char *p = strdup(line);
- if (p) {
- free(hist_list[hist_add_idx]);
- hist_list[hist_add_idx] = p;
+static hist_node *hist_unlink(hist_node *pos)
+{
+ hist_node *p = NULL;
+ hist_node *q = hist_head;
- if (++hist_add_idx >= HIST_MAX)
- hist_add_idx = 0;
+ while(q && q != pos) {
+ p = q;
+ q = q->next;
+ }
+ if (q) {
+ if (p)
+ p->next = q->next;
+ else
+ hist_head = q->next;
+ q->next = NULL;
+ }
+ return q;
+}
+
+static uint_fast8_t hist_count(void)
+{
+ hist_node *p = hist_head;
+ uint_fast8_t n = 0;
- if (hist_add_idx > hist_max)
- hist_max = hist_add_idx;
+ while (p) {
+ ++n;
+ p = p->next;
}
+ return n;
+}
+
+static hist_node *cread_add_to_hist(char *line)
+{
+ hist_node * p;
+
+ p = hist_search_node(line);
+ if (p)
+ hist_unlink(p);
+ else
+ p = hist_new(line);
+
+ if (p) {
+ p->next = hist_head;
+ hist_head = p;
+ }
+
+ if (hist_count() > CONFIG_SYS_HIST_MAX)
+ hist_delete();
+ return p;
}
static char *hist_prev(void)
{
- char *ret;
- int_fast8_t old_cur;
+ hist_node *p = hist_cur;
- if (hist_cur < 0)
+ if (p == NULL)
return NULL;
+ hist_cur = p->next;
- old_cur = hist_cur;
- if (--hist_cur < 0)
- hist_cur = hist_max;
+ return p->line;
+}
- if (hist_cur == hist_add_idx) {
- hist_cur = old_cur;
- ret = NULL;
- } else {
- ret = hist_list[hist_cur];
+static char *hist_next(void)
+{
+ hist_node *p = NULL;
+ hist_node *q = hist_head;
+
+ if(q == hist_cur)
+ return NULL;
+
+ while(q->next != hist_cur) {
+ p = q;
+ q = q->next;
}
+ hist_cur = q;
- return ret;
+ return p ? p->line : "";
}
-static char *hist_next(void)
+static char *hist_search_backward(char* buf, uint8_t num)
{
- char *ret;
+ hist_node *p = hist_cur;
- if (hist_cur < 0)
+ if (p == NULL)
return NULL;
- if (hist_cur == hist_add_idx)
+ while (p->next && strncmp(p->line, buf, num))
+ p = p->next;
+
+ if(!strncmp(p->line, buf, num)) {
+ hist_cur = p->next;
+ return p->line;
+ }
+ return NULL;
+}
+
+static char *hist_search_forward (char* buf, uint8_t num)
+{
+ hist_node *p = NULL;
+ hist_node *match = NULL;
+ hist_node *q = hist_head;
+
+ if(q == hist_cur)
return NULL;
- if (++hist_cur > hist_max)
- hist_cur = 0;
+ while(q->next != hist_cur) {
+ p = q;
+ q = q->next;
+ if (p && !strncmp(p->line, buf, num))
+ match = p;
+ }
- if (hist_cur == hist_add_idx)
- ret = "";
- else
- ret = hist_list[hist_cur];
+ if(match) {
+ hist_cur = match->next;
+ return match->line;
+ }
+ return NULL;
+}
- return ret;
+static void putnstr(char *str, int n)
+{
+ /* printf_P(PSTR("%.*s"), (int)n, str) */
+ while (n-- && *str)
+ putchar(*str++);
}
+static void getcmd_putch(int ch) { putchar(ch);}
+static int getcmd_getch(void) { return vt_parse();}
+static void getcmd_cbeep(void) { getcmd_putch('\a');}
-#define BEGINNING_OF_LINE() { \
- while (num) { \
- getcmd_putch(CTL_BACKSPACE); \
- num--; \
- } \
+static void beginning_of_line(uint8_t *num)
+{
+ while (*num) {
+ getcmd_putch(CTL_BACKSPACE);
+ (*num)--;
+ }
}
-#define ERASE_TO_EOL() { \
- if (num < eol_num) { \
- /* printf_P(PSTR("%*S"), (int)(eol_num - num), PSTR("")); */ \
- print_blanks(eol_num - num); \
- do { \
- getcmd_putch(CTL_BACKSPACE); \
- } while (--eol_num > num); \
- } \
+static void erase_to_eol(uint_fast8_t *num, uint_fast8_t *eol_num)
+{
+ if (*num < *eol_num) {
+ /* printf_P(PSTR("%*S"), (int)(*eol_num - *num), PSTR("")); */
+ print_blanks(*eol_num - *num);
+ do {
+ getcmd_putch(CTL_BACKSPACE);
+ } while (--(*eol_num) > *num);
+ }
}
-#define REFRESH_TO_EOL() { \
- if (num < eol_num) { \
- wlen = eol_num - num; \
- putnstr(buf + num, wlen); \
- num = eol_num; \
- } \
+static void refresh_to_eol(char *buf, uint_fast8_t *num, uint_fast8_t *eol_num)
+{
+ if (*num < *eol_num) {
+ uint_fast8_t wlen = *eol_num - *num;
+ putnstr(buf + *num, wlen);
+ *num = *eol_num;
+ }
}
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, int 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)
+static int cread_line(const FLASH char *const prompt, char *buf,
+ uint_fast8_t len, bool enable_history)
{
uint_fast8_t num = 0;
uint_fast8_t eol_num = 0;
- uint_fast8_t wlen;
- int ichar;
bool insert = 1;
- int init_len = strlen(buf);
(void) prompt;
- 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();
while (1) {
- ichar = getcmd_getch();
+ int ichar = getcmd_getch();
if ((ichar == '\n') || (ichar == '\r')) {
putchar('\n');
case KEY_HOME:
case CTL_CH('a'):
- BEGINNING_OF_LINE();
+ beginning_of_line(&num);
break;
case CTL_CH('c'): /* ^C - break */
+ putchar('\n');
*buf = '\0'; /* discard input */
return -1;
case KEY_RIGHT:
case KEY_DC:
case CTL_CH('d'): /* delete-char */
if (num < eol_num) {
- wlen = eol_num - num - 1;
+ uint_fast8_t wlen = eol_num - num - 1;
if (wlen) {
memmove(&buf[num], &buf[num+1], wlen);
putnstr(buf + num, wlen);
}
break;
case CTL_CH('k'): /* kill-line */
- ERASE_TO_EOL();
+ erase_to_eol(&num, &eol_num);
break;
case KEY_END:
case CTL_CH('e'):
- REFRESH_TO_EOL();
+ refresh_to_eol(buf, &num, &eol_num);
break;
case KEY_IC:
case CTL_CH('o'):
break;
case CTL_CH('x'):
case CTL_CH('u'): /* kill-whole-line */
- BEGINNING_OF_LINE();
- ERASE_TO_EOL();
+ beginning_of_line(&num);
+ erase_to_eol(&num, &eol_num);
break;
case DEL:
case DEL7:
case 8: /* backward-delete-char */
if (num) {
- 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;
case CTL_CH('p'): /* previous-history */
case KEY_DOWN:
case CTL_CH('n'): /* next-history */
- {
- char *hline;
-
- if (ichar == CTL_CH('p') || ichar == KEY_UP)
- hline = hist_prev();
- else
- hline = hist_next();
-
- if (!hline) {
+ if (enable_history) {
+ char *hline;
+
+ if (ichar == CTL_CH('p') || ichar == KEY_UP)
+ hline = hist_prev();
+ else
+ hline = hist_next();
+
+ if (hline) {
+ /* 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);
+
+ } else {
+ getcmd_cbeep();
+ }
+ } else {
getcmd_cbeep();
- continue;
}
-
- /* nuke the current line */
- /* first, go home */
- BEGINNING_OF_LINE();
-
- /* erase to end of line */
- ERASE_TO_EOL();
-
- /* copy new line into place and display */
- strcpy(buf, hline);
- eol_num = strlen(buf);
- REFRESH_TO_EOL();
- continue;
- }
+ break;
+ case KEY_PPAGE: /* history-search-backward */
+ 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(&num2, &eol_num);
+ /* cursor back */
+ while (num2-- > num)
+ getcmd_putch(CTL_BACKSPACE);
+ } else {
+ getcmd_cbeep();
+ }
+ } else {
+ getcmd_cbeep();
+ }
+ break;
#ifdef CONFIG_AUTO_COMPLETE
case '\t': {
int num2, col;
#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 (buf[0] /* && buf[0] != CREAD_HIST_CHAR */)
+ if (enable_history && buf[0])
cread_add_to_hist(buf);
- hist_cur = hist_add_idx;
-
- return 0;
+ return eol_num;
}
/****************************************************************************/
-static int cli_readline_into_buffer(const FLASH char *const prompt, char *buffer)
-{
- char *p = buffer;
- uint_fast8_t len = CONFIG_SYS_CBSIZE;
- int rc;
-
- if (prompt)
- my_puts_P(prompt);
-
- rc = cread_line(prompt, p, &len);
- return rc < 0 ? rc : (int) len;
-}
-
-int cli_readline(const FLASH char *const prompt)
+int cli_readline(const FLASH char *const prompt, bool enable_history)
{
/*
* If console_buffer isn't 0-length the user will be prompted to modify
*/
console_buffer[0] = '\0';
- return cli_readline_into_buffer(prompt, console_buffer);
+ if (prompt)
+ my_puts_P(prompt);
+
+ return cread_line(prompt, console_buffer, CONFIG_SYS_CBSIZE, enable_history);
}
projects / z180-stamp.git / blobdiff