aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Removed result from main loop

Browse Source
This commit is contained in:
James Booth 2015-01-14 23:57:45 +00:00
parent a6160d52c6
commit 3984c660b6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/profanity.c
View File

@ -99,7 +99,6 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
while(cmd_result == TRUE) { while(cmd_result == TRUE) {
wint_t ch = ERR; wint_t ch = ERR;
int result;
size = 0; size = 0;
while(ch != '\n') { while(ch != '\n') {
@ -116,9 +115,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
g_timer_start(timer); g_timer_start(timer);
} }
ch = ui_get_char(inp, &size, &result); ch = ui_get_char(inp, &size);
ui_handle_special_keys(ch, result);
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
otr_poll(); otr_poll();
#endif #endif

9
src/ui/core.c
View File

@ -175,16 +175,19 @@ ui_close(void)
} }
wint_t wint_t
ui_get_char(char *input, int *size, int *result) ui_get_char(char *input, int *size)
{ {
wint_t ch = inp_get_char(input, size, result); int result = 0;
if (ch != ERR && *result != ERR) { wint_t ch = inp_get_char(input, size, &result);
if (ch != ERR && result != ERR) {
ui_reset_idle_time(); ui_reset_idle_time();
ui_input_nonblocking(TRUE); ui_input_nonblocking(TRUE);
} else { } else {
ui_input_nonblocking(FALSE); ui_input_nonblocking(FALSE);
} }
ui_handle_special_keys(ch, result);
return ch; return ch;
} }

2
src/ui/ui.h
View File

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

2
tests/ui/stub_ui.c
View File

@ -325,7 +325,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
void ui_about(void) {} void ui_about(void) {}
void ui_statusbar_new(const int win) {} void ui_statusbar_new(const int win) {}
wint_t ui_get_char(char *input, int *size, int *result) wint_t ui_get_char(char *input, int *size)
{ {
return 0; return 0;
} }