Merge branch 'master' into inp-utf8

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

View File

@@ -73,6 +73,7 @@
#include "xmpp/xmpp.h"
static char *win_title;
static int inp_size;
#ifdef HAVE_LIBXSS
static Display *display;
@@ -108,6 +109,7 @@ ui_init(void)
display = XOpenDisplay(0);
#endif
ui_idle_time = g_timer_new();
inp_size = 0;
ProfWin *window = wins_get_current();
win_update_virtual(window);
}
@@ -175,10 +177,10 @@ ui_close(void)
}
gboolean
ui_get_char(char *input, int *size)
ui_get_char(char *input)
{
int result = 0;
wint_t ch = inp_get_char(input, size, &result);
wint_t ch = inp_get_char(input, &inp_size, &result);
_win_handle_switch(ch);
ProfWin *current = wins_get_current();
win_handle_page(current, ch, result);
@@ -194,7 +196,8 @@ ui_get_char(char *input, int *size)
}
if (ch == '\n') {
input[*size++] = '\0';
input[inp_size++] = '\0';
inp_size = 0;
}
return (ch != '\n');

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);
gboolean ui_get_char(char *input, int *size);
gboolean ui_get_char(char *input);
void ui_input_clear(void);
void ui_input_nonblocking(gboolean);
void ui_replace_input(char *input, const char * const new_input, int *size);