josuealcalde/can_wizard
1
0
Fork 0
forked from test34/can_wizard
Code Pull requests Activity

Multiline: just remember last num of rows, not max.

Browse source 
orig commit 8087db3
This commit is contained in:
Данила Горнушко 2023-11-23 01:39:29 +03:00
parent 3b97afa1d8
commit f05da6c6ca
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/console/linenoise/linenoise.c
View file

@ -509,12 +509,11 @@ static void refreshMultiLine(struct linenoiseState *l, int flags) {
int rpos = (plen+l->oldpos+l->cols)/l->cols; /* cursor relative row. */ int rpos = (plen+l->oldpos+l->cols)/l->cols; /* cursor relative row. */
int rpos2; /* rpos after refresh. */ int rpos2; /* rpos after refresh. */
int col; /* colum position, zero-based. */ int col; /* colum position, zero-based. */
int old_rows = l->maxrows; int old_rows = l->oldrows;
int j; int j;
struct abuf ab; struct abuf ab;
/* Update maxrows if needed. */ l->oldrows = rows;
if (rows > (int)l->maxrows) l->maxrows = rows;
/* First step: clear all the lines used before. To do so start by /* First step: clear all the lines used before. To do so start by
* going to the last row. */ * going to the last row. */
@ -562,7 +561,7 @@ static void refreshMultiLine(struct linenoiseState *l, int flags) {
snprintf(seq,64,"\r"); snprintf(seq,64,"\r");
abAppend(&ab,seq,strlen(seq)); abAppend(&ab,seq,strlen(seq));
rows++; rows++;
if (rows > (int)l->maxrows) l->maxrows = rows; if (rows > (int)l->oldrows) l->oldrows = rows;
} }
/* Move cursor to right position. */ /* Move cursor to right position. */
@ -781,7 +780,7 @@ int linenoiseEditStart(struct linenoiseState *l, char *buf, size_t buflen, const
l->oldpos = l->pos = 0; l->oldpos = l->pos = 0;
l->len = 0; l->len = 0;
l->cols = getColumns(); l->cols = getColumns();
l->maxrows = 0; l->oldrows = 0;
l->history_index = 0; l->history_index = 0;
/* Buffer starts empty. */ /* Buffer starts empty. */

2
components/console/linenoise/linenoise.h
View file

@ -63,7 +63,7 @@ struct linenoiseState {
size_t oldpos; /* Previous refresh cursor position. */ size_t oldpos; /* Previous refresh cursor position. */
size_t len; /* Current edited line length. */ size_t len; /* Current edited line length. */
size_t cols; /* Number of columns in terminal. */ size_t cols; /* Number of columns in terminal. */
size_t maxrows; /* Maximum num of rows used so far (multiline mode) */ size_t oldrows; /* Rows used by last refrehsed line (multiline mode) */
int history_index; /* The history index we are currently editing. */ int history_index; /* The history index we are currently editing. */
}; };