diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/core.c | 4 | ||||
| -rw-r--r-- | src/ui/inputwin.c | 8 | ||||
| -rw-r--r-- | src/ui/window.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index 3b10888b..5ce42e50 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -144,10 +144,8 @@ ui_update(void) doupdate(); if (perform_resize) { - signal(SIGWINCH, SIG_IGN); - ui_resize(); perform_resize = FALSE; - signal(SIGWINCH, ui_sigwinch_handler); + ui_resize(); } } diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 6fffad22..4a6cae27 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -434,13 +434,18 @@ _inp_rl_addfuncs(void) rl_add_funmap_entry("prof_win_prev", _inp_rl_win_prev_handler); rl_add_funmap_entry("prof_win_next", _inp_rl_win_next_handler); rl_add_funmap_entry("prof_win_next_unread", _inp_rl_win_next_unread_handler); + rl_add_funmap_entry("prof_win_set_attention", _inp_rl_win_attention_handler); + rl_add_funmap_entry("prof_win_attention_next", _inp_rl_win_attention_next_handler); rl_add_funmap_entry("prof_win_pageup", _inp_rl_win_pageup_handler); rl_add_funmap_entry("prof_win_pagedown", _inp_rl_win_pagedown_handler); rl_add_funmap_entry("prof_subwin_pageup", _inp_rl_subwin_pageup_handler); rl_add_funmap_entry("prof_subwin_pagedown", _inp_rl_subwin_pagedown_handler); + rl_add_funmap_entry("prof_complete_next", _inp_rl_tab_handler); + rl_add_funmap_entry("prof_complete_prev", _inp_rl_shift_tab_handler); rl_add_funmap_entry("prof_win_clear", _inp_rl_win_clear_handler); rl_add_funmap_entry("prof_win_close", _inp_rl_win_close_handler); rl_add_funmap_entry("prof_send_to_editor", _inp_rl_send_to_editor); + rl_add_funmap_entry("prof_cut_to_history", _inp_rl_down_arrow_handler); } // Readline callbacks @@ -483,10 +488,12 @@ _inp_rl_startup_hook(void) rl_bind_keyseq("\\e[1;9D", _inp_rl_win_prev_handler); rl_bind_keyseq("\\e[1;3D", _inp_rl_win_prev_handler); rl_bind_keyseq("\\e\\e[D", _inp_rl_win_prev_handler); + rl_bind_keyseq("\\e\\eOD", _inp_rl_win_prev_handler); rl_bind_keyseq("\\e[1;9C", _inp_rl_win_next_handler); rl_bind_keyseq("\\e[1;3C", _inp_rl_win_next_handler); rl_bind_keyseq("\\e\\e[C", _inp_rl_win_next_handler); + rl_bind_keyseq("\\e\\eOC", _inp_rl_win_next_handler); rl_bind_keyseq("\\ea", _inp_rl_win_next_unread_handler); rl_bind_keyseq("\\ev", _inp_rl_win_attention_handler); @@ -510,6 +517,7 @@ _inp_rl_startup_hook(void) rl_bind_keyseq("\\e[Z", _inp_rl_shift_tab_handler); rl_bind_keyseq("\\e[1;5B", _inp_rl_down_arrow_handler); // ctrl+arrow down + rl_bind_keyseq("\\eOb", _inp_rl_down_arrow_handler); // unbind unwanted mappings rl_bind_keyseq("\\e=", NULL); diff --git a/src/ui/window.c b/src/ui/window.c index 7952497c..5ba2281d 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -415,6 +415,7 @@ win_get_last_sent_message(ProfWin* window) ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); last_message = mucwin->last_message; + break; } default: break; @@ -1578,7 +1579,7 @@ _win_print_internal(ProfWin* window, const char* show_char, int pad_indent, GDat char* color_pref = prefs_get_string(PREF_COLOR_NICK); if (color_pref != NULL && (strcmp(color_pref, "false") != 0)) { - if (flags & NO_ME || (!(flags & NO_ME) && prefs_get_boolean(PREF_COLOR_NICK_OWN))) { + if ((flags & NO_ME) || (!(flags & NO_ME) && prefs_get_boolean(PREF_COLOR_NICK_OWN))) { colour = theme_hash_attrs(from); } } @@ -2033,8 +2034,8 @@ win_quote_autocomplete(ProfWin* window, const char* const input, gboolean previo return NULL; } - gchar **parts = g_strsplit(result, "\n", -1); - gchar *quoted_result = g_strjoinv("\n> ", parts); + gchar** parts = g_strsplit(result, "\n", -1); + gchar* quoted_result = g_strjoinv("\n> ", parts); GString* replace_with = g_string_new("> "); g_string_append(replace_with, quoted_result); |