int pos; /* Cursor position, measured in chars */
int cols; /* Size of the window, in chars */
const char *prompt;
+ char *capture; /* Allocated capture buffer, or NULL for none. Always null terminated */
#if defined(USE_TERMIOS)
int fd; /* Terminal fd */
#elif defined(USE_WINCONSOLE)
if (term) {
int j;
for (j = 0; unsupported_term[j]; j++) {
- if (strcasecmp(term, unsupported_term[j]) == 0) {
+ if (strcmp(term, unsupported_term[j]) == 0) {
return 1;
}
}
struct termios raw;
current->fd = STDIN_FILENO;
+ current->cols = 0;
if (!isatty(current->fd) || isUnsupportedTerm() ||
tcgetattr(current->fd, &orig_termios) == -1) {
goto fatal;
}
rawmode = 1;
-
- current->cols = 0;
return 0;
}
#endif
}
+static int countColorControlChars(const char* prompt)
+{
+ /* ANSI color control sequences have the form:
+ * "\x1b" "[" [0-9;]* "m"
+ * We parse them with a simple state machine.
+ */
+
+ enum {
+ search_esc,
+ expect_bracket,
+ expect_trail
+ } state = search_esc;
+ int len = 0, found = 0;
+ char ch;
+
+ /* XXX: Strictly we should be checking utf8 chars rather than
+ * bytes in case of the extremely unlikely scenario where
+ * an ANSI sequence is part of a utf8 sequence.
+ */
+ while ((ch = *prompt++) != 0) {
+ switch (state) {
+ case search_esc:
+ if (ch == '\x1b') {
+ state = expect_bracket;
+ }
+ break;
+ case expect_bracket:
+ if (ch == '[') {
+ state = expect_trail;
+ /* 3 for "\e[ ... m" */
+ len = 3;
+ break;
+ }
+ state = search_esc;
+ break;
+ case expect_trail:
+ if ((ch == ';') || ((ch >= '0' && ch <= '9'))) {
+ /* 0-9, or semicolon */
+ len++;
+ break;
+ }
+ if (ch == 'm') {
+ found += len;
+ }
+ state = search_esc;
+ break;
+ }
+ }
+
+ return found;
+}
+
static int getWindowSize(struct current *current)
{
struct winsize ws;
return -1;
}
+static int countColorControlChars(const char* prompt)
+{
+ /* For windows we assume that there are no embedded ansi color
+ * control sequences.
+ */
+ return 0;
+}
+
static int getWindowSize(struct current *current)
{
CONSOLE_SCREEN_BUFFER_INFO info;
plen = strlen(prompt);
pchars = utf8_strlen(prompt, plen);
+ /* Scan the prompt for embedded ansi color control sequences and
+ * discount them as characters/columns.
+ */
+ pchars -= countColorControlChars(prompt);
+
/* Account for a line which is too long to fit in the window.
* Note that control chars require an extra column
*/
}
}
- /* If too many are need, strip chars off the front of 'buf'
+ /* If too many are needed, 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.
*/
}
/**
+ * Captures up to 'n' characters starting at 'pos' for the cut buffer.
+ *
+ * This replaces any existing characters in the cut buffer.
+ */
+static void capture_chars(struct current *current, int pos, int n)
+{
+ if (pos >= 0 && (pos + n - 1) < current->chars) {
+ int p1 = utf8_index(current->buf, pos);
+ int nbytes = utf8_index(current->buf + p1, n);
+
+ if (nbytes) {
+ free(current->capture);
+ /* Include space for the null terminator */
+ current->capture = (char *)malloc(nbytes + 1);
+ memcpy(current->capture, current->buf + p1, nbytes);
+ current->capture[nbytes] = '\0';
+ }
+ }
+}
+
+/**
+ * Removes up to 'n' characters at cursor position 'pos'.
+ *
* 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;
+
+ /* First save any chars which will be removed */
+ capture_chars(current, pos, n);
+
while (n-- && remove_char(current, pos)) {
removed++;
}
return removed;
}
+/**
+ * Inserts the characters (string) 'chars' at the cursor position 'pos'.
+ *
+ * Returns 0 if no chars were inserted or non-zero otherwise.
+ */
+static int insert_chars(struct current *current, int pos, const char *chars)
+{
+ int inserted = 0;
+
+ while (*chars) {
+ int ch;
+ int n = utf8_tounicode(chars, &ch);
+ if (insert_char(current, pos, ch) == 0) {
+ break;
+ }
+ inserted++;
+ pos++;
+ chars += n;
+ }
+ return inserted;
+}
#ifndef NO_COMPLETION
static linenoiseCompletionCallback *completionCallback = NULL;
#endif
-static int linenoisePrompt(struct current *current) {
+static int linenoiseEdit(struct current *current) {
int history_index = 0;
/* The latest history entry is always our current buffer, that
* Future possibility: Toggle Insert/Overwrite Modes
*/
break;
- case ctrl('W'): /* ctrl-w */
+ case ctrl('W'): /* ctrl-w, delete word at left. save deleted chars */
/* eat any spaces on the left */
{
int pos = current->pos;
current->pos = current->chars;
refreshLine(current->prompt, current);
break;
- case ctrl('U'): /* Ctrl+u, delete to beginning of line. */
+ case ctrl('U'): /* Ctrl+u, delete to beginning of line, save deleted chars. */
if (remove_chars(current, 0, current->pos)) {
refreshLine(current->prompt, current);
}
break;
- case ctrl('K'): /* Ctrl+k, delete from current to end of line. */
+ case ctrl('K'): /* Ctrl+k, delete from current to end of line, save deleted chars. */
if (remove_chars(current, current->pos, current->chars - current->pos)) {
refreshLine(current->prompt, current);
}
break;
+ case ctrl('Y'): /* Ctrl+y, insert saved chars at current position */
+ if (current->capture && insert_chars(current, current->pos, current->capture)) {
+ refreshLine(current->prompt, current);
+ }
+ break;
case ctrl('L'): /* Ctrl+L, clear screen */
clearScreen(current);
/* Force recalc of window size for serial terminals */
return current->len;
}
+int linenoiseColumns(void)
+{
+ struct current current;
+ enableRawMode (¤t);
+ getWindowSize (¤t);
+ disableRawMode (¤t);
+ return current.cols;
+}
+
char *linenoise(const char *prompt)
{
int count;
current.chars = 0;
current.pos = 0;
current.prompt = prompt;
+ current.capture = NULL;
+
+ count = linenoiseEdit(¤t);
- count = linenoisePrompt(¤t);
disableRawMode(¤t);
printf("\n");
+
+ free(current.capture);
if (count == -1) {
return NULL;
}
newHistory = (char **)malloc(sizeof(char*)*len);
if (newHistory == NULL) return 0;
- if (len < tocopy) tocopy = len;
- memcpy(newHistory,history+(history_max_len-tocopy), sizeof(char*)*tocopy);
+
+ /* If we can't copy everything, free the elements we'll not use. */
+ if (len < tocopy) {
+ int j;
+
+ for (j = 0; j < tocopy-len; j++) free(history[j]);
+ tocopy = len;
+ }
+ memset(newHistory,0,sizeof(char*)*len);
+ memcpy(newHistory,history+(history_len-tocopy), sizeof(char*)*tocopy);
free(history);
history = newHistory;
}
projects / linenoise.git / blobdiff