diff options
| -rw-r--r-- | linenoise/linenoise.c | 59 | ||||
| -rw-r--r-- | txr.1 | 24 |
2 files changed, 83 insertions, 0 deletions
diff --git a/linenoise/linenoise.c b/linenoise/linenoise.c index 515e775d..a8ed8ba1 100644 --- a/linenoise/linenoise.c +++ b/linenoise/linenoise.c @@ -1002,6 +1002,62 @@ static void edit_delete_prev_word(lino_t *l) { refresh_line(l); } +static void tr(char *s, int find, int rep) +{ + for (; *s; s++) + if (*s == find) + *s = rep; +} + +static void edit_in_editor(lino_t *l) { + char *template = ".linotmpXXXXXX"; + FILE *fo = 0; + char *ed = getenv("EDITOR"); + char path[128]; + + if (ed) { + char *ho = getenv("HOME"); + int fd; + + if (ho) + snprintf(path, sizeof path, "%s/%s", ho, template); + else + snprintf(path, sizeof path, "%s", template); + + if ((fd = mkstemp(path)) != -1) + fo = fdopen(fd, "w"); + + if (!fo && fd != -1) + close(fd); + } + + if (fo) { + char cmd[256]; + snprintf(cmd, sizeof cmd, "%s %s", ed, path); + tr(l->data, '\r', '\n'); + if (fputs(l->data, fo) != EOF && putc('\n', fo) != EOF && + fflush(fo) == 0) + { + FILE *fi; + int nread; + + if (system(cmd) == 0 && (fi = fopen(path, "r")) != 0) { + nread = fread(l->data, 1, sizeof l->data - 1, fi); + fclose(fi); + l->data[nread] = 0; + if (nread > 0 && l->data[nread - 1] == '\n') + l->data[--nread] = 0; + l->dpos = l->dlen = nread; + tr(l->data, '\n', '\r'); + refresh_line(l); + } + } + + fclose(fo); + remove(path); + } +} + /* This function is the core of the line editing capability of linenoise. * It expects 'fd' to be already in "raw mode" so that every key pressed * will be returned ASAP to read(). @@ -1066,6 +1122,9 @@ static int edit(lino_t *l, const char *prompt) extended = 0; switch (c) { + case CTL('E'): + edit_in_editor(l); + break; default: generate_beep(l); break; @@ -33630,6 +33630,30 @@ and return to editing the original uncompleted line. Any other input character c the listener to keep the currently shown completion, and return to edit mode, where that that character is processed again as a command. +.NP* Edit with External Editor + +The two character command Ctrl-X, Ctrl-E launches an external editor to +edit the current command line. The command line is stored in a temporary +file first, and the editor is invoked on this file. When the editor +terminates, the file is read into the editing buffer. + +The editor is determined from the +.code EDITOR +environment variable. If this variable doesn't exist, +the command does nothing. + +If the +.code HOME +environment variable exists, then the temporary file is created in the home +directory. Otherwise it is created in the current working directory. If the +creation of the file fails, then the command silently returns to edit mode. + +If the command line contains embedded carriage returns (which denote +line breaks in multi-line mode) these are replaced with newline characters +when written out to the file. Conversely, when the edited file is read +back, its newlines are converted to carriage returns, so that multi-line +content is handled properly. (See the following section, Multi-Line Mode). + .SS* Multi-Line Mode The listener operates in one of two modes: line mode and multi-line mode. The |