Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements to rline

Browse Source
This commit is contained in:
Kevin Lange 2016-12-21 19:39:42 +09:00
parent c0fbb1d1d1
commit 05861daf0f
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
userspace/lib/rline.c
View File

@ -98,15 +98,18 @@ static void rline_reverse_search(rline_context_t * context) {
char input[512] = {0};
int collected = 0;
int start_at = 0;
int changed = 0;
fprintf(stderr, "\033[G\033[s");
fflush(stderr);
key_event_state_t kbd_state = {0};
char * match = "";
int match_index = 0;
while (1) {
/* Find matches */
char * match = "";
int match_index = 0;
try_rev_search_again:
if (collected) {
if (collected && changed) {
match = "";
match_index = 0;
for (int i = start_at; i < rline_history_count; i++) {
char * c = rline_history_prev(i+1);
if (strstr(c, input)) {
@ -129,14 +132,18 @@ try_rev_search_again:
}
fprintf(stderr, "\033[u(reverse-i-search)`%s': %s\033[K", input, match);
fflush(stderr);
changed = 0;
uint32_t key_sym = kbd_key(&kbd_state, fgetc(stdin));
switch (key_sym) {
case KEY_NONE:
break;
case KEY_BACKSPACE:
if (collected > 0) {
collected--;
input[collected] = '\0';
start_at = 0;
changed = 1;
}
break;
case KEY_CTRL_C:
@ -144,7 +151,12 @@ try_rev_search_again:
return;
case KEY_CTRL_R:
start_at = match_index + 1;
changed = 1;
break;
case KEY_ESCAPE:
case KEY_ARROW_LEFT:
case KEY_ARROW_RIGHT:
context->cancel = 1;
case '\n':
memcpy(context->buffer, match, strlen(match) + 1);
context->collected = strlen(match);
@ -155,7 +167,9 @@ try_rev_search_again:
}
fprintf(stderr, "\033[s");
rline_redraw_clean(context);
fprintf(stderr, "\n");
if (key_sym == '\n') {
fprintf(stderr, "\n");
}
return;
default:
if (key_sym < KEY_NORMAL_MAX) {
@ -163,6 +177,7 @@ try_rev_search_again:
collected++;
input[collected] = '\0';
start_at = 0;
changed = 1;
}
break;
}
@ -265,8 +280,13 @@ int rline(char * buffer, int buf_size, rline_callbacks_t * callbacks) {
} else {
rline_reverse_search(&context);
}
set_buffered();
return context.collected;
if (context.cancel) {
context.cancel = 0;
continue;
} else {
set_buffered();
return context.collected;
}
case KEY_ARROW_UP:
case KEY_CTRL_P:
if (callbacks->key_up) {
@ -348,6 +368,11 @@ int rline(char * buffer, int buf_size, rline_callbacks_t * callbacks) {
}
fflush(stdout);
continue;
case KEY_CTRL_K:
context.collected = context.offset;
printf("\033[K");
fflush(stdout);
continue;
case KEY_CTRL_D:
if (context.collected == 0) {
printf(rline_exit_string);