aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into configure

Browse Source
This commit is contained in:
James Booth 2017-01-20 23:53:10 +00:00
commit 38c52506bf
16 changed files with 795 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
apidocs/c/profapi.h
View File

@ -341,7 +341,7 @@ End any encrypted session with the specified user.
void prof_encryption_reset(char *barejid);
/**
Set the text to display in the titlebar encryption indicator.
Set the text to display in the titlebar encryption indicator for recipient.
@param barejid Jabber ID of the recipient
@param enctext The text to display
@return 1 on success, 0 on failure
@ -349,9 +349,68 @@ Set the text to display in the titlebar encryption indicator.
int prof_chat_set_titlebar_enctext(char *barejid, char *enctext);
/**
Let profanity decide what to show in the titlebar encryption indicator
Let profanity decide what to show in the titlebar encryption indicator for recipient.
@param barejid Jabber ID of the recipient
@return 1 on success, 0 on failure
*/
int prof_chat_unset_titlebar_enctext(char *barejid);
/**
Set the incoming message prefix character for specified contact.
@param barejid Jabber ID of the recipient
@param ch The character to display
@return 1 on success, 0 on failure
*/
int prof_chat_set_incoming_char(char *barejid, char *ch);
/**
Reset the incoming message prefix character for specified contact.
@param barejid Jabber ID of the recipient
@return 1 on success, 0 on failure
*/
int prof_chat_unset_incoming_char(char *barejid);
/**
Set the outgoing message prefix character for specified contact.
@param barejid Jabber ID of the recipient
@param ch The character to display
@return 1 on success, 0 on failure
*/
int prof_chat_set_outgoing_char(char *barejid, char *ch);
/**
Reset the outgoing message prefix character for specified contact.
@param barejid Jabber ID of the recipient
@return 1 on success, 0 on failure
*/
int prof_chat_unset_outgoing_char(char *barejid);
/**
Set the text to display in the titlebar encryption indicator for room.
@param roomjid Jabber ID of the room
@param enctext The text to display
@return 1 on success, 0 on failure
*/
int prof_room_set_titlebar_enctext(char *roomjid, char *enctext);
/**
Let profanity decide what to show in the titlebar encryption indicator for room.
@param roomjid Jabber ID of the room
@return 1 on success, 0 on failure
*/
int prof_room_unset_titlebar_enctext(char *roomjid);
/**
Set the message prefix character for specified room.
@param roomjid Jabber ID of the room
@param ch The character to display
@return 1 on success, 0 on failure
*/
int prof_room_set_message_char(char *roomjid, char *ch);
/**
Reset the message prefix character for specified room.
@param roomjid Jabber ID of the room
@return 1 on success, 0 on failure
*/
int prof_room_unset_message_char(char *roomjid);

141
apidocs/python/src/prof.py
View File

