diff options
author | James Booth <boothj5@gmail.com> | 2017-01-20 21:03:55 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2017-01-20 21:03:55 +0000 |
commit | c8874cd2e0c7a62eff66cb19acd40e36750d1b50 (patch) | |
tree | 751cbd7e32d36f905196b9739658299891430992 /src/ui | |
parent | ab1441a25cbbbcced83f60587d43dc2432e8f09d (diff) | |
download | profani-tty-c8874cd2e0c7a62eff66cb19acd40e36750d1b50.tar.gz |
Allow chat prefix char to be set by plugins
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/chatwin.c | 40 | ||||
-rw-r--r-- | src/ui/ui.h | 4 | ||||
-rw-r--r-- | src/ui/win_types.h | 2 | ||||
-rw-r--r-- | src/ui/window.c | 11 |
4 files changed, 55 insertions, 2 deletions
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index 74acd79b..646ef578 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -299,7 +299,9 @@ chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, assert(chatwin != NULL); char enc_char = '-'; - if (enc_mode == PROF_MSG_OTR) { + if (chatwin->outgoing_char) { + enc_char = chatwin->outgoing_char[0]; + } else if (enc_mode == PROF_MSG_OTR) { enc_char = prefs_get_otr_char(); } else if (enc_mode == PROF_MSG_PGP) { enc_char = prefs_get_pgp_char(); @@ -403,6 +405,42 @@ chatwin_unset_enctext(ProfChatWin *chatwin) } } +void +chatwin_set_incoming_char(ProfChatWin *chatwin, const char *const ch) +{ + if (chatwin->incoming_char) { + free(chatwin->incoming_char); + } + chatwin->incoming_char = strdup(ch); +} + +void +chatwin_unset_incoming_char(ProfChatWin *chatwin) +{ + if (chatwin->incoming_char) { + free(chatwin->incoming_char); + chatwin->incoming_char = NULL; + } +} + +void +chatwin_set_outgoing_char(ProfChatWin *chatwin, const char *const ch) +{ + if (chatwin->outgoing_char) { + free(chatwin->outgoing_char); + } + chatwin->outgoing_char = strdup(ch); +} + +void +chatwin_unset_outgoing_char(ProfChatWin *chatwin) +{ + if (chatwin->outgoing_char) { + free(chatwin->outgoing_char); + chatwin->outgoing_char = NULL; + } +} + static void _chatwin_history(ProfChatWin *chatwin, const char *const contact) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 56f9f4a3..336e820b 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -142,6 +142,10 @@ void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, voi #endif void chatwin_set_enctext(ProfChatWin *chatwin, const char *const enctext); void chatwin_unset_enctext(ProfChatWin *chatwin); +void chatwin_set_incoming_char(ProfChatWin *chatwin, const char *const ch); +void chatwin_unset_incoming_char(ProfChatWin *chatwin); +void chatwin_set_outgoing_char(ProfChatWin *chatwin, const char *const ch); +void chatwin_unset_outgoing_char(ProfChatWin *chatwin); // MUC window void mucwin_role_change(ProfMucWin *mucwin, const char *const role, const char *const actor, const char *const reason); diff --git a/src/ui/win_types.h b/src/ui/win_types.h index 56e6d129..b19822d5 100644 --- a/src/ui/win_types.h +++ b/src/ui/win_types.h @@ -156,6 +156,8 @@ typedef struct prof_chat_win_t { gboolean history_shown; unsigned long memcheck; char *enctext; + char *incoming_char; + char *outgoing_char; } ProfChatWin; typedef struct prof_muc_win_t { diff --git a/src/ui/window.c b/src/ui/window.c index 83172bbf..85e2b73f 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -147,6 +147,8 @@ win_create_chat(const char *const barejid) new_win->unread = 0; new_win->state = chat_state_new(); new_win->enctext = NULL; + new_win->incoming_char = NULL; + new_win->outgoing_char = NULL; new_win->memcheck = PROFCHATWIN_MEMCHECK; @@ -432,6 +434,8 @@ win_free(ProfWin* window) free(chatwin->barejid); free(chatwin->resource_override); free(chatwin->enctext); + free(chatwin->incoming_char); + free(chatwin->outgoing_char); chat_state_free(chatwin->state); break; } @@ -996,13 +1000,18 @@ win_print_incoming(ProfWin *window, GDateTime *timestamp, switch (window->type) { case WIN_CHAT: - if (enc_mode == PROF_MSG_OTR) { + { + ProfChatWin *chatwin = (ProfChatWin*)window; + if (chatwin->incoming_char) { + enc_char = chatwin->incoming_char[0]; + } else if (enc_mode == PROF_MSG_OTR) { enc_char = prefs_get_otr_char(); } else if (enc_mode == PROF_MSG_PGP) { enc_char = prefs_get_pgp_char(); } _win_printf(window, enc_char, 0, timestamp, NO_ME, THEME_TEXT_THEM, from, "%s", message); break; + } case WIN_PRIVATE: _win_printf(window, '-', 0, timestamp, NO_ME, THEME_TEXT_THEM, from, "%s", message); break; |