zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-05-06 12:31:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename and globalize internal data structures to make more similar to GNU Readline

Browse Source
This commit is contained in:
Joachim Nilsson 2010-07-20 00:18:20 +02:00
parent 009d3f0568
commit 536dcacb06
2 changed files with 128 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/editline.h
View File

@ -24,12 +24,16 @@
/* Display print 8-bit chars as `M-x' or as the actual 8-bit char? (Default:1) */ /* Display print 8-bit chars as `M-x' or as the actual 8-bit char? (Default:1) */
extern int rl_meta_chars; extern int rl_meta_chars;
/* Assign these to get command completion, see cli.c for /* Assign these to get command completion, see cli.c for example usage. */
* example usage. */ extern char *(*rl_complete) (char *token, int *match);
extern char *(*rl_complete)(char *token, int *match);
extern int (*rl_list_possib)(char *token, char ***av); extern int (*rl_list_possib)(char *token, char ***av);
/* For compatibility with FSF readline. */ /* For compatibility with FSF readline. */
extern int rl_point;
extern int rl_mark;
extern int rl_end;
extern char *rl_line_buffer;
extern const char *rl_readline_name;
extern void rl_reset_terminal(char *p); extern void rl_reset_terminal(char *p);
extern void rl_initialize(void); extern void rl_initialize(void);

240
src/editline.c
View File

