Commit 38d34303 authored by Damien George's avatar Damien George
Browse files

stmhal: Add more escape seqs; add debugging output for escape seq.

parent 80c59c06
#include <stdio.h>
#include <string.h> #include <string.h>
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
...@@ -11,11 +12,18 @@ ...@@ -11,11 +12,18 @@
#include "readline.h" #include "readline.h"
#include "usb.h" #include "usb.h"
#if 0 // print debugging info
#define DEBUG_PRINT (1)
#define DEBUG_printf printf
#else // don't print debugging info
#define DEBUG_printf(...) (void)0
#endif
#define READLINE_HIST_SIZE (8) #define READLINE_HIST_SIZE (8)
static const char *readline_hist[READLINE_HIST_SIZE] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static const char *readline_hist[READLINE_HIST_SIZE] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
enum { ESC_PLAIN = 1, ESC_BRACKET, ESC_BRACKET_DIGIT, ESC_O }; enum { ESEQ_NONE, ESEQ_ESC, ESEQ_ESC_BRACKET, ESEQ_ESC_BRACKET_DIGIT, ESEQ_ESC_O };
void readline_init(void) { void readline_init(void) {
memset(readline_hist, 0, READLINE_HIST_SIZE * sizeof(const char*)); memset(readline_hist, 0, READLINE_HIST_SIZE * sizeof(const char*));
...@@ -32,7 +40,7 @@ STATIC char *str_dup(const char *str) { ...@@ -32,7 +40,7 @@ STATIC char *str_dup(const char *str) {
int readline(vstr_t *line, const char *prompt) { int readline(vstr_t *line, const char *prompt) {
stdout_tx_str(prompt); stdout_tx_str(prompt);
int orig_line_len = line->len; int orig_line_len = line->len;
int escape_seq = 0; int escape_seq = ESEQ_NONE;
char escape_seq_buf[1] = {0}; char escape_seq_buf[1] = {0};
int hist_cur = -1; int hist_cur = -1;
int cursor_pos = orig_line_len; int cursor_pos = orig_line_len;
...@@ -42,16 +50,16 @@ int readline(vstr_t *line, const char *prompt) { ...@@ -42,16 +50,16 @@ int readline(vstr_t *line, const char *prompt) {
int redraw_step_back = 0; int redraw_step_back = 0;
bool redraw_from_cursor = false; bool redraw_from_cursor = false;
int redraw_step_forward = 0; int redraw_step_forward = 0;
if (escape_seq == 0) { if (escape_seq == ESEQ_NONE) {
if (VCP_CHAR_CTRL_A <= c && c <= VCP_CHAR_CTRL_D && vstr_len(line) == orig_line_len) { if (VCP_CHAR_CTRL_A <= c && c <= VCP_CHAR_CTRL_D && vstr_len(line) == orig_line_len) {
// control character with empty line // control character with empty line
return c; return c;
} else if (c == VCP_CHAR_CTRL_A) { } else if (c == VCP_CHAR_CTRL_A) {
// CTRL-A with non-empty line is go-to-start-of-line // CTRL-A with non-empty line is go-to-start-of-line
redraw_step_back = cursor_pos - orig_line_len; goto home_key;
} else if (c == VCP_CHAR_CTRL_E) { } else if (c == VCP_CHAR_CTRL_E) {
// CTRL-E is go-to-end-of-line // CTRL-E is go-to-end-of-line
redraw_step_forward = line->len - cursor_pos; goto end_key;
} else if (c == '\r') { } else if (c == '\r') {
// newline // newline
stdout_tx_str("\r\n"); stdout_tx_str("\r\n");
...@@ -66,7 +74,7 @@ int readline(vstr_t *line, const char *prompt) { ...@@ -66,7 +74,7 @@ int readline(vstr_t *line, const char *prompt) {
return 0; return 0;
} else if (c == 27) { } else if (c == 27) {
// escape sequence // escape sequence
escape_seq = ESC_PLAIN; escape_seq = ESEQ_ESC;
} else if (c == 8 || c == 127) { } else if (c == 8 || c == 127) {
// backspace/delete // backspace/delete
if (cursor_pos > orig_line_len) { if (cursor_pos > orig_line_len) {
...@@ -82,23 +90,24 @@ int readline(vstr_t *line, const char *prompt) { ...@@ -82,23 +90,24 @@ int readline(vstr_t *line, const char *prompt) {
redraw_from_cursor = true; redraw_from_cursor = true;
redraw_step_forward = 1; redraw_step_forward = 1;
} }
} else if (escape_seq == ESC_PLAIN) { } else if (escape_seq == ESEQ_ESC) {
switch (c) { switch (c) {
case '[': case '[':
escape_seq = ESC_BRACKET; escape_seq = ESEQ_ESC_BRACKET;
break; break;
case 'O': case 'O':
escape_seq = ESC_O; escape_seq = ESEQ_ESC_O;
break; break;
default: default:
escape_seq = 0; DEBUG_printf("(ESC %d)", c);
escape_seq = ESEQ_NONE;
} }
} else if (escape_seq == ESC_BRACKET) { } else if (escape_seq == ESEQ_ESC_BRACKET) {
if ('0' <= c && c <= '9') { if ('0' <= c && c <= '9') {
escape_seq = ESC_BRACKET_DIGIT; escape_seq = ESEQ_ESC_BRACKET_DIGIT;
escape_seq_buf[0] = c; escape_seq_buf[0] = c;
} else { } else {
escape_seq = 0; escape_seq = ESEQ_NONE;
if (c == 'A') { if (c == 'A') {
// up arrow // up arrow
if (hist_cur + 1 < READLINE_HIST_SIZE && readline_hist[hist_cur + 1] != NULL) { if (hist_cur + 1 < READLINE_HIST_SIZE && readline_hist[hist_cur + 1] != NULL) {
...@@ -137,9 +146,17 @@ int readline(vstr_t *line, const char *prompt) { ...@@ -137,9 +146,17 @@ int readline(vstr_t *line, const char *prompt) {
if (cursor_pos > orig_line_len) { if (cursor_pos > orig_line_len) {
redraw_step_back = 1; redraw_step_back = 1;
} }
} else if (c == 'H') {
// home
goto home_key;
} else if (c == 'F') {
// end
goto end_key;
} else {
DEBUG_printf("(ESC [ %d)", c);
} }
} }
} else if (escape_seq == ESC_BRACKET_DIGIT) { } else if (escape_seq == ESEQ_ESC_BRACKET_DIGIT) {
if (c == '~') { if (c == '~') {
if (escape_seq_buf[0] == '1' || escape_seq_buf[0] == '7') { if (escape_seq_buf[0] == '1' || escape_seq_buf[0] == '7') {
home_key: home_key:
...@@ -147,20 +164,25 @@ home_key: ...@@ -147,20 +164,25 @@ home_key:
} else if (escape_seq_buf[0] == '4' || escape_seq_buf[0] == '8') { } else if (escape_seq_buf[0] == '4' || escape_seq_buf[0] == '8') {
end_key: end_key:
redraw_step_forward = line->len - cursor_pos; redraw_step_forward = line->len - cursor_pos;
} else {
DEBUG_printf("(ESC [ %c %d)", escape_seq_buf[0], c);
} }
} else {
DEBUG_printf("(ESC [ %c %d)", escape_seq_buf[0], c);
} }
escape_seq = 0; escape_seq = ESEQ_NONE;
} else if (escape_seq == ESC_O) { } else if (escape_seq == ESEQ_ESC_O) {
switch (c) { switch (c) {
case 'H': case 'H':
goto home_key; goto home_key;
case 'F': case 'F':
goto end_key; goto end_key;
default: default:
escape_seq = 0; DEBUG_printf("(ESC O %d)", c);
escape_seq = ESEQ_NONE;
} }
} else { } else {
escape_seq = 0; escape_seq = ESEQ_NONE;
} }
// redraw command prompt, efficiently // redraw command prompt, efficiently
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment