*
* You can find the latest source code at:
*
- * http://github.com/antirez/linenoise
+ * http://github.com/msteveb/linenoise
+ * (forked from http://github.com/antirez/linenoise)
*
* Does a number of crazy assumptions that happen to be true in 99.9999% of
* the 2010 UNIX computers around.
*
* Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
* Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2011, Steve Bennett <steveb at workware dot net dot au>
*
* All rights reserved.
*
* - http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
* - http://www.3waylabs.com/nw/WWW/products/wizcon/vt220.html
*
- * Todo list:
- * - Win32 support
- * - Save and load history containing newlines
- *
* Bloat:
* - Completion?
*
+ * Unix/termios
+ * ------------
* 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
* DSR/CPR (Report cursor position)
* Sequence: ESC [ 6 n
* Effect: reports current cursor position as ESC [ NNN ; MMM R
+ *
+ * win32/console
+ * -------------
+ * If __MINGW32__ is defined, the win32 console API is used.
+ * This could probably be made to work for the msvc compiler too.
+ * This support based in part on work by Jon Griffiths.
*/
+#ifdef __MINGW32__
+#include <windows.h>
+#include <fcntl.h>
+#define USE_WINCONSOLE
+#else
#include <termios.h>
+#include <sys/ioctl.h>
+#include <sys/poll.h>
+#define USE_TERMIOS
+#endif
+
#include <unistd.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#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 struct termios orig_termios; /* in order to restore at exit */
-static int rawmode = 0; /* for atexit() function to check if restore is needed*/
-static int atexit_registered = 0; /* register atexit just 1 time */
+#define ctrl(C) ((C) - '@')
+
+/* 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,
+ SPECIAL_HOME = -25,
+ SPECIAL_END = -26,
+};
+
static int history_max_len = LINENOISE_DEFAULT_HISTORY_MAX_LEN;
static int history_len = 0;
static char **history = NULL;
-static void linenoiseAtExit(void);
-static int fd_read(int fd);
-
-static int isUnsupportedTerm(void) {
- char *term = getenv("TERM");
- int j;
+/* Structure to contain the status of the current (being edited) line */
+struct current {
+ 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;
+#if defined(USE_TERMIOS)
+ int fd; /* Terminal fd */
+#elif defined(USE_WINCONSOLE)
+ HANDLE outh; /* Console output handle */
+ HANDLE inh; /* Console input handle */
+ int rows; /* Screen rows */
+ int x; /* Current column during output */
+ int y; /* Current row */
+#endif
+};
- if (term == NULL) return 0;
- for (j = 0; unsupported_term[j]; j++)
- if (!strcasecmp(term,unsupported_term[j])) return 1;
- return 0;
-}
+static int fd_read(struct current *current);
+static int getWindowSize(struct current *current);
-static void freeHistory(void) {
+void linenoiseHistoryFree(void) {
if (history) {
int j;
for (j = 0; j < history_len; j++)
free(history[j]);
free(history);
+ history = NULL;
}
}
-static int enableRawMode(int fd) {
+#if defined(USE_TERMIOS)
+static void linenoiseAtExit(void);
+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 int atexit_registered = 0; /* register atexit just 1 time */
+
+static const char *unsupported_term[] = {"dumb","cons25",NULL};
+
+static int isUnsupportedTerm(void) {
+ char *term = getenv("TERM");
+
+ if (term) {
+ int j;
+ for (j = 0; unsupported_term[j]; j++) {
+ if (strcasecmp(term, unsupported_term[j]) == 0) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+static int enableRawMode(struct current *current) {
struct termios raw;
- if (!isatty(STDIN_FILENO)) goto fatal;
+ current->fd = STDIN_FILENO;
+
+ if (!isatty(current->fd) || isUnsupportedTerm() ||
+ tcgetattr(current->fd, &orig_termios) == -1) {
+fatal:
+ errno = ENOTTY;
+ return -1;
+ }
+
if (!atexit_registered) {
atexit(linenoiseAtExit);
atexit_registered = 1;
}
- if (tcgetattr(fd,&orig_termios) == -1) goto fatal;
raw = orig_termios; /* modify the original mode */
/* input modes: no break, no CR to NL, no parity check, no strip char,
raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; /* 1 byte, no timer */
/* put terminal in raw mode after flushing */
- if (tcsetattr(fd,TCSADRAIN,&raw) < 0) goto fatal;
+ if (tcsetattr(current->fd,TCSADRAIN,&raw) < 0) {
+ goto fatal;
+ }
rawmode = 1;
- return 0;
-fatal:
- errno = ENOTTY;
- return -1;
+ current->cols = 0;
+ return 0;
}
-static void disableRawMode(int fd) {
+static void disableRawMode(struct current *current) {
/* Don't even check the return value as it's too late. */
- if (rawmode && tcsetattr(fd,TCSADRAIN,&orig_termios) != -1)
+ if (rawmode && tcsetattr(current->fd,TCSADRAIN,&orig_termios) != -1)
rawmode = 0;
}
/* At exit we'll try to fix the terminal to the initial conditions. */
static void linenoiseAtExit(void) {
- disableRawMode(STDIN_FILENO);
- freeHistory();
-}
-
-static int getColumns(void) {
- struct winsize ws;
-
- if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
- return ws.ws_col;
+ if (rawmode) {
+ tcsetattr(STDIN_FILENO, TCSADRAIN, &orig_termios);
+ }
+ linenoiseHistoryFree();
}
-/* 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 */
-};
-
/* gcc/glibc insists that we care about the return code of write! */
-#define IGNORE_RC(EXPR) ((EXPR) < 0 ? -1 : 0)
+#define IGNORE_RC(EXPR) if (EXPR) {}
-/* This is fd_printf() on some systems, but use a different
+/* This is fdprintf() on some systems, but use a different
* name to avoid conflicts
*/
static void fd_printf(int fd, const char *format, ...)
IGNORE_RC(write(fd, buf, n));
}
+static void clearScreen(struct current *current)
+{
+ fd_printf(current->fd, "\x1b[H\x1b[2J");
+}
+
+static void cursorToLeft(struct current *current)
+{
+ fd_printf(current->fd, "\x1b[1G");
+}
+
+static int outputChars(struct current *current, const char *buf, int len)
+{
+ return write(current->fd, buf, len);
+}
+
+static void outputControlChar(struct current *current, char ch)
+{
+ fd_printf(current->fd, "\033[7m^%c\033[0m", ch);
+}
+
+static void eraseEol(struct current *current)
+{
+ fd_printf(current->fd, "\x1b[0K");
+}
+
+static void setCursorPos(struct current *current, int x)
+{
+ fd_printf(current->fd, "\x1b[1G\x1b[%dC", x);
+}
+
+/**
+ * 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;
+}
+
+/**
+ * Reads a complete utf-8 character
+ * and returns the unicode value, or -1 on error.
+ */
+static int fd_read(struct current *current)
+{
+#ifdef USE_UTF8
+ char buf[4];
+ int n;
+ int i;
+ int c;
+
+ if (read(current->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(current->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(current->fd, -1);
+#endif
+}
+
+static int getWindowSize(struct current *current)
+{
+ struct winsize ws;
+
+ if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == 0 && ws.ws_col != 0) {
+ current->cols = ws.ws_col;
+ return 0;
+ }
+
+ /* 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 (current->cols == 0) {
+ current->cols = 80;
+
+ /* Move cursor far right and report cursor position */
+ fd_printf(current->fd, "\x1b[999G" "\x1b[6n");
+
+ /* Parse the response: ESC [ rows ; cols R */
+ if (fd_read_char(current->fd, 100) == 0x1b && fd_read_char(current->fd, 100) == '[') {
+ int n = 0;
+ while (1) {
+ int ch = fd_read_char(current->fd, 100);
+ if (ch == ';') {
+ /* Ignore rows */
+ n = 0;
+ }
+ else if (ch == 'R') {
+ /* Got cols */
+ if (n != 0 && n < 1000) {
+ current->cols = n;
+ }
+ break;
+ }
+ else if (ch >= 0 && ch <= '9') {
+ n = n * 10 + ch - '0';
+ }
+ else {
+ break;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+/**
+ * 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;
+ case 'F':
+ return SPECIAL_END;
+ case 'H':
+ return SPECIAL_HOME;
+ }
+ }
+ if (c == '[' && c2 >= '1' && c2 <= '8') {
+ /* extended escape */
+ c = fd_read_char(fd, 50);
+ if (c == '~') {
+ switch (c2) {
+ case '3':
+ return SPECIAL_DELETE;
+ case '7':
+ return SPECIAL_HOME;
+ case '8':
+ return SPECIAL_END;
+ }
+ }
+ while (c != -1 && c != '~') {
+ /* .e.g \e[12~ or '\e[11;2~ discard the complete sequence */
+ c = fd_read_char(fd, 50);
+ }
+ }
+
+ return SPECIAL_NONE;
+}
+#elif defined(USE_WINCONSOLE)
+
+static DWORD orig_consolemode = 0;
+
+static int enableRawMode(struct current *current) {
+ DWORD n;
+ INPUT_RECORD irec;
+
+ current->outh = GetStdHandle(STD_OUTPUT_HANDLE);
+ current->inh = GetStdHandle(STD_INPUT_HANDLE);
+
+ if (!PeekConsoleInput(current->inh, &irec, 1, &n)) {
+ return -1;
+ }
+ if (getWindowSize(current) != 0) {
+ return -1;
+ }
+ if (GetConsoleMode(current->inh, &orig_consolemode)) {
+ SetConsoleMode(current->inh, ENABLE_PROCESSED_INPUT);
+ }
+ return 0;
+}
+
+static void disableRawMode(struct current *current)
+{
+ SetConsoleMode(current->inh, orig_consolemode);
+}
+
+static void clearScreen(struct current *current)
+{
+ COORD topleft = { 0, 0 };
+ DWORD n;
+
+ FillConsoleOutputCharacter(current->outh, ' ',
+ current->cols * current->rows, topleft, &n);
+ FillConsoleOutputAttribute(current->outh,
+ FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN,
+ current->cols * current->rows, topleft, &n);
+ SetConsoleCursorPosition(current->outh, topleft);
+}
+
+static void cursorToLeft(struct current *current)
+{
+ COORD pos = { 0, current->y };
+ DWORD n;
+
+ FillConsoleOutputAttribute(current->outh,
+ FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN, current->cols, pos, &n);
+ current->x = 0;
+}
+
+static int outputChars(struct current *current, const char *buf, int len)
+{
+ COORD pos = { current->x, current->y };
+ WriteConsoleOutputCharacter(current->outh, buf, len, pos, 0);
+ current->x += len;
+ return 0;
+}
+
+static void outputControlChar(struct current *current, char ch)
+{
+ COORD pos = { current->x, current->y };
+ DWORD n;
+
+ FillConsoleOutputAttribute(current->outh, BACKGROUND_INTENSITY, 2, pos, &n);
+ outputChars(current, "^", 1);
+ outputChars(current, &ch, 1);
+}
+
+static void eraseEol(struct current *current)
+{
+ COORD pos = { current->x, current->y };
+ DWORD n;
+
+ FillConsoleOutputCharacter(current->outh, ' ', current->cols - current->x, pos, &n);
+}
+
+static void setCursorPos(struct current *current, int x)
+{
+ COORD pos = { x, current->y };
+
+ SetConsoleCursorPosition(current->outh, pos);
+ current->x = x;
+}
+
+static int fd_read(struct current *current)
+{
+ while (1) {
+ INPUT_RECORD irec;
+ DWORD n;
+ if (WaitForSingleObject(current->inh, INFINITE) != WAIT_OBJECT_0) {
+ break;
+ }
+ if (!ReadConsoleInput (current->inh, &irec, 1, &n)) {
+ break;
+ }
+ if (irec.EventType == KEY_EVENT && irec.Event.KeyEvent.bKeyDown) {
+ KEY_EVENT_RECORD *k = &irec.Event.KeyEvent;
+ if (k->dwControlKeyState & ENHANCED_KEY) {
+ switch (k->wVirtualKeyCode) {
+ case VK_LEFT:
+ return SPECIAL_LEFT;
+ case VK_RIGHT:
+ return SPECIAL_RIGHT;
+ case VK_UP:
+ return SPECIAL_UP;
+ case VK_DOWN:
+ return SPECIAL_DOWN;
+ case VK_DELETE:
+ return SPECIAL_DELETE;
+ case VK_HOME:
+ return SPECIAL_HOME;
+ case VK_END:
+ return SPECIAL_END;
+ }
+ }
+ /* Note that control characters are already translated in AsciiChar */
+ else {
+#ifdef USE_UTF8
+ return k->uChar.UnicodeChar;
+#else
+ return k->uChar.AsciiChar;
+#endif
+ }
+ }
+ }
+ return -1;
+}
+
+static int getWindowSize(struct current *current)
+{
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ if (!GetConsoleScreenBufferInfo(current->outh, &info)) {
+ return -1;
+ }
+ current->cols = info.dwSize.X;
+ current->rows = info.dwSize.Y;
+ if (current->cols <= 0 || current->rows <= 0) {
+ current->cols = 80;
+ return -1;
+ }
+ current->y = info.dwCursorPosition.Y;
+ current->x = info.dwCursorPosition.X;
+ return 0;
+}
+#endif
+
static int utf8_getchars(char *buf, int c)
{
#ifdef USE_UTF8
return -1;
}
-static void refreshLine(const char *prompt, struct current *current) {
+static void refreshLine(const char *prompt, struct current *current)
+{
int plen;
int pchars;
int backup = 0;
int n;
/* Should intercept SIGWINCH. For now, just get the size every time */
- current->cols = getColumns();
+ getWindowSize(current);
plen = strlen(prompt);
pchars = utf8_strlen(prompt, plen);
}
/* Cursor to left edge, then the prompt */
- fd_printf(current->fd, "\x1b[0G");
- IGNORE_RC(write(current->fd, prompt, plen));
+ cursorToLeft(current);
+ outputChars(current, prompt, plen);
/* Now the current buffer content */
}
if (ch < ' ') {
/* A control character, so write the buffer so far */
- IGNORE_RC(write(current->fd, buf, b));
+ outputChars(current, buf, b);
buf += b + w;
b = 0;
- fd_printf(current->fd, "\033[7m^%c\033[0m", ch + '@');
+ outputControlChar(current, ch + '@');
if (i < pos) {
backup++;
}
b += w;
}
}
- IGNORE_RC(write(current->fd, buf, b));
+ outputChars(current, buf, b);
/* Erase to right, move cursor to original position */
- fd_printf(current->fd, "\x1b[0K" "\x1b[0G\x1b[%dC", pos + pchars + backup);
+ eraseEol(current);
+ setCursorPos(current, pos + pchars + backup);
}
static void set_current(struct current *current, const char *str)
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)
{
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);
+
+#ifdef USE_TERMIOS
+ /* 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");
+ }
+ }
+#endif
+
/* 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--;
}
- 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)
{
char buf[3];
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;
+
+#ifdef USE_TERMIOS
+ /* 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;
+ }
+ }
+#endif
+
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;
}
+/**
+ * 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;
+ while (n-- && remove_char(current, pos)) {
+ removed++;
+ }
+ return removed;
+}
+
#ifndef NO_COMPLETION
static linenoiseCompletionCallback *completionCallback = NULL;
static void beep() {
+#ifdef USE_TERMIOS
fprintf(stderr, "\x7");
fflush(stderr);
+#endif
}
static void freeCompletions(linenoiseCompletions *lc) {
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;
tmp.buf = lc.cvec[i];
tmp.pos = tmp.len = strlen(tmp.buf);
tmp.chars = utf8_strlen(tmp.buf, tmp.len);
- refreshLine(prompt, &tmp);
+ refreshLine(current->prompt, &tmp);
} else {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
- c = fd_read(current->fd);
- if (c < 0) {
+ c = fd_read(current);
+ if (c == -1) {
break;
}
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 */
-static int remove_chars(struct current *current, int pos, int n)
-{
- int removed = 0;
- while (n-- && remove_char(current, pos)) {
- removed++;
- }
- return removed;
-}
-
-/**
- * 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;
-}
-
-/**
- * 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
-}
-
-/* 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(const char *prompt, struct current *current) {
+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 c = fd_read(current->fd);
+ int dir = -1;
+ int c = fd_read(current);
#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 */
process_char:
if (c == -1) return current->len;
+#ifdef USE_TERMIOS
+ if (c == 27) { /* escape sequence */
+ c = check_special(current->fd);
+ }
+#endif
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 */
free(history[history_len]);
return -1;
}
- /* Otherwise delete char to right of cursor */
- if (remove_char(current, current->pos)) {
- refreshLine(prompt, current);
+ /* Otherwise fall through to delete char to right of cursor */
+ case SPECIAL_DELETE:
+ if (remove_char(current, current->pos) == 1) {
+ refreshLine(current->prompt, current);
}
break;
case ctrl('W'): /* ctrl-w */
}
if (remove_chars(current, pos, current->pos - pos)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
}
break;
snprintf(rprompt, sizeof(rprompt), "(reverse-i-search)'%s': ", rbuf);
refreshLine(rprompt, current);
- c = fd_read(current->fd);
+ c = fd_read(current);
if (c == ctrl('H') || c == 127) {
if (rchars) {
int p = utf8_index(rbuf, --rchars);
}
continue;
}
+#ifdef USE_TERMIOS
if (c == 27) {
c = check_special(current->fd);
}
+#endif
if (c == ctrl('P') || c == SPECIAL_UP) {
/* Search for the previous (earlier) match */
if (searchpos > 0) {
c = 0;
}
/* Go process the char normally */
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
goto process_char;
}
break;
c = get_char(current, current->pos);
remove_char(current, current->pos);
insert_char(current, current->pos - 1, c);
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
break;
case ctrl('V'): /* ctrl-v */
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);
+ c = fd_read(current);
/* Remove the ^V first */
remove_char(current, current->pos - 1);
/* Insert the actual char */
insert_char(current, current->pos, c);
}
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
}
break;
- case ctrl('B'): /* ctrl-b */
- case ctrl('F'): /* ctrl-f */
- case ctrl('P'): /* ctrl-p */
- case ctrl('N'): /* ctrl-n */
- case 27: { /* escape sequence */
- int dir = -1;
- if (c == 27) {
- c = check_special(current->fd);
- }
- switch (c) {
- case ctrl('B'):
- case SPECIAL_LEFT:
- if (current->pos > 0) {
- current->pos--;
- refreshLine(prompt, current);
- }
- break;
- case ctrl('F'):
- case SPECIAL_RIGHT:
- if (current->pos < current->chars) {
- current->pos++;
- refreshLine(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(prompt, current);
- }
- break;
-
- case SPECIAL_DELETE:
- if (remove_char(current, current->pos)) {
- refreshLine(prompt, current);
- }
- break;
+ case ctrl('B'):
+ case SPECIAL_LEFT:
+ if (current->pos > 0) {
+ current->pos--;
+ refreshLine(current->prompt, current);
}
+ break;
+ case ctrl('F'):
+ case SPECIAL_RIGHT:
+ if (current->pos < current->chars) {
+ current->pos++;
+ refreshLine(current->prompt, current);
}
break;
- default:
- /* Only tab is allowed without ^V */
- if (c == '\t' || c >= ' ') {
- if (insert_char(current, current->pos, c)) {
- refreshLine(prompt, current);
+ 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 ctrl('A'): /* Ctrl+a, go to the start of the line */
+ case SPECIAL_HOME:
+ current->pos = 0;
+ refreshLine(current->prompt, current);
+ break;
+ case ctrl('E'): /* ctrl+e, go to the end of the line */
+ case SPECIAL_END:
+ current->pos = current->chars;
+ 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->chars - current->pos)) {
- refreshLine(prompt, current);
+ refreshLine(current->prompt, current);
}
break;
- case ctrl('A'): /* Ctrl+a, go to the start of the line */
- current->pos = 0;
- refreshLine(prompt, current);
- break;
- case ctrl('E'): /* ctrl+e, go to the end of the line */
- current->pos = current->chars;
- refreshLine(prompt, current);
- break;
case ctrl('L'): /* Ctrl+L, clear screen */
- /* clear screen */
- fd_printf(current->fd, "\x1b[H\x1b[2J");
- refreshLine(prompt, current);
+ clearScreen(current);
+ /* Force recalc of window size for serial terminals */
+ current->cols = 0;
+ refreshLine(current->prompt, current);
+ break;
+ default:
+ /* Only tab is allowed without ^V */
+ if (c == '\t' || c >= ' ') {
+ if (insert_char(current, current->pos, c) == 1) {
+ refreshLine(current->prompt, current);
+ }
+ }
break;
}
}
return current->len;
}
-static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) {
- int fd = STDIN_FILENO;
+char *linenoise(const char *prompt)
+{
int count;
+ struct current current;
+ char buf[LINENOISE_MAX_LINE];
- if (buflen == 0) {
- errno = EINVAL;
- return -1;
- }
- if (!isatty(STDIN_FILENO)) {
- if (fgets(buf, buflen, stdin) == NULL) return -1;
+ if (enableRawMode(¤t) == -1) {
+ printf("%s", prompt);
+ fflush(stdout);
+ if (fgets(buf, sizeof(buf), stdin) == NULL) {
+ return NULL;
+ }
count = strlen(buf);
if (count && buf[count-1] == '\n') {
count--;
buf[count] = '\0';
}
- } else {
- struct current current;
-
- if (enableRawMode(fd) == -1) return -1;
-
- current.fd = fd;
+ }
+ else
+ {
current.buf = buf;
- current.bufmax = buflen;
+ current.bufmax = sizeof(buf);
current.len = 0;
current.chars = 0;
current.pos = 0;
- current.cols = 0;
-
- count = linenoisePrompt(prompt, ¤t);
- disableRawMode(fd);
+ current.prompt = prompt;
+ count = linenoisePrompt(¤t);
+ disableRawMode(¤t);
printf("\n");
- }
- return count;
-}
-
-char *linenoise(const char *prompt) {
- char buf[LINENOISE_MAX_LINE];
- int count;
-
- if (isUnsupportedTerm()) {
- size_t len;
-
- printf("%s",prompt);
- fflush(stdout);
- if (fgets(buf,LINENOISE_MAX_LINE,stdin) == NULL) return NULL;
- len = strlen(buf);
- while(len && (buf[len-1] == '\n' || buf[len-1] == '\r')) {
- len--;
- buf[len] = '\0';
+ if (count == -1) {
+ return NULL;
}
- return strdup(buf);
- } else {
- count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt);
- if (count == -1) return NULL;
- return strdup(buf);
}
+ return strdup(buf);
}
/* Using a circular buffer is smarter, but a bit more complex to handle. */
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));
}
+
+ /* do not insert duplicate lines into history */
+ if (history_len > 0 && strcmp(line, history[history_len - 1]) == 0) {
+ return 0;
+ }
+
linecopy = strdup(line);
if (!linecopy) return 0;
if (history_len == 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];