@ -268,6 +268,7 @@ def get_room_nick(barejid):
:return: Room nickname.
:rtype: str
"""
pass
def current_win_is_console():
@ -498,6 +499,7 @@ def settings_string_list_get(group, key):
::
prof.settings_get_string_list("someplugin", "somelist")
"""
pass
def settings_string_list_add(group, key, value):
@ -516,6 +518,7 @@ def settings_string_list_add(group, key, value):
::
prof.settings_string_list_add("someplugin", "somelist", "anelement")
"""
pass
def settings_string_list_remove(group, key, value):
@ -535,6 +538,7 @@ def settings_string_list_remove(group, key, value):
::
prof.settings_string_list_remove("someplugin", "somelist", "anelement")
"""
pass
def settings_string_list_clear(group, key):
@ -552,6 +556,7 @@ def settings_string_list_clear(group, key):
::
prof.settings_string_list_remove_all("someplugin", "somelist")
"""
pass
def settings_int_get(group, key, default):
@ -604,6 +609,7 @@ def incoming_message(barejid, resource, message):
::
prof.incoming_message("bob@server.org", "laptop", "Hello there")
"""
pass
def disco_add_feature(feature):
@ -630,10 +636,11 @@ def encryption_reset(barejid):
::
prof.encryption_reset("alice@server.org")
"""
pass
def chat_set_titlebar_enctext(barejid, enctext):
"""Set the text to display in the titlebar encryption indicator.
"""Set the text to display in the titlebar encryption indicator for recipient.
:param barejid: Jabber ID of the recipient
:param enctext: The text to display
@ -642,15 +649,15 @@ def chat_set_titlebar_enctext(barejid, enctext):
:return: ``True`` if the text was set successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.chat_set_titlebar_enctext("bob@chat.org", "safe")
"""
pass
def chat_unset_titlebar_enctext(barejid):
"""Let profanity decide what to show in the titlebar encryption indicator.
"""Let profanity decide what to show in the titlebar encryption indicator for recipient.
:param barejid: Jabber ID of the recipient
:type barejid: str or unicode
@ -661,4 +668,132 @@ def chat_unset_titlebar_enctext(barejid):
::
prof.chat_unset_titlebar_enctext("bob@chat.org")
"""
pass
def chat_set_incoming_char(barejid, ch):
"""Set the incoming message prefix character for specified contact.
:param barejid: Jabber ID of the recipient
:param enctext: The character to display
:type barejid: str or unicode
:type enctext: str or unicode
:return: ``True`` if the character was set successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.chat_set_incoming_char("kristine@chat.org", "*")
"""
pass
def chat_unset_incoming_char(barejid):
"""Reset the incoming message prefix character for specified contact.
:param barejid: Jabber ID of the recipient
:type barejid: str or unicode
:return: ``True`` if the char was unset successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.chat_unset_incoming_char("kristine@chat.org")
"""
pass
def chat_set_outgoing_char(barejid, ch):
"""Set the outgoing message prefix character for specified contact.
:param barejid: Jabber ID of the recipient
:param enctext: The character to display
:type barejid: str or unicode
:type enctext: str or unicode
:return: ``True`` if the character was set successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.chat_set_outgoing_char("david@chat.org", "+")
"""
pass
def chat_unset_outgoing_char(barejid):
"""Reset the outgoing message prefix character for specified contact.
:param barejid: Jabber ID of the recipient
:type barejid: str or unicode
:return: ``True`` if the char was unset successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.chat_unset_outgoing_char("david@chat.org")
"""
pass
def room_set_titlebar_enctext(roomjid, enctext):
"""Set the text to display in the titlebar encryption indicator for room.
:param roomjid: Jabber ID of the room
:param enctext: The text to display
:type roomjid: str or unicode
:type enctext: str or unicode
:return: ``True`` if the text was set successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.room_set_titlebar_enctext("generalchat@conference.service.com", "secret")
"""
pass
def room_unset_titlebar_enctext(roomjid):
"""Let profanity decide what to show in the titlebar encryption indicator for room.
:param roomjid: Jabber ID of the room
:type roomjid: str or unicode
:return: ``True`` if the text was unset successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.room_unset_titlebar_enctext("generalchat@conference.service.com")
"""
pass
def room_set_message_char(roomjid, ch):
"""Set the message prefix character for specified room.
:param roomjid: Jabber ID of the room
:param enctext: The character to display
:type roomjid: str or unicode
:type enctext: str or unicode
:return: ``True`` if the character was set successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.room_set_message_char("ohnoes@conference.chat.org", "^")
"""
pass
def room_unset_message_char(roomjid):
"""Reset the message prefix character for specified room.
:param roomjid: Jabber ID of the room
:type roomjid: str or unicode
:return: ``True`` if the char was unset successfully, ``False`` otherwise
:rtype: boolean
Example:
::
prof.room_unset_message_char("ohnoes@conference.chat.org")
"""
pass

164
src/plugins/api.c
View File

@ -561,3 +561,167 @@ api_chat_unset_titlebar_enctext(const char *const barejid)
return 1;
}
int
api_chat_set_incoming_char(const char *const barejid, const char *const ch)
{
if (ch == NULL) {
return 0;
}
if (strlen(ch) != 1) {
return 0;
}
if (barejid == NULL) {
return 0;
}
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin == NULL) {
return 0;
}
chatwin_set_incoming_char(chatwin, ch);
return 1;
}
int
api_chat_unset_incoming_char(const char *const barejid)
{
if (barejid == NULL) {
return 0;
}
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin == NULL) {
return 0;
}
chatwin_unset_incoming_char(chatwin);
return 1;
}
int
api_chat_set_outgoing_char(const char *const barejid, const char *const ch)
{
if (ch == NULL) {
return 0;
}
if (strlen(ch) != 1) {
return 0;
}
if (barejid == NULL) {
return 0;
}
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin == NULL) {
return 0;
}
chatwin_set_outgoing_char(chatwin, ch);
return 1;
}
int
api_chat_unset_outgoing_char(const char *const barejid)
{
if (barejid == NULL) {
return 0;
}
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin == NULL) {
return 0;
}
chatwin_unset_outgoing_char(chatwin);
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;
}

8
src/plugins/api.h
View File

@ -100,5 +100,13 @@ void api_encryption_reset(const char *const barejid);
int api_chat_set_titlebar_enctext(const char *const barejid, const char *const enctext);
int api_chat_unset_titlebar_enctext(const char *const barejid);
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

56
src/plugins/c_api.c
View File

@ -359,6 +359,54 @@ c_api_chat_unset_titlebar_enctext(const char *barejid)
return api_chat_unset_titlebar_enctext(barejid);
}
static int
c_api_chat_set_incoming_char(const char *barejid, const char *ch)
{
return api_chat_set_incoming_char(barejid, ch);
}
static int
c_api_chat_unset_incoming_char(const char *barejid)
{
return api_chat_unset_incoming_char(barejid);
}
static int
c_api_chat_set_outgoing_char(const char *barejid, const char *ch)
{
return api_chat_set_outgoing_char(barejid, ch);
}
static int
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)
{
@ -429,6 +477,14 @@ c_api_init(void)
prof_encryption_reset = c_api_encryption_reset;
prof_chat_set_titlebar_enctext = c_api_chat_set_titlebar_enctext;
prof_chat_unset_titlebar_enctext = c_api_chat_unset_titlebar_enctext;
prof_chat_set_incoming_char = c_api_chat_set_incoming_char;
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 *

9
src/plugins/profapi.c
View File

@ -97,4 +97,11 @@ void (*prof_encryption_reset)(const char *barejid) = NULL;
int (*prof_chat_set_titlebar_enctext)(const char *barejid, const char *enctext) = NULL;
int (*prof_chat_unset_titlebar_enctext)(const char *barejid) = NULL;
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;

8
src/plugins/profapi.h
View File

@ -109,5 +109,13 @@ void (*prof_encryption_reset)(const char *barejid);
int (*prof_chat_set_titlebar_enctext)(const char *barejid, const char *enctext);
int (*prof_chat_unset_titlebar_enctext)(const char *barejid);
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

196
src/plugins/python_api.c
View File

@ -1096,6 +1096,194 @@ python_api_chat_unset_titlebar_enctext(PyObject *self, PyObject *args)
}
}
static PyObject*
python_api_chat_set_incoming_char(PyObject *self, PyObject *args)
{
PyObject *barejid = NULL;
PyObject *ch = NULL;
if (!PyArg_ParseTuple(args, "OO", &barejid, &ch)) {
Py_RETURN_NONE;
}
char *barejid_str = python_str_or_unicode_to_string(barejid);
char *ch_str = python_str_or_unicode_to_string(ch);
allow_python_threads();
int res = api_chat_set_incoming_char(barejid_str, ch_str);
free(barejid_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_chat_unset_incoming_char(PyObject *self, PyObject *args)
{
PyObject *barejid = NULL;
if (!PyArg_ParseTuple(args, "O", &barejid)) {
Py_RETURN_NONE;
}
char *barejid_str = python_str_or_unicode_to_string(barejid);
allow_python_threads();
int res = api_chat_unset_incoming_char(barejid_str);
free(barejid_str);
disable_python_threads();
if (res) {
return Py_BuildValue("O", Py_True);
} else {
return Py_BuildValue("O", Py_False);
}
}
static PyObject*
python_api_chat_set_outgoing_char(PyObject *self, PyObject *args)
{
PyObject *barejid = NULL;
PyObject *ch = NULL;
if (!PyArg_ParseTuple(args, "OO", &barejid, &ch)) {
Py_RETURN_NONE;
}
char *barejid_str = python_str_or_unicode_to_string(barejid);
char *ch_str = python_str_or_unicode_to_string(ch);
allow_python_threads();
int res = api_chat_set_outgoing_char(barejid_str, ch_str);
free(barejid_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_chat_unset_outgoing_char(PyObject *self, PyObject *args)
{
PyObject *barejid = NULL;
if (!PyArg_ParseTuple(args, "O", &barejid)) {
Py_RETURN_NONE;
}
char *barejid_str = python_str_or_unicode_to_string(barejid);
allow_python_threads();
int res = api_chat_unset_outgoing_char(barejid_str);
free(barejid_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_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)
{
@ -1207,6 +1395,14 @@ static PyMethodDef apiMethods[] = {
{ "encryption_reset", python_api_encryption_reset, METH_VARARGS, "End encrypted chat session with barejid, if one exists" },
{ "chat_set_titlebar_enctext", python_api_chat_set_titlebar_enctext, METH_VARARGS, "Set the encryption status in the title bar for the specified contact" },
{ "chat_unset_titlebar_enctext", python_api_chat_unset_titlebar_enctext, METH_VARARGS, "Reset the encryption status in the title bar for the specified recipient" },
{ "chat_set_incoming_char", python_api_chat_set_incoming_char, METH_VARARGS, "Set the incoming message prefix character for specified contact" },
{ "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 }
};

40
src/ui/chatwin.c
View File

@ -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)
{

49
src/ui/mucwin.c
View File

@ -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;
}
}

26
src/ui/titlebar.c
View File

@ -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)
{

8
src/ui/ui.h
View File

@ -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);
@ -189,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);

4
src/ui/win_types.h
View File

@ -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 {
@ -166,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 {

31
src/ui/window.c
View File

@ -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;
@ -192,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;
@ -432,6 +436,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;
}
@ -439,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:
@ -996,13 +1004,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;
@ -1013,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();
@ -1028,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);
@ -1039,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();
@ -1048,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);

6
src/ui/window.h
View File

@ -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,

9
tests/unittests/ui/stub_ui.c
View File

@ -69,6 +69,10 @@ void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, voi
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) {}
void ui_sigwinch_handler(int sig) {}
@ -215,6 +219,11 @@ void mucwin_occupant_presence(ProfMucWin *mucwin, const char * const nick, const
void mucwin_update_occupants(ProfMucWin *mucwin) {}
void mucwin_show_occupants(ProfMucWin *mucwin) {}
void mucwin_hide_occupants(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) {}
void ui_show_roster(void) {}
void ui_hide_roster(void) {}
void ui_roster_add(const char * const barejid, const char * const name) {}