From 11d849aa7ffb1d2f2dffac11d51f0f73728745a8 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 9 Jul 2020 15:44:35 +0200 Subject: Dont hilight console once all messages have been read If we receive a message we get: << room message: eagle@conference.anoxinon.me (win 2) Same for private chats and regular chats. And several other kinds of notifications. If we only receive notifications from a chat window it would be nice to also clear the hilight on the console window since we already catched up by reading the actual message in the chat window. Probably not the best description :-) I hope you get it.. Regards https://github.com/profanity-im/profanity/issues/1399 --- src/ui/chatwin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/chatwin.c') diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index f204e821..bfd4b316 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -132,7 +132,7 @@ chatwin_otr_secured(ProfChatWin* chatwin, gboolean trusted) ui_index = 0; } cons_show("%s started an OTR session (%d).", chatwin->barejid, ui_index); - cons_alert(); + cons_alert(window); } } -- cgit 1.4.1-2-gfad0 From 7b49fbdf4526c4ce4db28b3e41633dc8c1efb693 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 9 Jul 2020 16:11:06 +0200 Subject: Pass window to functions so we dont have to call twice --- src/event/server_events.c | 2 +- src/ui/chatwin.c | 2 +- src/ui/console.c | 23 +++++++++++------------ src/ui/privwin.c | 2 +- src/ui/ui.h | 6 +++--- 5 files changed, 17 insertions(+), 18 deletions(-) (limited to 'src/ui/chatwin.c') diff --git a/src/event/server_events.c b/src/event/server_events.c index 27357683..27f142eb 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -357,7 +357,7 @@ sv_ev_room_message(ProfMessage* message) flash(); } - cons_show_incoming_room_message(message->from_jid->resourcepart, mucwin->roomjid, num, mention, triggers, mucwin->unread); + cons_show_incoming_room_message(message->from_jid->resourcepart, mucwin->roomjid, num, mention, triggers, mucwin->unread, window); mucwin->unread++; diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index bfd4b316..1861232b 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -282,7 +282,7 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr // not currently viewing chat window with sender } else { status_bar_new(num, WIN_CHAT, chatwin->barejid); - cons_show_incoming_message(display_name, num, chatwin->unread); + cons_show_incoming_message(display_name, num, chatwin->unread, window); if (prefs_get_boolean(PREF_FLASH)) { flash(); diff --git a/src/ui/console.c b/src/ui/console.c index 89eebf35..2f81af04 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -308,11 +308,10 @@ _room_triggers_to_string(GList* triggers) void cons_show_incoming_room_message(const char* const nick, const char* const room, const int win_index, gboolean mention, - GList* triggers, int unread) + GList* triggers, int unread, ProfWin* const window) { ProfWin* const console = wins_get_console(); - // TODO: pass window and get ui index inside so tha cons_alert() can use window int ui_index = win_index; if (ui_index == 10) { ui_index = 0; @@ -330,27 +329,27 @@ cons_show_incoming_room_message(const char* const nick, const char* const room, } else { win_println(console, THEME_INCOMING, "-", "<< room message: %s in %s (win %d)", nick, room, ui_index); } - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } else if (g_strcmp0(muc_show, "first") == 0) { if (mention) { win_println(console, THEME_MENTION, "-", "<< room mention: %s in %s (win %d)", nick, room, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } else if (triggers) { char* triggers_str = _room_triggers_to_string(triggers); win_println(console, THEME_TRIGGER, "-", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index); free(triggers_str); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } else if (unread == 0) { win_println(console, THEME_INCOMING, "-", "<< room message: %s (win %d)", room, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } } g_free(muc_show); } void -cons_show_incoming_message(const char* const short_from, const int win_index, int unread) +cons_show_incoming_message(const char* const short_from, const int win_index, int unread, ProfWin* const window) { ProfWin* console = wins_get_console(); @@ -362,17 +361,17 @@ cons_show_incoming_message(const char* const short_from, const int win_index, in char* chat_show = prefs_get_string(PREF_CONSOLE_CHAT); if (g_strcmp0(chat_show, "all") == 0) { win_println(console, THEME_INCOMING, "-", "<< chat message: %s (win %d)", short_from, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } else if ((g_strcmp0(chat_show, "first") == 0) && unread == 0) { win_println(console, THEME_INCOMING, "-", "<< chat message: %s (win %d)", short_from, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } g_free(chat_show); } void -cons_show_incoming_private_message(const char* const nick, const char* const room, const int win_index, int unread) +cons_show_incoming_private_message(const char* const nick, const char* const room, const int win_index, int unread, ProfWin* const window) { ProfWin* console = wins_get_console(); @@ -384,10 +383,10 @@ cons_show_incoming_private_message(const char* const nick, const char* const roo char* priv_show = prefs_get_string(PREF_CONSOLE_PRIVATE); if (g_strcmp0(priv_show, "all") == 0) { win_println(console, THEME_INCOMING, "-", "<< private message: %s in %s (win %d)", nick, room, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } else if ((g_strcmp0(priv_show, "first") == 0) && unread == 0) { win_println(console, THEME_INCOMING, "-", "<< private message: %s in %s (win %d)", nick, room, ui_index); - cons_alert(wins_get_by_num(ui_index)); + cons_alert(window); } g_free(priv_show); diff --git a/src/ui/privwin.c b/src/ui/privwin.c index e4e6e29a..23fde3e7 100644 --- a/src/ui/privwin.c +++ b/src/ui/privwin.c @@ -68,7 +68,7 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message) // not currently viewing chat window with sender } else { status_bar_new(num, WIN_PRIVATE, privatewin->fulljid); - cons_show_incoming_private_message(jidp->resourcepart, jidp->barejid, num, privatewin->unread); + cons_show_incoming_private_message(jidp->resourcepart, jidp->barejid, num, privatewin->unread, window); win_insert_last_read_position_marker((ProfWin*)privatewin, privatewin->fulljid); win_print_incoming(window, jidp->resourcepart, message); diff --git a/src/ui/ui.h b/src/ui/ui.h index e293e22c..f9fe3cf3 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -275,9 +275,9 @@ void cons_show_room_invite(const char* const invitor, const char* const room, co void cons_check_version(gboolean not_available_msg); void cons_show_typing(const char* const barejid); void cons_show_incoming_room_message(const char* const nick, const char* const room, const int win_index, - gboolean mention, GList* triggers, int unread); -void cons_show_incoming_message(const char* const short_from, const int win_index, int unread); -void cons_show_incoming_private_message(const char* const nick, const char* const room, const int win_index, int unread); + gboolean mention, GList* triggers, int unread, ProfWin* const window); +void cons_show_incoming_message(const char* const short_from, const int win_index, int unread, ProfWin* const window); +void cons_show_incoming_private_message(const char* const nick, const char* const room, const int win_index, int unread, ProfWin* const window); void cons_show_room_invites(GList* invites); void cons_show_received_subs(void); void cons_show_sent_subs(void); -- cgit 1.4.1-2-gfad0