From 9cfd17821c427ae2c129842b5f626fbdb3a73a67 Mon Sep 17 00:00:00 2001 From: James Booth Date: Fri, 20 Jan 2017 23:26:14 +0000 Subject: Allow room display properies to be set by plugins --- src/plugins/api.c | 80 +++++++++++++++++++++++++++++++++++++++ src/plugins/api.h | 4 ++ src/plugins/c_api.c | 28 ++++++++++++++ src/plugins/profapi.c | 4 ++ src/plugins/profapi.h | 4 ++ src/plugins/python_api.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ui/mucwin.c | 49 ++++++++++++++++++++++-- src/ui/titlebar.c | 26 +++++++++++++ src/ui/ui.h | 4 ++ src/ui/win_types.h | 2 + src/ui/window.c | 20 ++++++---- src/ui/window.h | 6 +-- 12 files changed, 310 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/plugins/api.c b/src/plugins/api.c index d4109937..a1cbd35e 100644 --- a/src/plugins/api.c +++ b/src/plugins/api.c @@ -645,3 +645,83 @@ api_chat_unset_outgoing_char(const char *const barejid) return 1; } + +int +api_room_set_titlebar_enctext(const char *const roomjid, const char *const enctext) +{ + if (enctext == NULL) { + return 0; + } + + if (roomjid == NULL) { + return 0; + } + + ProfMucWin *mucwin = wins_get_muc(roomjid); + if (mucwin == NULL) { + return 0; + } + + mucwin_set_enctext(mucwin, enctext); + + return 1; +} + +int +api_room_unset_titlebar_enctext(const char *const roomjid) +{ + if (roomjid == NULL) { + return 0; + } + + ProfMucWin *mucwin = wins_get_muc(roomjid); + if (mucwin == NULL) { + return 0; + } + + mucwin_unset_enctext(mucwin); + + return 1; +} + +int +api_room_set_message_char(const char *const roomjid, const char *const ch) +{ + if (ch == NULL) { + return 0; + } + + if (strlen(ch) != 1) { + return 0; + } + + if (roomjid == NULL) { + return 0; + } + + ProfMucWin *mucwin = wins_get_muc(roomjid); + if (mucwin == NULL) { + return 0; + } + + mucwin_set_message_char(mucwin, ch); + + return 1; +} + +int +api_room_unset_message_char(const char *const roomjid) +{ + if (roomjid == NULL) { + return 0; + } + + ProfMucWin *mucwin = wins_get_muc(roomjid); + if (mucwin == NULL) { + return 0; + } + + mucwin_unset_message_char(mucwin); + + return 1; +} diff --git a/src/plugins/api.h b/src/plugins/api.h index 465365a0..75c159a3 100644 --- a/src/plugins/api.h +++ b/src/plugins/api.h @@ -104,5 +104,9 @@ int api_chat_set_incoming_char(const char *const barejid, const char *const ch); int api_chat_unset_incoming_char(const char *const barejid); int api_chat_set_outgoing_char(const char *const barejid, const char *const ch); int api_chat_unset_outgoing_char(const char *const barejid); +int api_room_set_titlebar_enctext(const char *const roomjid, const char *const enctext); +int api_room_unset_titlebar_enctext(const char *const roomjid); +int api_room_set_message_char(const char *const roomjid, const char *const ch); +int api_room_unset_message_char(const char *const roomjid); #endif diff --git a/src/plugins/c_api.c b/src/plugins/c_api.c index 6968657f..5cd23732 100644 --- a/src/plugins/c_api.c +++ b/src/plugins/c_api.c @@ -383,6 +383,30 @@ c_api_chat_unset_outgoing_char(const char *barejid) return api_chat_unset_outgoing_char(barejid); } +static int +c_api_room_set_titlebar_enctext(const char *roomjid, const char *enctext) +{ + return api_room_set_titlebar_enctext(roomjid, enctext); +} + +static int +c_api_room_unset_titlebar_enctext(const char *roomjid) +{ + return api_room_unset_titlebar_enctext(roomjid); +} + +static int +c_api_room_set_message_char(const char *roomjid, const char *ch) +{ + return api_room_set_message_char(roomjid, ch); +} + +static int +c_api_room_unset_message_char(const char *roomjid) +{ + return api_room_unset_message_char(roomjid); +} + void c_command_callback(PluginCommand *command, gchar **args) { @@ -457,6 +481,10 @@ c_api_init(void) prof_chat_unset_incoming_char = c_api_chat_unset_incoming_char; prof_chat_set_outgoing_char = c_api_chat_set_outgoing_char; prof_chat_unset_outgoing_char = c_api_chat_unset_outgoing_char; + prof_room_set_titlebar_enctext = c_api_room_set_titlebar_enctext; + prof_room_unset_titlebar_enctext = c_api_room_unset_titlebar_enctext; + prof_room_set_message_char = c_api_room_set_message_char; + prof_room_unset_message_char = c_api_room_unset_message_char; } static char * diff --git a/src/plugins/profapi.c b/src/plugins/profapi.c index c0085d64..e9d3cff6 100644 --- a/src/plugins/profapi.c +++ b/src/plugins/profapi.c @@ -101,3 +101,7 @@ int (*prof_chat_set_incoming_char)(const char *barejid, const char *ch) = NULL; int (*prof_chat_unset_incoming_char)(const char *barejid) = NULL; int (*prof_chat_set_outgoing_char)(const char *barejid, const char *ch) = NULL; int (*prof_chat_unset_outgoing_char)(const char *barejid) = NULL; +int (*prof_room_set_titlebar_enctext)(const char *roomjid, const char *enctext) = NULL; +int (*prof_room_unset_titlebar_enctext)(const char *roomjid) = NULL; +int (*prof_room_set_message_char)(const char *roomjid, const char *ch) = NULL; +int (*prof_room_unset_message_char)(const char *roomjid) = NULL; diff --git a/src/plugins/profapi.h b/src/plugins/profapi.h index ac71293a..d17152fc 100644 --- a/src/plugins/profapi.h +++ b/src/plugins/profapi.h @@ -113,5 +113,9 @@ int (*prof_chat_set_incoming_char)(const char *barejid, const char *ch); int (*prof_chat_unset_incoming_char)(const char *barejid); int (*prof_chat_set_outgoing_char)(const char *barejid, const char *ch); int (*prof_chat_unset_outgoing_char)(const char *barejid); +int (*prof_room_set_titlebar_enctext)(const char *roomjid, const char *enctext); +int (*prof_room_unset_titlebar_enctext)(const char *roomjid); +int (*prof_room_set_message_char)(const char *roomjid, const char *ch); +int (*prof_room_unset_message_char)(const char *roomjid); #endif diff --git a/src/plugins/python_api.c b/src/plugins/python_api.c index 4e6f4bb5..4e5bdfb5 100644 --- a/src/plugins/python_api.c +++ b/src/plugins/python_api.c @@ -1190,6 +1190,100 @@ python_api_chat_unset_outgoing_char(PyObject *self, PyObject *args) } } +static PyObject* +python_api_room_set_titlebar_enctext(PyObject *self, PyObject *args) +{ + PyObject *roomjid = NULL; + PyObject *enctext = NULL; + if (!PyArg_ParseTuple(args, "OO", &roomjid, &enctext)) { + Py_RETURN_NONE; + } + + char *roomjid_str = python_str_or_unicode_to_string(roomjid); + char *enctext_str = python_str_or_unicode_to_string(enctext); + + allow_python_threads(); + int res = api_room_set_titlebar_enctext(roomjid_str, enctext_str); + free(roomjid_str); + free(enctext_str); + disable_python_threads(); + + if (res) { + return Py_BuildValue("O", Py_True); + } else { + return Py_BuildValue("O", Py_False); + } +} + +static PyObject* +python_api_room_unset_titlebar_enctext(PyObject *self, PyObject *args) +{ + PyObject *roomjid = NULL; + if (!PyArg_ParseTuple(args, "O", &roomjid)) { + Py_RETURN_NONE; + } + + char *roomjid_str = python_str_or_unicode_to_string(roomjid); + + allow_python_threads(); + int res = api_room_unset_titlebar_enctext(roomjid_str); + free(roomjid_str); + disable_python_threads(); + + if (res) { + return Py_BuildValue("O", Py_True); + } else { + return Py_BuildValue("O", Py_False); + } +} + +static PyObject* +python_api_room_set_message_char(PyObject *self, PyObject *args) +{ + PyObject *roomjid = NULL; + PyObject *ch = NULL; + if (!PyArg_ParseTuple(args, "OO", &roomjid, &ch)) { + Py_RETURN_NONE; + } + + char *roomjid_str = python_str_or_unicode_to_string(roomjid); + char *ch_str = python_str_or_unicode_to_string(ch); + + allow_python_threads(); + int res = api_room_set_message_char(roomjid_str, ch_str); + free(roomjid_str); + free(ch_str); + disable_python_threads(); + + if (res) { + return Py_BuildValue("O", Py_True); + } else { + return Py_BuildValue("O", Py_False); + } +} + +static PyObject* +python_api_room_unset_message_char(PyObject *self, PyObject *args) +{ + PyObject *roomjid = NULL; + if (!PyArg_ParseTuple(args, "O", &roomjid)) { + Py_RETURN_NONE; + } + + char *roomjid_str = python_str_or_unicode_to_string(roomjid); + + allow_python_threads(); + int res = api_room_unset_message_char(roomjid_str); + free(roomjid_str); + disable_python_threads(); + + if (res) { + return Py_BuildValue("O", Py_True); + } else { + return Py_BuildValue("O", Py_False); + } +} + void python_command_callback(PluginCommand *command, gchar **args) { @@ -1305,6 +1399,10 @@ static PyMethodDef apiMethods[] = { { "chat_unset_incoming_char", python_api_chat_unset_incoming_char, METH_VARARGS, "Reset the incoming message prefix character for specified contact" }, { "chat_set_outgoing_char", python_api_chat_set_outgoing_char, METH_VARARGS, "Set the outgoing message prefix character for specified contact" }, { "chat_unset_outgoing_char", python_api_chat_unset_outgoing_char, METH_VARARGS, "Reset the outgoing message prefix character for specified contact" }, + { "room_set_titlebar_enctext", python_api_room_set_titlebar_enctext, METH_VARARGS, "Set the encryption status in the title bar for the specified room" }, + { "room_unset_titlebar_enctext", python_api_room_unset_titlebar_enctext, METH_VARARGS, "Reset the encryption status in the title bar for the specified room" }, + { "room_set_message_char", python_api_room_set_message_char, METH_VARARGS, "Set the message prefix character for specified room" }, + { "room_unset_message_char", python_api_room_unset_message_char, METH_VARARGS, "Reset the message prefix character for specified room" }, { NULL, NULL, 0, NULL } }; diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 676e3aed..e532871c 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -478,18 +478,23 @@ mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const mes ProfWin *window = (ProfWin*)mucwin; char *mynick = muc_nick(mucwin->roomjid); + char ch = '-'; + if (mucwin->message_char) { + ch = mucwin->message_char[0]; + } + if (g_strcmp0(nick, mynick) != 0) { if (g_slist_length(mentions) > 0) { - win_print_them(window, THEME_ROOMMENTION, nick); + win_print_them(window, THEME_ROOMMENTION, ch, nick); _mucwin_print_mention(window, message, mynick, mentions); } else if (triggers) { - win_print_them(window, THEME_ROOMTRIGGER, nick); + win_print_them(window, THEME_ROOMTRIGGER, ch, nick); _mucwin_print_triggers(window, message, triggers); } else { - win_println_them_message(window, nick, "%s", message); + win_println_them_message(window, ch, nick, "%s", message); } } else { - win_println_me_message(window, mynick, "%s", message); + win_println_me_message(window, ch, mynick, "%s", message); } } @@ -860,3 +865,39 @@ mucwin_get_string(ProfMucWin *mucwin) return resstr; } + +void +mucwin_set_enctext(ProfMucWin *mucwin, const char *const enctext) +{ + if (mucwin->enctext) { + free(mucwin->enctext); + } + mucwin->enctext = strdup(enctext); +} + +void +mucwin_unset_enctext(ProfMucWin *mucwin) +{ + if (mucwin->enctext) { + free(mucwin->enctext); + mucwin->enctext = NULL; + } +} + +void +mucwin_set_message_char(ProfMucWin *mucwin, const char *const ch) +{ + if (mucwin->message_char) { + free(mucwin->message_char); + } + mucwin->message_char = strdup(ch); +} + +void +mucwin_unset_message_char(ProfMucWin *mucwin) +{ + if (mucwin->message_char) { + free(mucwin->message_char); + mucwin->message_char = NULL; + } +} diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index 39624a0a..77360ec5 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -62,6 +62,7 @@ static void _title_bar_draw(void); static void _show_self_presence(void); static void _show_contact_presence(ProfChatWin *chatwin); static void _show_privacy(ProfChatWin *chatwin); +static void _show_muc_privacy(ProfMucWin *mucwin); void create_title_bar(void) @@ -202,6 +203,10 @@ _title_bar_draw(void) if (typing) { wprintw(win, " (typing...)"); } + } else if (current && current->type == WIN_MUC) { + ProfMucWin *mucwin = (ProfMucWin*) current; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + _show_muc_privacy(mucwin); } _show_self_presence(); @@ -310,6 +315,27 @@ _show_self_presence(void) } } +static void +_show_muc_privacy(ProfMucWin *mucwin) +{ + int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET); + int encrypted_attrs = theme_attrs(THEME_TITLE_ENCRYPTED); + + if (mucwin->enctext) { + wprintw(win, " "); + wattron(win, bracket_attrs); + wprintw(win, "["); + wattroff(win, bracket_attrs); + wattron(win, encrypted_attrs); + wprintw(win, mucwin->enctext); + wattroff(win, encrypted_attrs); + wattron(win, bracket_attrs); + wprintw(win, "]"); + + return; + } +} + static void _show_privacy(ProfChatWin *chatwin) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 336e820b..608059de 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -193,6 +193,10 @@ void mucwin_role_list_error(ProfMucWin *mucwin, const char *const role, const ch void mucwin_handle_role_list(ProfMucWin *mucwin, const char *const role, GSList *nicks); void mucwin_kick_error(ProfMucWin *mucwin, const char *const nick, const char *const error); char* mucwin_get_string(ProfMucWin *mucwin); +void mucwin_set_enctext(ProfMucWin *mucwin, const char *const enctext); +void mucwin_unset_enctext(ProfMucWin *mucwin); +void mucwin_set_message_char(ProfMucWin *mucwin, const char *const ch); +void mucwin_unset_message_char(ProfMucWin *mucwin); // MUC private chat window void privwin_incoming_msg(ProfPrivateWin *privatewin, const char *const message, GDateTime *timestamp); diff --git a/src/ui/win_types.h b/src/ui/win_types.h index b19822d5..462e177e 100644 --- a/src/ui/win_types.h +++ b/src/ui/win_types.h @@ -168,6 +168,8 @@ typedef struct prof_muc_win_t { gboolean unread_triggers; gboolean showjid; unsigned long memcheck; + char *enctext; + char *message_char; } ProfMucWin; typedef struct prof_mucconf_win_t { diff --git a/src/ui/window.c b/src/ui/window.c index 85e2b73f..6b8ae06e 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -194,6 +194,8 @@ win_create_muc(const char *const roomjid) } else { new_win->showjid = FALSE; } + new_win->enctext = NULL; + new_win->message_char = NULL; new_win->memcheck = PROFMUCWIN_MEMCHECK; @@ -443,6 +445,8 @@ win_free(ProfWin* window) { ProfMucWin *mucwin = (ProfMucWin*)window; free(mucwin->roomjid); + free(mucwin->enctext); + free(mucwin->message_char); break; } case WIN_MUC_CONFIG: @@ -1022,13 +1026,13 @@ win_print_incoming(ProfWin *window, GDateTime *timestamp, } void -win_print_them(ProfWin *window, theme_item_t theme_item, const char *const them) +win_print_them(ProfWin *window, theme_item_t theme_item, char ch, const char *const them) { - _win_printf(window, '-', 0, NULL, NO_ME | NO_EOL, theme_item, them, ""); + _win_printf(window, ch, 0, NULL, NO_ME | NO_EOL, theme_item, them, ""); } void -win_println_them_message(ProfWin *window, const char *const them, const char *const message, ...) +win_println_them_message(ProfWin *window, char ch, const char *const them, const char *const message, ...) { GDateTime *timestamp = g_date_time_new_now_local(); @@ -1037,9 +1041,9 @@ win_println_them_message(ProfWin *window, const char *const them, const char *co GString *fmt_msg = g_string_new(NULL); g_string_vprintf(fmt_msg, message, arg); - buffer_append(window->layout->buffer, '-', 0, timestamp, NO_ME, THEME_TEXT_THEM, them, fmt_msg->str, NULL); + buffer_append(window->layout->buffer, ch, 0, timestamp, NO_ME, THEME_TEXT_THEM, them, fmt_msg->str, NULL); - _win_print(window, '-', 0, timestamp, NO_ME, THEME_TEXT_THEM, them, fmt_msg->str, NULL); + _win_print(window, ch, 0, timestamp, NO_ME, THEME_TEXT_THEM, them, fmt_msg->str, NULL); inp_nonblocking(TRUE); g_date_time_unref(timestamp); @@ -1048,7 +1052,7 @@ win_println_them_message(ProfWin *window, const char *const them, const char *co } void -win_println_me_message(ProfWin *window, const char *const me, const char *const message, ...) +win_println_me_message(ProfWin *window, char ch, const char *const me, const char *const message, ...) { GDateTime *timestamp = g_date_time_new_now_local(); @@ -1057,9 +1061,9 @@ win_println_me_message(ProfWin *window, const char *const me, const char *const GString *fmt_msg = g_string_new(NULL); g_string_vprintf(fmt_msg, message, arg); - buffer_append(window->layout->buffer, '-', 0, timestamp, 0, THEME_TEXT_ME, me, fmt_msg->str, NULL); + buffer_append(window->layout->buffer, ch, 0, timestamp, 0, THEME_TEXT_ME, me, fmt_msg->str, NULL); - _win_print(window, '-', 0, timestamp, 0, THEME_TEXT_ME, me, fmt_msg->str, NULL); + _win_print(window, ch, 0, timestamp, 0, THEME_TEXT_ME, me, fmt_msg->str, NULL); inp_nonblocking(TRUE); g_date_time_unref(timestamp); diff --git a/src/ui/window.h b/src/ui/window.h index 21c9154a..31ccd7e3 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -60,9 +60,9 @@ void win_show_status_string(ProfWin *window, const char *const from, GDateTime *last_activity, const char *const pre, const char *const default_show); -void win_print_them(ProfWin *window, theme_item_t theme_item, const char *const them); -void win_println_them_message(ProfWin *window, const char *const them, const char *const message, ...); -void win_println_me_message(ProfWin *window, const char *const me, const char *const message, ...); +void win_print_them(ProfWin *window, theme_item_t theme_item, char ch, const char *const them); +void win_println_them_message(ProfWin *window, char ch, const char *const them, const char *const message, ...); +void win_println_me_message(ProfWin *window, char ch, const char *const me, const char *const message, ...); void win_print_outgoing(ProfWin *window, const char ch, const char *const message, ...); void win_print_incoming(ProfWin *window, GDateTime *timestamp, -- cgit 1.4.1-2-gfad0