Merge branch 'master' into inp-utf8

This commit is contained in:
James Booth
2015-01-15 01:31:23 +00:00
4 changed files with 16 additions and 12 deletions

View File

@@ -174,7 +174,7 @@ ui_close(void)
endwin();
}
wint_t
gboolean
ui_get_char(char *input, int *size)
{
int result = 0;
@@ -193,7 +193,11 @@ ui_get_char(char *input, int *size)
ui_input_nonblocking(FALSE);
}
return ch;
if (ch == '\n') {
input[*size++] = '\0';
}
return (ch != '\n');
}
void

View File

@@ -229,7 +229,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
void ui_about(void);
void ui_statusbar_new(const int win);
wint_t ui_get_char(char *input, int *size);
gboolean ui_get_char(char *input, int *size);
void ui_input_clear(void);
void ui_input_nonblocking(gboolean);
void ui_replace_input(char *input, const char * const new_input, int *size);