summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-03 23:30:24 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-03 23:30:24 +0100
commit3996611c1bb70af23bfe33809900fe5ee6fa0a3f (patch)
tree89a6089751647aa37e9ab18d907d8b31c078e1ab
parent3269cf2f93103ab8cffc30c7c36437f401b6f69e (diff)
downloadmicropython-3996611c1bb70af23bfe33809900fe5ee6fa0a3f.tar.gz
micropython-3996611c1bb70af23bfe33809900fe5ee6fa0a3f.zip
stmhal: Add home/end cursor support in readline.
Home/end work in picocom and screen (different codes in those 2 programs). Also, CTRL-A (for non-empty liny) and CTRL-E act as home/end.
-rw-r--r--stmhal/readline.c93
-rw-r--r--stmhal/usb.h1
2 files changed, 59 insertions, 35 deletions
diff --git a/stmhal/readline.c b/stmhal/readline.c
index 7df347f03c..09294789cd 100644
--- a/stmhal/readline.c
+++ b/stmhal/readline.c
@@ -31,6 +31,7 @@ int readline(vstr_t *line, const char *prompt) {
stdout_tx_str(prompt);
int orig_line_len = line->len;
int escape_seq = 0;
+ char escape_seq_buf[1] = {0};
int hist_cur = -1;
int cursor_pos = orig_line_len;
for (;;) {
@@ -43,6 +44,12 @@ int readline(vstr_t *line, const char *prompt) {
if (VCP_CHAR_CTRL_A <= c && c <= VCP_CHAR_CTRL_D && vstr_len(line) == orig_line_len) {
// control character with empty line
return c;
+ } else if (c == VCP_CHAR_CTRL_A) {
+ // CTRL-A with non-empty line is go-to-start-of-line
+ redraw_step_back = cursor_pos - orig_line_len;
+ } else if (c == VCP_CHAR_CTRL_E) {
+ // CTRL-E is go-to-end-of-line
+ redraw_step_forward = line->len - cursor_pos;
} else if (c == '\r') {
// newline
stdout_tx_str("\r\n");
@@ -80,44 +87,60 @@ int readline(vstr_t *line, const char *prompt) {
escape_seq = 0;
}
} else if (escape_seq == 2) {
- escape_seq = 0;
- if (c == 'A') {
- // up arrow
- if (hist_cur + 1 < READLINE_HIST_SIZE && readline_hist[hist_cur + 1] != NULL) {
- // increase hist num
- hist_cur += 1;
- // set line to history
- line->len = orig_line_len;
- vstr_add_str(line, readline_hist[hist_cur]);
- // set redraw parameters
- redraw_step_back = cursor_pos - orig_line_len;
- redraw_from_cursor = true;
- redraw_step_forward = line->len - orig_line_len;
- }
- } else if (c == 'B') {
- // down arrow
- if (hist_cur >= 0) {
- // decrease hist num
- hist_cur -= 1;
- // set line to history
- vstr_cut_tail_bytes(line, line->len - orig_line_len);
- if (hist_cur >= 0) {
+ if ('0' <= c && c <= '9') {
+ escape_seq = 3;
+ escape_seq_buf[0] = c;
+ } else {
+ escape_seq = 0;
+ if (c == 'A') {
+ // up arrow
+ if (hist_cur + 1 < READLINE_HIST_SIZE && readline_hist[hist_cur + 1] != NULL) {
+ // increase hist num
+ hist_cur += 1;
+ // set line to history
+ line->len = orig_line_len;
vstr_add_str(line, readline_hist[hist_cur]);
+ // set redraw parameters
+ redraw_step_back = cursor_pos - orig_line_len;
+ redraw_from_cursor = true;
+ redraw_step_forward = line->len - orig_line_len;
+ }
+ } else if (c == 'B') {
+ // down arrow
+ if (hist_cur >= 0) {
+ // decrease hist num
+ hist_cur -= 1;
+ // set line to history
+ vstr_cut_tail_bytes(line, line->len - orig_line_len);
+ if (hist_cur >= 0) {
+ vstr_add_str(line, readline_hist[hist_cur]);
+ }
+ // set redraw parameters
+ redraw_step_back = cursor_pos - orig_line_len;
+ redraw_from_cursor = true;
+ redraw_step_forward = line->len - orig_line_len;
+ }
+ } else if (c == 'C') {
+ // right arrow
+ if (cursor_pos < line->len) {
+ redraw_step_forward = 1;
+ }
+ } else if (c == 'D') {
+ // left arrow
+ if (cursor_pos > orig_line_len) {
+ redraw_step_back = 1;
}
- // set redraw parameters
- redraw_step_back = cursor_pos - orig_line_len;
- redraw_from_cursor = true;
- redraw_step_forward = line->len - orig_line_len;
- }
- } else if (c == 'C') {
- // right arrow
- if (cursor_pos < line->len) {
- redraw_step_forward = 1;
}
- } else if (c == 'D') {
- // left arrow
- if (cursor_pos > orig_line_len) {
- redraw_step_back = 1;
+ }
+ } else if (escape_seq == 3) {
+ escape_seq = 0;
+ if (c == '~') {
+ if (escape_seq_buf[0] == '1' || escape_seq_buf[0] == '7') {
+ // home key
+ redraw_step_back = cursor_pos - orig_line_len;
+ } else if (escape_seq_buf[0] == '4' || escape_seq_buf[0] == '8') {
+ // end key
+ redraw_step_forward = line->len - cursor_pos;
}
}
} else {
diff --git a/stmhal/usb.h b/stmhal/usb.h
index 014b51eefa..a235c47655 100644
--- a/stmhal/usb.h
+++ b/stmhal/usb.h
@@ -3,6 +3,7 @@
#define VCP_CHAR_CTRL_B (2)
#define VCP_CHAR_CTRL_C (3)
#define VCP_CHAR_CTRL_D (4)
+#define VCP_CHAR_CTRL_E (5)
typedef enum {
USB_DEVICE_MODE_CDC_MSC,