@ -87,17 +87,13 @@ int rl_susp;
static const char NIL[] = ""; static const char NIL[] = "";
static const char *Input = NIL; static const char *Input = NIL;
static char *Line;
static const char *Prompt; static const char *Prompt;
static char *Yanked; static char *Yanked;
static char *Screen; static char *Screen;
static char NEWLINE[]= CRLF; static char NEWLINE[]= CRLF;
static el_hist_t H; static el_hist_t H;
static int Repeat; static int Repeat;
static int End;
static int Mark;
static int OldPoint; static int OldPoint;
static int Point;
static int PushBack; static int PushBack;
static int Pushed; static int Pushed;
static int Signal; static int Signal;
@ -110,17 +106,19 @@ static char *backspace;
static int tty_cols; static int tty_cols;
static int tty_rows; static int tty_rows;
/* Display print 8-bit chars as `M-x' or as the actual 8-bit char? */ int rl_point;
int rl_meta_chars = 1; int rl_mark;
int rl_end;
int rl_meta_chars = 1; /* Display print 8-bit chars as `M-x' or as the actual 8-bit char? */
char *rl_line_buffer;
const char *rl_readline_name;/* Set by calling program, for conditional parsing of ~/.inputrc - Not supported yet! */
/* User definable callbacks. */ /* User definable callbacks. */
char *(*rl_complete)(char *token, int *match); char **(*rl_attempted_completion_function)(const char *token, int start, int end);
char *(*rl_comlete)(char *token, int *match);
int (*rl_list_possib)(char *token, char ***av); int (*rl_list_possib)(char *token, char ***av);
/* Declarations. */
/*
** Declarations.
*/
static char *editinput(void); static char *editinput(void);
#ifdef CONFIG_USE_TERMCAP #ifdef CONFIG_USE_TERMCAP
extern char *tgetstr(const char *, char **); extern char *tgetstr(const char *, char **);
@ -303,30 +301,30 @@ static void reposition(void)
tty_put('\r'); tty_put('\r');
tty_puts(Prompt); tty_puts(Prompt);
for (i = Point, p = Line; --i >= 0; p++) for (i = rl_point, p = rl_line_buffer; --i >= 0; p++)
tty_show(*p); tty_show(*p);
} }
static void left(el_status_t Change) static void left(el_status_t Change)
{ {
tty_back(); tty_back();
if (Point) { if (rl_point) {
if (ISCTL(Line[Point - 1])) if (ISCTL(rl_line_buffer[rl_point - 1]))
tty_back(); tty_back();
else if (rl_meta_chars && ISMETA(Line[Point - 1])) { else if (rl_meta_chars && ISMETA(rl_line_buffer[rl_point - 1])) {
tty_back(); tty_back();
tty_back(); tty_back();
} }
} }
if (Change == CSmove) if (Change == CSmove)
Point--; rl_point--;
} }
static void right(el_status_t Change) static void right(el_status_t Change)
{ {
tty_show(Line[Point]); tty_show(rl_line_buffer[rl_point]);
if (Change == CSmove) if (Change == CSmove)
Point++; rl_point++;
} }
static el_status_t ring_bell(void) static el_status_t ring_bell(void)
@ -359,16 +357,16 @@ static el_status_t do_forward(el_status_t move)
i = 0; i = 0;
do { do {
p = &Line[Point]; p = &rl_line_buffer[rl_point];
for ( ; Point < End && (*p == ' ' || !isalnum(*p)); Point++, p++) for ( ; rl_point < rl_end && (*p == ' ' || !isalnum(*p)); rl_point++, p++)
if (move == CSmove) if (move == CSmove)
right(CSstay); right(CSstay);
for (; Point < End && isalnum(*p); Point++, p++) for (; rl_point < rl_end && isalnum(*p); rl_point++, p++)
if (move == CSmove) if (move == CSmove)
right(CSstay); right(CSstay);
if (Point == End) if (rl_point == rl_end)
break; break;
} while (++i < Repeat); } while (++i < Repeat);
@ -383,13 +381,13 @@ static el_status_t do_case(el_case_t type)
char *p; char *p;
do_forward(CSstay); do_forward(CSstay);
if (OldPoint != Point) { if (OldPoint != rl_point) {
if ((count = Point - OldPoint) < 0) if ((count = rl_point - OldPoint) < 0)
count = -count; count = -count;
Point = OldPoint; rl_point = OldPoint;
if ((end = Point + count) > End) if ((end = rl_point + count) > rl_end)
end = End; end = rl_end;
for (i = Point, p = &Line[i]; i < end; i++, p++) { for (i = rl_point, p = &rl_line_buffer[i]; i < end; i++, p++) {
if (type == TOupper) { if (type == TOupper) {
if (islower(*p)) if (islower(*p))
*p = toupper(*p); *p = toupper(*p);
@ -419,7 +417,7 @@ static void ceol(void)
int i; int i;
char *p; char *p;
for (extras = 0, i = Point, p = &Line[i]; i <= End; i++, p++) { for (extras = 0, i = rl_point, p = &rl_line_buffer[i]; i <= rl_end; i++, p++) {
tty_put(' '); tty_put(' ');
if (ISCTL(*p)) { if (ISCTL(*p)) {
tty_put(' '); tty_put(' ');
@ -432,18 +430,18 @@ static void ceol(void)
} }
} }
for (i += extras; i > Point; i--) for (i += extras; i > rl_point; i--)
tty_back(); tty_back();
} }
static void clear_line(void) static void clear_line(void)
{ {
Point = -strlen(Prompt); rl_point = -strlen(Prompt);
tty_put('\r'); tty_put('\r');
ceol(); ceol();
Point = 0; rl_point = 0;
End = 0; rl_end = 0;
Line[0] = '\0'; rl_line_buffer[0] = '\0';
} }
static el_status_t insert_string(const char *p) static el_status_t insert_string(const char *p)
@ -454,33 +452,33 @@ static el_status_t insert_string(const char *p)
char *q; char *q;
len = strlen((char *)p); len = strlen((char *)p);
if (End + len >= Length) { if (rl_end + len >= Length) {
if ((new = NEW(char, Length + len + MEM_INC)) == NULL) if ((new = NEW(char, Length + len + MEM_INC)) == NULL)
return CSstay; return CSstay;
if (Length) { if (Length) {
COPYFROMTO(new, Line, Length); COPYFROMTO(new, rl_line_buffer, Length);
DISPOSE(Line); DISPOSE(rl_line_buffer);
} }
Line = new; rl_line_buffer = new;
Length += len + MEM_INC; Length += len + MEM_INC;
} }
for (q = &Line[Point], i = End - Point; --i >= 0; ) for (q = &rl_line_buffer[rl_point], i = rl_end - rl_point; --i >= 0; )
q[len + i] = q[i]; q[len + i] = q[i];
COPYFROMTO(&Line[Point], p, len); COPYFROMTO(&rl_line_buffer[rl_point], p, len);
End += len; rl_end += len;
Line[End] = '\0'; rl_line_buffer[rl_end] = '\0';
tty_string(&Line[Point]); tty_string(&rl_line_buffer[rl_point]);
Point += len; rl_point += len;
return Point == End ? CSstay : CSmove; return rl_point == rl_end ? CSstay : CSmove;
} }
static el_status_t redisplay(void) static el_status_t redisplay(void)
{ {
tty_puts(NEWLINE); tty_puts(NEWLINE);
tty_puts(Prompt); tty_puts(Prompt);
tty_string(Line); tty_string(rl_line_buffer);
return CSmove; return CSmove;
} }
@ -505,10 +503,10 @@ static el_status_t do_insert_hist(const char *p)
{ {
if (p == NULL) if (p == NULL)
return ring_bell(); return ring_bell();
Point = 0; rl_point = 0;
reposition(); reposition();
ceol(); ceol();
End = 0; rl_end = 0;
return insert_string(p); return insert_string(p);
} }
@ -638,7 +636,7 @@ static el_status_t fd_char(void)
i = 0; i = 0;
do { do {
if (Point >= End) if (rl_point >= rl_end)
break; break;
right(CSmove); right(CSmove);
} while (++i < Repeat); } while (++i < Repeat);
@ -656,7 +654,7 @@ static void save_yank(int begin, int i)
return; return;
if ((Yanked = NEW(char, (SIZE_T)i + 1)) != NULL) { if ((Yanked = NEW(char, (SIZE_T)i + 1)) != NULL) {
COPYFROMTO(Yanked, &Line[begin], i); COPYFROMTO(Yanked, &rl_line_buffer[begin], i);
Yanked[i] = '\0'; Yanked[i] = '\0';
} }
} }
@ -666,13 +664,13 @@ static el_status_t delete_string(int count)
int i; int i;
char *p; char *p;
if (count <= 0 || End == Point) if (count <= 0 || rl_end == rl_point)
return ring_bell(); return ring_bell();
if (count == 1 && Point == End - 1) { if (count == 1 && rl_point == rl_end - 1) {
/* Optimize common case of delete at end of line. */ /* Optimize common case of delete at end of line. */
End--; rl_end--;
p = &Line[Point]; p = &rl_line_buffer[rl_point];
i = 1; i = 1;
tty_put(' '); tty_put(' ');
if (ISCTL(*p)) { if (ISCTL(*p)) {
@ -688,17 +686,17 @@ static el_status_t delete_string(int count)
*p = '\0'; *p = '\0';
return CSmove; return CSmove;
} }
if (Point + count > End && (count = End - Point) <= 0) if (rl_point + count > rl_end && (count = rl_end - rl_point) <= 0)
return CSstay; return CSstay;
if (count > 1) if (count > 1)
save_yank(Point, count); save_yank(rl_point, count);
for (p = &Line[Point], i = End - (Point + count) + 1; --i >= 0; p++) for (p = &rl_line_buffer[rl_point], i = rl_end - (rl_point + count) + 1; --i >= 0; p++)
p[0] = p[count]; p[0] = p[count];
ceol(); ceol();
End -= count; rl_end -= count;
tty_string(&Line[Point]); tty_string(&rl_line_buffer[rl_point]);
return CSmove; return CSmove;
} }
@ -708,7 +706,7 @@ static el_status_t bk_char(void)
i = 0; i = 0;
do { do {
if (Point == 0) if (rl_point == 0)
break; break;
left(CSmove); left(CSmove);
} while (++i < Repeat); } while (++i < Repeat);
@ -722,7 +720,7 @@ static el_status_t bk_del_char(void)
i = 0; i = 0;
do { do {
if (Point == 0) if (rl_point == 0)
break; break;
left(CSmove); left(CSmove);
} while (++i < Repeat); } while (++i < Repeat);
@ -735,23 +733,23 @@ static el_status_t kill_line(void)
int i; int i;
if (Repeat != NO_ARG) { if (Repeat != NO_ARG) {
if (Repeat < Point) { if (Repeat < rl_point) {
i = Point; i = rl_point;
Point = Repeat; rl_point = Repeat;
reposition(); reposition();
delete_string(i - Point); delete_string(i - rl_point);
} }
else if (Repeat > Point) { else if (Repeat > rl_point) {
right(CSmove); right(CSmove);
delete_string(Repeat - Point - 1); delete_string(Repeat - rl_point - 1);
} }
return CSmove; return CSmove;
} }
save_yank(Point, End - Point); save_yank(rl_point, rl_end - rl_point);
Line[Point] = '\0'; rl_line_buffer[rl_point] = '\0';
ceol(); ceol();
End = Point; rl_end = rl_point;
return CSstay; return CSstay;
} }
@ -782,8 +780,8 @@ static el_status_t insert_char(int c)
static el_status_t beg_line(void) static el_status_t beg_line(void)
{ {
if (Point) { if (rl_point) {
Point = 0; rl_point = 0;
return CSmove; return CSmove;
} }
return CSstay; return CSstay;
@ -791,8 +789,8 @@ static el_status_t beg_line(void)
static el_status_t end_line(void) static el_status_t end_line(void)
{ {
if (Point != End) { if (rl_point != rl_end) {
Point = End; rl_point = rl_end;
return CSmove; return CSmove;
} }
return CSstay; return CSstay;
@ -857,7 +855,7 @@ static el_status_t emacs(int c)
#if 0 /* Debian patch removes this to be able to handle 8-bit input */ #if 0 /* Debian patch removes this to be able to handle 8-bit input */
/* This test makes it impossible to enter eight-bit characters when /* This test makes it impossible to enter eight-bit characters when
* meta-char mode is enabled. */ * meta-char mode is enabled. */
OldPoint = Point; OldPoint = rl_point;
if (rl_meta_chars && ISMETA(c)) { if (rl_meta_chars && ISMETA(c)) {
Pushed = 1; Pushed = 1;
PushBack = UNMETA(c); PushBack = UNMETA(c);
@ -882,14 +880,14 @@ static el_status_t tty_special(int c)
if (c == rl_erase || c == DEL) if (c == rl_erase || c == DEL)
return bk_del_char(); return bk_del_char();
if (c == rl_kill) { if (c == rl_kill) {
if (Point != 0) { if (rl_point != 0) {
Point = 0; rl_point = 0;
reposition(); reposition();
} }
Repeat = NO_ARG; Repeat = NO_ARG;
return kill_line(); return kill_line();
} }
if (c == rl_eof && Point == 0 && End == 0) if (c == rl_eof && rl_point == 0 && rl_end == 0)
return CSeof; return CSeof;
if (c == rl_intr) { if (c == rl_intr) {
Signal = SIGINT; Signal = SIGINT;
@ -914,14 +912,14 @@ static char *editinput(void)
int c; int c;
Repeat = NO_ARG; Repeat = NO_ARG;
OldPoint = Point = Mark = End = 0; OldPoint = rl_point = rl_mark = rl_end = 0;
Line[0] = '\0'; rl_line_buffer[0] = '\0';
Signal = -1; Signal = -1;
while ((c = tty_get()) != EOF) while ((c = tty_get()) != EOF)
switch (tty_special(c)) { switch (tty_special(c)) {
case CSdone: case CSdone:
return Line; return rl_line_buffer;
case CSeof: case CSeof:
return NULL; return NULL;
case CSsignal: case CSsignal:
@ -932,7 +930,7 @@ static char *editinput(void)
case CSdispatch: case CSdispatch:
switch (emacs(c)) { switch (emacs(c)) {
case CSdone: case CSdone:
return Line; return rl_line_buffer;
case CSeof: case CSeof:
return NULL; return NULL;
case CSsignal: case CSsignal:
@ -1036,9 +1034,9 @@ char *readline(const char *prompt)
return read_redirected(); return read_redirected();
} }
if (Line == NULL) { if (rl_line_buffer == NULL) {
Length = MEM_INC; Length = MEM_INC;
if ((Line = NEW(char, Length)) == NULL) if ((rl_line_buffer = NEW(char, Length)) == NULL)
return NULL; return NULL;
} }
@ -1102,10 +1100,10 @@ static char *find_word(void)
char *new; char *new;
SIZE_T len; SIZE_T len;
p = &Line[Point]; p = &rl_line_buffer[rl_point];
while (p > Line) { while (p > rl_line_buffer) {
p--; p--;
if (p > Line && p[-1] == '\\') { if (p > rl_line_buffer && p[-1] == '\\') {
p--; p--;
} else { } else {
if (strchr(SEPS, (char) *p) != NULL) { if (strchr(SEPS, (char) *p) != NULL) {
@ -1114,13 +1112,13 @@ static char *find_word(void)
} }
} }
} }
len = Point - (p - Line) + 1; len = rl_point - (p - rl_line_buffer) + 1;
if ((new = NEW(char, len)) == NULL) if ((new = NEW(char, len)) == NULL)
return NULL; return NULL;
q = new; q = new;
while (p < &Line[Point]) { while (p < &rl_line_buffer[rl_point]) {
if (*p == '\\') { if (*p == '\\') {
if (++p == &Line[Point]) break; if (++p == &rl_line_buffer[rl_point]) break;
} }
*q++ = *p++; *q++ = *p++;
} }
@ -1196,7 +1194,7 @@ static el_status_t c_complete(void)
static el_status_t accept_line(void) static el_status_t accept_line(void)
{ {
Line[End] = '\0'; rl_line_buffer[rl_end] = '\0';
return CSdone; return CSdone;
} }
@ -1204,14 +1202,14 @@ static el_status_t transpose(void)
{ {
char c; char c;
if (Point) { if (rl_point) {
if (Point == End) if (rl_point == rl_end)
left(CSmove); left(CSmove);
c = Line[Point - 1]; c = rl_line_buffer[rl_point - 1];
left(CSstay); left(CSstay);
Line[Point - 1] = Line[Point]; rl_line_buffer[rl_point - 1] = rl_line_buffer[rl_point];
tty_show(Line[Point - 1]); tty_show(rl_line_buffer[rl_point - 1]);
Line[Point++] = c; rl_line_buffer[rl_point++] = c;
tty_show(c); tty_show(c);
} }
return CSstay; return CSstay;
@ -1228,22 +1226,22 @@ static el_status_t wipe(void)
{ {
int i; int i;
if (Mark > End) if (rl_mark > rl_end)
return ring_bell(); return ring_bell();
if (Point > Mark) { if (rl_point > rl_mark) {
i = Point; i = rl_point;
Point = Mark; rl_point = rl_mark;
Mark = i; rl_mark = i;
reposition(); reposition();
} }
return delete_string(Mark - Point); return delete_string(rl_mark - rl_point);
} }
static el_status_t mk_set(void) static el_status_t mk_set(void)
{ {
Mark = Point; rl_mark = rl_point;
return CSstay; return CSstay;
} }
@ -1254,9 +1252,9 @@ static el_status_t exchange(void)
if ((c = tty_get()) != CTL('X')) if ((c = tty_get()) != CTL('X'))
return c == EOF ? CSeof : ring_bell(); return c == EOF ? CSeof : ring_bell();
if ((c = Mark) <= End) { if ((c = rl_mark) <= rl_end) {
Mark = Point; rl_mark = rl_point;
Point = c; rl_point = c;
return CSmove; return CSmove;
} }
return CSstay; return CSstay;
@ -1271,13 +1269,13 @@ static el_status_t yank(void)
static el_status_t copy_region(void) static el_status_t copy_region(void)
{ {
if (Mark > End) if (rl_mark > rl_end)
return ring_bell(); return ring_bell();
if (Point > Mark) if (rl_point > rl_mark)
save_yank(Mark, Point - Mark); save_yank(rl_mark, rl_point - rl_mark);
else else
save_yank(Point, Mark - Point); save_yank(rl_point, rl_mark - rl_point);
return CSstay; return CSstay;
} }
@ -1290,9 +1288,9 @@ static el_status_t move_to_char(void)
if ((c = tty_get()) == EOF) if ((c = tty_get()) == EOF)
return CSeof; return CSeof;
for (i = Point + 1, p = &Line[i]; i < End; i++, p++) for (i = rl_point + 1, p = &rl_line_buffer[i]; i < rl_end; i++, p++)
if (*p == c) { if (*p == c) {
Point = i; rl_point = i;
return CSmove; return CSmove;
} }
return CSstay; return CSstay;
@ -1308,9 +1306,9 @@ static el_status_t fd_kill_word(void)
int i; int i;
do_forward(CSstay); do_forward(CSstay);
if (OldPoint != Point) { if (OldPoint != rl_point) {
i = Point - OldPoint; i = rl_point - OldPoint;
Point = OldPoint; rl_point = OldPoint;
return delete_string(i); return delete_string(i);
} }
return CSstay; return CSstay;
@ -1323,13 +1321,13 @@ static el_status_t bk_word(void)
i = 0; i = 0;
do { do {
for (p = &Line[Point]; p > Line && !isalnum(p[-1]); p--) for (p = &rl_line_buffer[rl_point]; p > rl_line_buffer && !isalnum(p[-1]); p--)
left(CSmove); left(CSmove);
for (; p > Line && p[-1] != ' ' && isalnum(p[-1]); p--) for (; p > rl_line_buffer && p[-1] != ' ' && isalnum(p[-1]); p--)
left(CSmove); left(CSmove);
if (Point == 0) if (rl_point == 0)
break; break;
} while (++i < Repeat); } while (++i < Repeat);
@ -1339,8 +1337,8 @@ static el_status_t bk_word(void)
static el_status_t bk_kill_word(void) static el_status_t bk_kill_word(void)
{ {
bk_word(); bk_word();
if (OldPoint != Point) if (OldPoint != rl_point)
return delete_string(OldPoint - Point); return delete_string(OldPoint - rl_point);
return CSstay; return CSstay;
} }