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

[EXPERIMENT] with update linenoise-msteveb #1743

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[EXPERIMENT] with update linenoise-msteveb #1743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/extras/linenoise/linenoise-win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ static int fd_read(struct current *current)
return SPECIAL_PAGE_UP;
case VK_NEXT:
return SPECIAL_PAGE_DOWN;
case VK_RETURN:
return k->uChar.UnicodeChar;
}
}
/* Note that control characters are already translated in AsciiChar */
Expand Down Expand Up @@ -374,4 +376,4 @@ static int getWindowSize(struct current *current)
current->y = info.dwCursorPosition.Y;
current->x = info.dwCursorPosition.X;
return 0;
}
}
83 changes: 50 additions & 33 deletions src/extras/linenoise/linenoise.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ enum {

static int history_max_len = LINENOISE_DEFAULT_HISTORY_MAX_LEN;
static int history_len = 0;
static int history_index = 0;
static char **history = NULL;

/* Structure to contain the status of the current (being edited) line */
Expand Down Expand Up @@ -814,7 +815,7 @@ static linenoiseHintsCallback *hintsCallback = NULL;
static linenoiseFreeHintsCallback *freeHintsCallback = NULL;
static void *hintsUserdata = NULL;

static void beep() {
static void beep(void) {
#ifdef USE_TERMIOS
fprintf(stderr, "\x7");
fflush(stderr);
Expand Down Expand Up @@ -1485,6 +1486,26 @@ static int skip_nonspace(struct current *current, int dir)
return skip_space_nonspace(current, dir, 0);
}

static void set_history_index(struct current *current, int new_index)
{
if (history_len > 1) {
/* Update the current history entry before to
* overwrite it with the next one. */
free(history[history_len - 1 - history_index]);
history[history_len - 1 - history_index] = strdup(sb_str(current->buf));
/* Show the new entry */
history_index = new_index;
if (history_index < 0) {
history_index = 0;
} else if (history_index >= history_len) {
history_index = history_len - 1;
} else {
set_current(current, history[history_len - 1 - history_index]);
refreshLine(current);
}
}
}

/**
* Returns the keycode to process, or 0 if none.
*/
Expand Down Expand Up @@ -1521,21 +1542,33 @@ static int reverseIncrementalSearch(struct current *current)
c = check_special(current->fd);
}
#endif
if (c == ctrl('P') || c == SPECIAL_UP) {
if (c == ctrl('R')) {
/* Search for the previous (earlier) match */
if (searchpos > 0) {
searchpos--;
}
skipsame = 1;
}
else if (c == ctrl('N') || c == SPECIAL_DOWN) {
else if (c == ctrl('S')) {
/* Search for the next (later) match */
if (searchpos < history_len) {
searchpos++;
}
searchdir = 1;
skipsame = 1;
}
else if (c == ctrl('P') || c == SPECIAL_UP) {
/* Exit Ctrl-R mode and go to the previous history line from the current search pos */
set_history_index(current, history_len - searchpos);
c = 0;
break;
}
else if (c == ctrl('N') || c == SPECIAL_DOWN) {
/* Exit Ctrl-R mode and go to the next history line from the current search pos */
set_history_index(current, history_len - searchpos - 2);
c = 0;
break;
}
else if (c >= ' ' && c <= '~') {
/* >= here to allow for null terminator */
if (rlen >= (int)sizeof(rbuf) - MAX_UTF8_LEN) {
Expand Down Expand Up @@ -1565,6 +1598,7 @@ static int reverseIncrementalSearch(struct current *current)
continue;
}
/* Copy the matching line and set the cursor position */
history_index = history_len - 1 - searchpos;
set_current(current,history[searchpos]);
current->pos = utf8_strlen(history[searchpos], p - history[searchpos]);
break;
Expand All @@ -1580,25 +1614,25 @@ static int reverseIncrementalSearch(struct current *current)
if (c == ctrl('G') || c == ctrl('C')) {
/* ctrl-g terminates the search with no effect */
set_current(current, "");
history_index = 0;
c = 0;
}
else if (c == ctrl('J')) {
/* ctrl-j terminates the search leaving the buffer in place */
history_index = 0;
c = 0;
}

/* Go process the char normally */
refreshLine(current);
return c;
}

static int linenoiseEdit(struct current *current) {
int history_index = 0;
history_index = 0;

refreshLine(current);

while(1) {
int dir = -1;
int c = fd_read(current);

#ifndef NO_COMPLETION
Expand Down Expand Up @@ -1753,36 +1787,19 @@ static int linenoiseEdit(struct current *current) {
refreshLine(current);
}
break;
case SPECIAL_PAGE_UP:
dir = history_len - history_index - 1; /* move to start of history */
goto history_navigation;
case SPECIAL_PAGE_DOWN:
dir = -history_index; /* move to 0 == end of history, i.e. current */
goto history_navigation;
case SPECIAL_PAGE_UP: /* move to start of history */
set_history_index(current, history_len - 1);
break;
case SPECIAL_PAGE_DOWN: /* move to 0 == end of history, i.e. current */
set_history_index(current, 0);
break;
case ctrl('P'):
case SPECIAL_UP:
dir = 1;
goto history_navigation;
set_history_index(current, history_index + 1);
break;
case ctrl('N'):
case SPECIAL_DOWN:
history_navigation:
if (history_len > 1) {
/* Update the current history entry before to
* overwrite it with tne next one. */
free(history[history_len - 1 - history_index]);
history[history_len - 1 - history_index] = strdup(sb_str(current->buf));
/* Show the new entry */
history_index += dir;
if (history_index < 0) {
history_index = 0;
break;
} else if (history_index >= history_len) {
history_index = history_len - 1;
break;
}
set_current(current, history[history_len - 1 - history_index]);
refreshLine(current);
}
set_history_index(current, history_index - 1);
break;
case ctrl('A'): /* Ctrl+a, go to the start of the line */
case SPECIAL_HOME:
Expand Down Expand Up @@ -2069,4 +2086,4 @@ char **linenoiseHistory(int *len) {
*len = history_len;
}
return history;
}
}
2 changes: 1 addition & 1 deletion src/extras/linenoise/linenoise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ void linenoiseSetMultiLine(int enableml);
}
#endif

#endif /* __LINENOISE_H */
#endif /* __LINENOISE_H */
Loading