diff options
author | James Booth <boothj5@gmail.com> | 2015-01-15 23:45:18 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-01-15 23:45:18 +0000 |
commit | 9083bfdb5c7fa166802f1839442a045ecb61f7e9 (patch) | |
tree | 0b26e03c75b51b6f6c1811969a2d4c54df72bbdc /src/ui/core.c | |
parent | bb11dc097320443c810ea0572f7b988bfa48e4a4 (diff) | |
parent | 51105720ab32faa4548655266ca0ae4c661f0701 (diff) | |
download | profani-tty-9083bfdb5c7fa166802f1839442a045ecb61f7e9.tar.gz |
Merge branch 'master' into inp-utf8
Conflicts: src/ui/inputwin.c
Diffstat (limited to 'src/ui/core.c')
-rw-r--r-- | src/ui/core.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index 9ded610b..69701616 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -74,7 +74,6 @@ static char *win_title; -static char line[INP_WIN_MAX]; static int inp_size; #ifdef HAVE_LIBXSS @@ -183,8 +182,8 @@ ui_readline(void) { int key_type; wint_t ch; - inp_get_char(line, &key_type, &ch); + char *line = inp_get_char(&key_type, &ch); _win_handle_switch(ch); ProfWin *current = wins_get_current(); @@ -201,11 +200,7 @@ ui_readline(void) ui_input_nonblocking(FALSE); } - if (ch == '\n') { - return line; - } else { - return NULL; - } + return line; } void |