Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/mp-readline/readline.c: Added backward/forward/kill-word support. #5024

Closed
wants to merge 5 commits into from
Closed

lib/mp-readline/readline.c: Added backward/forward/kill-word support. #5024

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37a99fe
lib/mp-readline/readline.c: Added backward/forward/kill-word support.
derekenos Aug 20, 2019
00b2a0e
lib/mp-readline/readline.c: Consolidated prev/next word funcs. Stoppe…
derekenos Aug 22, 2019
489d48a
lib/mp-readline/readline.c: Made new features conditional on MICROPY_…
derekenos Aug 22, 2019
db7aa34
lib/mp-readline/readline.h: Added missing get_word_cursor_pos() proto…
derekenos Aug 22, 2019
a2ce440
lib/mp-readline/readline.c: Refactored get_word_cursor_pos().
derekenos Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 64 additions & 0 deletions lib/mp-readline/readline.c
View file
Open in desktop
Expand Up @@ -33,6 +33,10 @@
#include "py/mphal.h"
#include "lib/mp-readline/readline.h"

#if MICROPY_REPL_EMACS_KEYS
#include "py/unicode.h"
#endif

#if 0 // print debugging info
#define DEBUG_PRINT (1)
#define DEBUG_printf printf
Expand Down Expand Up @@ -98,6 +102,31 @@ typedef struct _readline_t {

STATIC readline_t rl;

#if MICROPY_REPL_EMACS_KEYS
STATIC int get_next_word_cursor_offset(int direction) {
int buf_idx_offset = direction == 1 ? 0 : -1;
size_t cursor_pos = rl.cursor_pos;
bool in_leading_nonalphanum = true;
while (1) {
char c = rl.line->buf[cursor_pos + buf_idx_offset];
if (unichar_isalpha(c) || unichar_isdigit(c)) {
in_leading_nonalphanum = false;
} else if (!in_leading_nonalphanum) {
break;
}
if (direction == 1) {
if (cursor_pos >= rl.line->len) {
break;
}
} else if (cursor_pos <= 0) {
break;
}
cursor_pos += direction;
}
return cursor_pos - rl.cursor_pos;
}
#endif

int readline_process_char(int c) {
size_t last_line_len = rl.line->len;
int redraw_step_back = 0;
Expand Down Expand Up @@ -218,6 +247,41 @@ int readline_process_char(int c) {
case '[':
rl.escape_seq = ESEQ_ESC_BRACKET;
break;
#if MICROPY_REPL_EMACS_KEYS
case 'b':
// backword-word (M-b)
redraw_step_back = -get_next_word_cursor_offset(-1);
rl.escape_seq = ESEQ_NONE;
break;
case 'f':
// forward-word (M-f)
redraw_step_forward = get_next_word_cursor_offset(1);
rl.escape_seq = ESEQ_NONE;
break;
case 'd': {
// kill-word (M-d)
size_t num_chars;
num_chars = get_next_word_cursor_offset(1);
if (num_chars) {
vstr_cut_out_bytes(rl.line, rl.cursor_pos, num_chars);
redraw_from_cursor = true;
}
rl.escape_seq = ESEQ_NONE;
break;
}
case 127: {
// backward-kill-word (M-DEL)
size_t num_chars;
num_chars = -get_next_word_cursor_offset(-1);
if (num_chars) {
vstr_cut_out_bytes(rl.line, rl.cursor_pos - num_chars, num_chars);
redraw_step_back = num_chars;
redraw_from_cursor = true;
}
rl.escape_seq = ESEQ_NONE;
break;
}
#endif
case 'O':
rl.escape_seq = ESEQ_ESC_O;
break;
Expand Down