-/*
- * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file interactive.c Readline abstraction for interactive sessions. */
bool caught_sigterm;
Keymap standard_km;
Keymap bare_km;
+ int fd_flags[2];
};
static struct i9e_private i9e_private, *i9ep = &i9e_private;
* running.
*
* \return A negative return value of zero means the i9e task terminated. Only
- * in this case it is safe to call ie9_close().
+ * in this case it is safe to call i9e_close().
*/
int i9e_get_error(void)
{
if (hf)
write_history(hf);
wipe_bottom_line();
+ fcntl(i9ep->ici->fds[0], F_SETFL, i9ep->fd_flags[0]);
+ fcntl(i9ep->ici->fds[1], F_SETFL, i9ep->fd_flags[1]);
}
static void clear_bottom_line(void)
memset(i9ep, 0, sizeof(struct i9e_private));
if (!isatty(ici->fds[0]))
return -E_I9E_SETUPTERM;
+ ret = fcntl(ici->fds[0], F_GETFL);
+ if (ret < 0)
+ return -E_I9E_SETUPTERM;
+ i9ep->fd_flags[0] = ret;
+ ret = fcntl(ici->fds[1], F_GETFL);
+ if (ret < 0)
+ return -E_I9E_SETUPTERM;
+ i9ep->fd_flags[1] = ret;
ret = mark_fd_nonblocking(ici->fds[0]);
if (ret < 0)
return ret;
* the given text. If the length of this text exceeds the width of the
* terminal, the text is shortened by leaving out a part in the middle.
*/
-void ie9_print_status_bar(char *buf, unsigned len)
+void i9e_print_status_bar(char *buf, unsigned len)
{
size_t x = i9ep->num_columns, y = (x - 4) / 2;
ci.argc = create_argv(ci.buffer, " ", &ci.argv);
ci.word_num = compute_word_num(ci.buffer, " ", ci.point);
+ /* determine the current word to complete */
end = ci.buffer + ci.point;
+
+ if (*end == ' ') {
+ if (ci.point == 0 || ci.buffer[ci.point - 1] == ' ') {
+ ci.word = para_strdup(NULL);
+ goto create_matches;
+ } else /* The cursor is positioned right after a word */
+ end--;
+ }
for (p = end; p > ci.buffer && *p != ' '; p--)
; /* nothing */
if (*p == ' ')
p++;
-
n = end - p + 1;
ci.word = para_malloc(n + 1);
strncpy(ci.word, p, n);
ci.word[n] = '\0';
-
+create_matches:
PARA_DEBUG_LOG("line: %s, point: %d (%c), wordnum: %d, word: %s\n",
ci.buffer, ci.point, ci.buffer[ci.point], ci.word_num, ci.word);
if (ci.word_num == 0)