* - http://www.3waylabs.com/nw/WWW/products/wizcon/vt220.html
*
* Todo list:
- * - Switch to gets() if $TERM is something we can't support.
* - Win32 support
+ * - Save and load history containing newlines
*
* Bloat:
* - Completion?
*
* List of escape sequences used by this program, we do everything just
- * with three sequences. In order to be so cheap we may have some
+ * a few sequences. In order to be so cheap we may have some
* flickering effect with some slow terminal, but the lesser sequences
* the more compatible.
*
* CHA (Cursor Horizontal Absolute)
* Sequence: ESC [ n G
- * Effect: moves cursor to column n
+ * Effect: moves cursor to column n (1 based)
*
* EL (Erase Line)
* Sequence: ESC [ n K
#include <stdlib.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+#include <sys/poll.h>
#include <unistd.h>
#include "linenoise.h"
#include "linenoise.h"
+#include "utf8.h"
#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
#define LINENOISE_MAX_LINE 4096
-static char *unsupported_term[] = {"dumb","cons25",NULL};
+static const char *unsupported_term[] = {"dumb","cons25",NULL};
static struct termios orig_termios; /* in order to restore at exit */
static int rawmode = 0; /* for atexit() function to check if restore is needed*/
static void linenoiseAtExit(void);
static int fd_read(int fd);
+static void getColumns(int fd, int *cols);
static int isUnsupportedTerm(void) {
char *term = getenv("TERM");
raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; /* 1 byte, no timer */
/* put terminal in raw mode after flushing */
- if (tcsetattr(fd,TCSAFLUSH,&raw) < 0) goto fatal;
+ if (tcsetattr(fd,TCSADRAIN,&raw) < 0) goto fatal;
rawmode = 1;
return 0;
static void disableRawMode(int fd) {
/* Don't even check the return value as it's too late. */
- if (rawmode && tcsetattr(fd,TCSAFLUSH,&orig_termios) != -1)
+ if (rawmode && tcsetattr(fd,TCSADRAIN,&orig_termios) != -1)
rawmode = 0;
}
freeHistory();
}
-static int getColumns(void) {
- struct winsize ws;
-
- if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
- return ws.ws_col;
-}
-
/* Structure to contain the status of the current (being edited) line */
struct current {
int fd; /* Terminal fd */
char *buf; /* Current buffer. Always null terminated */
int bufmax; /* Size of the buffer, including space for the null termination */
int len; /* Number of bytes in 'buf' */
+ int chars; /* Number of chars in 'buf' (utf-8 chars) */
int pos; /* Cursor position, measured in chars */
int cols; /* Size of the window, in chars */
+ const char *prompt;
};
+/* gcc/glibc insists that we care about the return code of write! */
+#define IGNORE_RC(EXPR) if (EXPR) {}
+
/* This is fd_printf() on some systems, but use a different
* name to avoid conflicts
*/
va_start(args, format);
n = vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
- write(fd, buf, n);
+ IGNORE_RC(write(fd, buf, n));
}
-static void refreshLine(const char *prompt, struct current *c) {
- size_t plen = strlen(prompt);
- int extra = 0;
- size_t i, p;
- const char *buf = c->buf;
- int len = c->len;
- int pos = c->pos;
+static int utf8_getchars(char *buf, int c)
+{
+#ifdef USE_UTF8
+ return utf8_fromunicode(buf, c);
+#else
+ *buf = c;
+ return 1;
+#endif
+}
- //fprintf(stderr, "\nrefreshLine: prompt=<<%s>>, buf=<<%s>>\n", prompt, c->buf);
- //fprintf(stderr, "pos=%d, len=%d, cols=%d\n", pos, len, c->cols);
+/**
+ * Returns the unicode character at the given offset,
+ * or -1 if none.
+ */
+static int get_char(struct current *current, int pos)
+{
+ if (pos >= 0 && pos < current->chars) {
+ int c;
+ int i = utf8_index(current->buf, pos);
+ (void)utf8_tounicode(current->buf + i, &c);
+ return c;
+ }
+ return -1;
+}
- while((plen+pos) >= c->cols) {
- buf++;
- len--;
- pos--;
+static void refreshLine(const char *prompt, struct current *current) {
+ int plen;
+ int pchars;
+ int backup = 0;
+ int i;
+ const char *buf = current->buf;
+ int chars = current->chars;
+ int pos = current->pos;
+ int b;
+ int ch;
+ int n;
+
+ /* Should intercept SIGWINCH. For now, just get the size every time */
+ getColumns(current->fd, ¤t->cols);
+
+ plen = strlen(prompt);
+ pchars = utf8_strlen(prompt, plen);
+
+ /* Account for a line which is too long to fit in the window.
+ * Note that control chars require an extra column
+ */
+
+ /* How many cols are required to the left of 'pos'?
+ * The prompt, plus one extra for each control char
+ */
+ n = pchars + utf8_strlen(buf, current->len);
+ b = 0;
+ for (i = 0; i < pos; i++) {
+ b += utf8_tounicode(buf + b, &ch);
+ if (ch < ' ') {
+ n++;
+ }
}
- while (plen+len > c->cols) {
- len--;
+
+ /* If too many are need, strip chars off the front of 'buf'
+ * until it fits. Note that if the current char is a control character,
+ * we need one extra col.
+ */
+ if (current->pos < current->chars && get_char(current, current->pos) < ' ') {
+ n++;
+ }
+
+ while (n >= current->cols) {
+ b = utf8_tounicode(buf, &ch);
+ if (ch < ' ') {
+ n--;
+ }
+ n--;
+ buf += b;
+ pos--;
+ chars--;
}
/* Cursor to left edge, then the prompt */
- fd_printf(c->fd, "\x1b[0G");
- write(c->fd, prompt, strlen(prompt));
+ fd_printf(current->fd, "\x1b[1G");
+ IGNORE_RC(write(current->fd, prompt, plen));
/* Now the current buffer content */
- /* Need special handling for control characters */
- p = 0;
- for (i = 0; i < len; i++) {
- if (buf[i] >= 0 && buf[i] < ' ') {
- write(c->fd, buf + p, i - p);
- p = i + 1;
- fd_printf(c->fd, "\033[7m^%c\033[0m", buf[i] + '@');
+
+ /* Need special handling for control characters.
+ * If we hit 'cols', stop.
+ */
+ b = 0; /* unwritted bytes */
+ n = 0; /* How many control chars were written */
+ for (i = 0; i < chars; i++) {
+ int ch;
+ int w = utf8_tounicode(buf + b, &ch);
+ if (ch < ' ') {
+ n++;
+ }
+ if (pchars + i + n >= current->cols) {
+ break;
+ }
+ if (ch < ' ') {
+ /* A control character, so write the buffer so far */
+ IGNORE_RC(write(current->fd, buf, b));
+ buf += b + w;
+ b = 0;
+ fd_printf(current->fd, "\033[7m^%c\033[0m", ch + '@');
if (i < pos) {
- extra++;
+ backup++;
}
}
+ else {
+ b += w;
+ }
}
- write(c->fd, buf + p, i - p);
+ IGNORE_RC(write(current->fd, buf, b));
/* Erase to right, move cursor to original position */
- fd_printf(c->fd, "\x1b[0K" "\x1b[0G\x1b[%dC", (int)(pos+plen+extra));
+ fd_printf(current->fd, "\x1b[0K" "\x1b[1G\x1b[%dC", pos + pchars + backup);
}
static void set_current(struct current *current, const char *str)
strncpy(current->buf, str, current->bufmax);
current->buf[current->bufmax - 1] = 0;
current->len = strlen(current->buf);
- current->pos = current->len;
+ current->pos = current->chars = utf8_strlen(current->buf, current->len);
}
-static int has_room(struct current *current, int chars)
+static int has_room(struct current *current, int bytes)
{
- return current->len + chars < current->bufmax - 1;
+ return current->len + bytes < current->bufmax - 1;
}
+/**
+ * Removes the char at 'pos'.
+ *
+ * Returns 1 if the line needs to be refreshed, 2 if not
+ * and 0 if nothing was removed
+ */
static int remove_char(struct current *current, int pos)
{
- //fprintf(stderr, "Trying to remove char at %d (pos=%d, len=%d)\n", pos, current->pos, current->len);
- if (pos >= 0 && pos < current->len) {
+ if (pos >= 0 && pos < current->chars) {
+ int p1, p2;
+ int ret = 1;
+ p1 = utf8_index(current->buf, pos);
+ p2 = p1 + utf8_index(current->buf + p1, 1);
+
+ /* optimise remove char in the case of removing the last char */
+ if (current->pos == pos + 1 && current->pos == current->chars) {
+ if (current->buf[pos] >= ' ' && utf8_strlen(current->prompt, -1) + utf8_strlen(current->buf, current->len) < current->cols - 1) {
+ ret = 2;
+ fd_printf(current->fd, "\b \b");
+ }
+ }
+
+ /* Move the null char too */
+ memmove(current->buf + p1, current->buf + p2, current->len - p2 + 1);
+ current->len -= (p2 - p1);
+ current->chars--;
+
if (current->pos > pos) {
current->pos--;
}
- /* Move the null char too */
- memmove(current->buf + pos, current->buf + pos + 1, current->len - pos);
- current->len--;
- return 1;
+ return ret;
}
return 0;
}
+/**
+ * Insert 'ch' at position 'pos'
+ *
+ * Returns 1 if the line needs to be refreshed, 2 if not
+ * and 0 if nothing was inserted (no room)
+ */
static int insert_char(struct current *current, int pos, int ch)
{
- if (has_room(current, 1) && pos >= 0 && pos <= current->len) {
- memmove(current->buf+pos+1, current->buf + pos, current->len - pos);
- current->buf[pos] = ch;
- current->len++;
+ char buf[3];
+ int n = utf8_getchars(buf, ch);
+
+ if (has_room(current, n) && pos >= 0 && pos <= current->chars) {
+ int p1, p2;
+ int ret = 1;
+ p1 = utf8_index(current->buf, pos);
+ p2 = p1 + n;
+
+ /* optimise the case where adding a single char to the end and no scrolling is needed */
+ if (current->pos == pos && current->chars == pos) {
+ if (ch >= ' ' && utf8_strlen(current->prompt, -1) + utf8_strlen(current->buf, current->len) < current->cols - 1) {
+ IGNORE_RC(write(current->fd, buf, n));
+ ret = 2;
+ }
+ }
+
+ memmove(current->buf + p2, current->buf + p1, current->len - p1);
+ memcpy(current->buf + p1, buf, n);
+ current->len += n;
+
+ current->chars++;
if (current->pos >= pos) {
current->pos++;
}
- return 1;
+ return ret;
}
return 0;
}
free(lc->cvec);
}
-static int completeLine(const char *prompt, struct current *current) {
+static int completeLine(struct current *current) {
linenoiseCompletions lc = { 0, NULL };
int c = 0;
struct current tmp = *current;
tmp.buf = lc.cvec[i];
tmp.pos = tmp.len = strlen(tmp.buf);
- refreshLine(prompt, &tmp);
+ tmp.chars = utf8_strlen(tmp.buf, tmp.len);
+ refreshLine(current->prompt, &tmp);
} else {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
c = fd_read(current->fd);
case 27: /* escape */
/* Re-show original buffer */
if (i < lc.len) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
stop = 1;
break;
}
void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) {
- lc->cvec = realloc(lc->cvec,sizeof(char*)*(lc->len+1));
+ lc->cvec = (char **)realloc(lc->cvec,sizeof(char*)*(lc->len+1));
lc->cvec[lc->len++] = strdup(str);
}
#endif
-/* XXX: Optimise this later */
+/**
+ * Returns 0 if no chars were removed or non-zero otherwise.
+ */
static int remove_chars(struct current *current, int pos, int n)
{
int removed = 0;
return removed;
}
-static int fd_read(int fd)
+/**
+ * Reads a char from 'fd', waiting at most 'timeout' milliseconds.
+ *
+ * A timeout of -1 means to wait forever.
+ *
+ * Returns -1 if no char is received within the time or an error occurs.
+ */
+static int fd_read_char(int fd, int timeout)
{
+ struct pollfd p;
unsigned char c;
+
+ p.fd = fd;
+ p.events = POLLIN;
+
+ if (poll(&p, 1, timeout) == 0) {
+ /* timeout */
+ return -1;
+ }
if (read(fd, &c, 1) != 1) {
return -1;
}
return c;
}
-#ifndef ctrl
-#define ctrl(C) ((C) - '@')
+/**
+ * Reads a complete utf-8 character
+ * and returns the unicode value, or -1 on error.
+ */
+static int fd_read(int fd)
+{
+#ifdef USE_UTF8
+ char buf[4];
+ int n;
+ int i;
+ int c;
+
+ if (read(fd, &buf[0], 1) != 1) {
+ return -1;
+ }
+ n = utf8_charlen(buf[0]);
+ if (n < 1 || n > 3) {
+ return -1;
+ }
+ for (i = 1; i < n; i++) {
+ if (read(fd, &buf[i], 1) != 1) {
+ return -1;
+ }
+ }
+ buf[n] = 0;
+ /* decode and return the character */
+ utf8_tounicode(buf, &c);
+ return c;
+#else
+ return fd_read_char(fd, -1);
#endif
+}
+
+static void getColumns(int fd, int *cols) {
+ struct winsize ws;
-static int linenoisePrompt(const char *prompt, struct current *current) {
- size_t plen = strlen(prompt);
+ if (ioctl(1, TIOCGWINSZ, &ws) == 0 && ws.ws_col != 0) {
+ *cols = ws.ws_col;
+ return;
+ }
+ /* Failed to query the window size. Perhaps we are on a serial terminal.
+ * Try to query the width by sending the cursor as far to the right
+ * and reading back the cursor position.
+ * Note that this is only done once per call to linenoise rather than
+ * every time the line is refreshed for efficiency reasons.
+ */
+ if (*cols == 0) {
+ *cols = 80;
+
+ /* Move cursor far right and report cursor position */
+ fd_printf(fd, "\x1b[999G" "\x1b[6n");
+
+ /* Parse the response: ESC [ rows ; cols R */
+ if (fd_read_char(fd, 100) == 0x1b && fd_read_char(fd, 100) == '[') {
+ int n = 0;
+ while (1) {
+ int ch = fd_read_char(fd, 100);
+ if (ch == ';') {
+ /* Ignore rows */
+ n = 0;
+ }
+ else if (ch == 'R') {
+ /* Got cols */
+ if (n != 0 && n < 1000) {
+ *cols = n;
+ }
+ break;
+ }
+ else if (ch >= 0 && ch <= '9') {
+ n = n * 10 + ch - '0';
+ }
+ else {
+ break;
+ }
+ }
+ }
+ }
+}
+
+/* Use -ve numbers here to co-exist with normal unicode chars */
+enum {
+ SPECIAL_NONE,
+ SPECIAL_UP = -20,
+ SPECIAL_DOWN = -21,
+ SPECIAL_LEFT = -22,
+ SPECIAL_RIGHT = -23,
+ SPECIAL_DELETE = -24,
+};
+
+/**
+ * If escape (27) was received, reads subsequent
+ * chars to determine if this is a known special key.
+ *
+ * Returns SPECIAL_NONE if unrecognised, or -1 if EOF.
+ *
+ * If no additional char is received within a short time,
+ * 27 is returned.
+ */
+static int check_special(int fd)
+{
+ int c = fd_read_char(fd, 50);
+ int c2;
+
+ if (c < 0) {
+ return 27;
+ }
+
+ c2 = fd_read_char(fd, 50);
+ if (c2 < 0) {
+ return c2;
+ }
+ if (c == '[' || c == 'O') {
+ /* Potential arrow key */
+ switch (c2) {
+ case 'A':
+ return SPECIAL_UP;
+ case 'B':
+ return SPECIAL_DOWN;
+ case 'C':
+ return SPECIAL_RIGHT;
+ case 'D':
+ return SPECIAL_LEFT;
+ }
+ }
+ if (c == '[' && c2 >= '1' && c2 <= '6') {
+ /* extended escape */
+ int c3 = fd_read_char(fd, 50);
+ if (c2 == '3' && c3 == '~') {
+ /* delete char under cursor */
+ return SPECIAL_DELETE;
+ }
+ while (c3 != -1 && c3 != '~') {
+ /* .e.g \e[12~ or '\e[11;2~ discard the complete sequence */
+ c3 = fd_read_char(fd, 50);
+ }
+ }
+
+ return SPECIAL_NONE;
+}
+
+#define ctrl(C) ((C) - '@')
+
+static int linenoisePrompt(struct current *current) {
int history_index = 0;
/* The latest history entry is always our current buffer, that
linenoiseHistoryAdd("");
set_current(current, "");
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
while(1) {
- int ext;
- int c;
- int c2;
-
- c = fd_read(current->fd);
+ int c = fd_read(current->fd);
#ifndef NO_COMPLETION
/* Only autocomplete when the callback is set. It returns < 0 when
* there was an error reading from fd. Otherwise it will return the
* character that should be handled next. */
if (c == 9 && completionCallback != NULL) {
- c = completeLine(prompt, current);
+ c = completeLine(current);
/* Return on errors */
if (c < 0) return current->len;
/* Read next character when 0 */
#endif
process_char:
- if (c < 0) return current->len;
+ if (c == -1) return current->len;
switch(c) {
case '\r': /* enter */
history_len--;
return -1;
case 127: /* backspace */
case ctrl('H'):
- if (remove_char(current, current->pos - 1)) {
- refreshLine(prompt, current);
+ if (remove_char(current, current->pos - 1) == 1) {
+ refreshLine(current->prompt, current);
}
break;
case ctrl('D'): /* ctrl-d */
}
/* Otherwise delete char to right of cursor */
if (remove_char(current, current->pos)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
break;
case ctrl('W'): /* ctrl-w */
/* eat any spaces on the left */
{
int pos = current->pos;
- while (pos > 0 && current->buf[pos - 1] == ' ') {
+ while (pos > 0 && get_char(current, pos - 1) == ' ') {
pos--;
}
/* now eat any non-spaces on the left */
- while (pos > 0 && current->buf[pos - 1] != ' ') {
+ while (pos > 0 && get_char(current, pos - 1) != ' ') {
pos--;
}
if (remove_chars(current, pos, current->pos - pos)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
}
break;
/* Display the reverse-i-search prompt and process chars */
char rbuf[50];
char rprompt[80];
- int i = 0;
+ int rchars = 0;
+ int rlen = 0;
+ int searchpos = history_len - 1;
+
rbuf[0] = 0;
while (1) {
+ int n = 0;
+ const char *p = NULL;
+ int skipsame = 0;
+ int searchdir = -1;
+
snprintf(rprompt, sizeof(rprompt), "(reverse-i-search)'%s': ", rbuf);
refreshLine(rprompt, current);
c = fd_read(current->fd);
if (c == ctrl('H') || c == 127) {
- if (i > 0) {
- rbuf[--i] = 0;
+ if (rchars) {
+ int p = utf8_index(rbuf, --rchars);
+ rbuf[p] = 0;
+ rlen = strlen(rbuf);
}
continue;
}
- if (c >= ' ' && c <= '~') {
- if (i < (int)sizeof(rbuf)) {
- int j;
- const char *p = NULL;
- rbuf[i++] = c;
- rbuf[i] = 0;
- /* Now search back through the history for a match */
- for (j = history_len - 1; j > 0; j--) {
- p = strstr(history[j], rbuf);
- if (p) {
- /* Found a match. Copy it */
- set_current(current,history[j]);
- current->pos = p - history[j];
- break;
- }
- }
- if (!p) {
- /* No match, so don't add it */
- rbuf[--i] = 0;
+ if (c == 27) {
+ c = check_special(current->fd);
+ }
+ if (c == ctrl('P') || c == SPECIAL_UP) {
+ /* Search for the previous (earlier) match */
+ if (searchpos > 0) {
+ searchpos--;
+ }
+ skipsame = 1;
+ }
+ else if (c == ctrl('N') || c == SPECIAL_DOWN) {
+ /* Search for the next (later) match */
+ if (searchpos < history_len) {
+ searchpos++;
+ }
+ searchdir = 1;
+ skipsame = 1;
+ }
+ else if (c >= ' ') {
+ if (rlen >= (int)sizeof(rbuf) + 3) {
+ continue;
+ }
+
+ n = utf8_getchars(rbuf + rlen, c);
+ rlen += n;
+ rchars++;
+ rbuf[rlen] = 0;
+
+ /* Adding a new char resets the search location */
+ searchpos = history_len - 1;
+ }
+ else {
+ /* Exit from incremental search mode */
+ break;
+ }
+
+ /* Now search through the history for a match */
+ for (; searchpos >= 0 && searchpos < history_len; searchpos += searchdir) {
+ p = strstr(history[searchpos], rbuf);
+ if (p) {
+ /* Found a match */
+ if (skipsame && strcmp(history[searchpos], current->buf) == 0) {
+ /* But it is identical, so skip it */
+ continue;
}
+ /* Copy the matching line and set the cursor position */
+ set_current(current,history[searchpos]);
+ current->pos = utf8_strlen(history[searchpos], p - history[searchpos]);
+ break;
}
- continue;
}
- break;
+ if (!p && n) {
+ /* No match, so don't add it */
+ rchars--;
+ rlen -= n;
+ rbuf[rlen] = 0;
+ }
}
- if (c == ctrl('G')) {
+ if (c == ctrl('G') || c == ctrl('C')) {
/* ctrl-g terminates the search with no effect */
set_current(current, "");
c = 0;
c = 0;
}
/* Go process the char normally */
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
goto process_char;
}
break;
case ctrl('T'): /* ctrl-t */
- if (current->pos > 0 && current->pos < current->len) {
- int aux = current->buf[current->pos-1];
- current->buf[current->pos-1] = current->buf[current->pos];
- current->buf[current->pos] = aux;
- if (current->pos != current->len-1) current->pos++;
- refreshLine(prompt, current);
+ if (current->pos > 0 && current->pos < current->chars) {
+ c = get_char(current, current->pos);
+ remove_char(current, current->pos);
+ insert_char(current, current->pos - 1, c);
+ refreshLine(current->prompt, current);
}
break;
case ctrl('V'): /* ctrl-v */
- if (has_room(current, 1)) {
+ if (has_room(current, 3)) {
/* Insert the ^V first */
if (insert_char(current, current->pos, c)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
/* Now wait for the next char. Can insert anything except \0 */
c = fd_read(current->fd);
- if (c > 0) {
- /* Replace the ^V with the actual char */
- current->buf[current->pos - 1] = c;
- }
- else {
- remove_char(current, current->pos);
+
+ /* Remove the ^V first */
+ remove_char(current, current->pos - 1);
+ if (c != -1) {
+ /* Insert the actual char */
+ insert_char(current, current->pos, c);
}
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
}
break;
case ctrl('B'): /* ctrl-b */
- goto left_arrow;
case ctrl('F'): /* ctrl-f */
- goto right_arrow;
case ctrl('P'): /* ctrl-p */
- c2 = 65;
- goto up_down_arrow;
case ctrl('N'): /* ctrl-n */
- c2 = 66;
- goto up_down_arrow;
- break;
- case 27: /* escape sequence */
- c = fd_read(current->fd);
- if (c <= 0) {
- break;
+ case 27: { /* escape sequence */
+ int dir = -1;
+ if (c == 27) {
+ c = check_special(current->fd);
}
- c2 = fd_read(current->fd);
- if (c <= 0) {
- break;
- }
- ext = (c == 91 || c == 79);
- if (ext && c2 == 68) {
-left_arrow:
- /* left arrow */
- if (current->pos > 0) {
- current->pos--;
- refreshLine(prompt, current);
- }
- } else if (ext && c2 == 67) {
-right_arrow:
- /* right arrow */
- if (current->pos < current->len) {
- current->pos++;
- refreshLine(prompt, current);
- }
- } else if (ext && (c2 == 65 || c2 == 66)) {
-up_down_arrow:
- /* up and down arrow: history */
- 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(current->buf);
- /* Show the new entry */
- history_index += (c2 == 65) ? 1 : -1;
- if (history_index < 0) {
- history_index = 0;
- break;
- } else if (history_index >= history_len) {
- history_index = history_len-1;
- break;
+ switch (c) {
+ case ctrl('B'):
+ case SPECIAL_LEFT:
+ if (current->pos > 0) {
+ current->pos--;
+ refreshLine(current->prompt, current);
}
- set_current(current, history[history_len-1-history_index]);
- refreshLine(prompt, current);
- }
- } else if (c == 91 && c2 > 48 && c2 < 55) {
- /* extended escape */
- c = fd_read(current->fd);
- if (c <= 0) {
break;
- }
- fd_read(current->fd);
- if (c2 == 51 && c == 126) {
- /* delete char under cursor */
- if (remove_char(current, current->pos)) {
- refreshLine(prompt, current);
+ case ctrl('F'):
+ case SPECIAL_RIGHT:
+ if (current->pos < current->chars) {
+ current->pos++;
+ refreshLine(current->prompt, current);
}
- }
+ break;
+ case ctrl('P'):
+ case SPECIAL_UP:
+ dir = 1;
+ case ctrl('N'):
+ case SPECIAL_DOWN:
+ 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(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->prompt, current);
+ }
+ break;
+
+ case SPECIAL_DELETE:
+ if (remove_char(current, current->pos) == 1) {
+ refreshLine(current->prompt, current);
+ }
+ break;
+ }
}
break;
default:
- /* Note that the only control character currently permitted is tab */
- if (c == '\t' || c < 0 || c >= ' ') {
- if (insert_char(current, current->pos, c)) {
- /* Avoid a full update of the line in the trivial case. */
- if (current->pos == current->len && c >= ' ' && plen + current->len < current->cols) {
- char ch = c;
- write(current->fd, &ch, 1);
- }
- else {
- refreshLine(prompt, current);
- }
+ /* Only tab is allowed without ^V */
+ if (c == '\t' || c >= ' ') {
+ if (insert_char(current, current->pos, c) == 1) {
+ refreshLine(current->prompt, current);
}
}
break;
case ctrl('U'): /* Ctrl+u, delete to beginning of line. */
if (remove_chars(current, 0, current->pos)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
break;
case ctrl('K'): /* Ctrl+k, delete from current to end of line. */
- if (remove_chars(current, current->pos, current->len - current->pos)) {
- refreshLine(prompt, current);
+ if (remove_chars(current, current->pos, current->chars - current->pos)) {
+ refreshLine(current->prompt, current);
}
break;
case ctrl('A'): /* Ctrl+a, go to the start of the line */
current->pos = 0;
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
break;
case ctrl('E'): /* ctrl+e, go to the end of the line */
- current->pos = current->len;
- refreshLine(prompt, current);
+ current->pos = current->chars;
+ refreshLine(current->prompt, current);
break;
case ctrl('L'): /* Ctrl+L, clear screen */
/* clear screen */
fd_printf(current->fd, "\x1b[H\x1b[2J");
- refreshLine(prompt, current);
+ /* Force recalc of window size for serial terminals */
+ current->cols = 0;
+ refreshLine(current->prompt, current);
break;
}
}
current.buf = buf;
current.bufmax = buflen;
current.len = 0;
+ current.chars = 0;
current.pos = 0;
- current.cols = getColumns();
+ current.cols = 0;
+ current.prompt = prompt;
- count = linenoisePrompt(prompt, ¤t);
+ count = linenoisePrompt(¤t);
disableRawMode(fd);
+
printf("\n");
}
return count;
if (history_max_len == 0) return 0;
if (history == NULL) {
- history = malloc(sizeof(char*)*history_max_len);
+ history = (char**)malloc(sizeof(char*)*history_max_len);
if (history == NULL) return 0;
memset(history,0,(sizeof(char*)*history_max_len));
}
}
int linenoiseHistorySetMaxLen(int len) {
- char **new;
+ char **newHistory;
if (len < 1) return 0;
if (history) {
int tocopy = history_len;
- new = malloc(sizeof(char*)*len);
- if (new == NULL) return 0;
+ newHistory = (char**)malloc(sizeof(char*)*len);
+ if (newHistory == NULL) return 0;
if (len < tocopy) tocopy = len;
- memcpy(new,history+(history_max_len-tocopy), sizeof(char*)*tocopy);
+ memcpy(newHistory,history+(history_max_len-tocopy), sizeof(char*)*tocopy);
free(history);
- history = new;
+ history = newHistory;
}
history_max_len = len;
if (history_len > history_max_len)
/* Save the history in the specified file. On success 0 is returned
* otherwise -1 is returned. */
-int linenoiseHistorySave(char *filename) {
+int linenoiseHistorySave(const char *filename) {
FILE *fp = fopen(filename,"w");
int j;
*
* If the file exists and the operation succeeded 0 is returned, otherwise
* on error -1 is returned. */
-int linenoiseHistoryLoad(char *filename) {
+int linenoiseHistoryLoad(const char *filename) {
FILE *fp = fopen(filename,"r");
char buf[LINENOISE_MAX_LINE];
projects / linenoise.git / blobdiff