Improve MUC title behaviour for roster, statusbar, and titlebar
## Abstract Continuation of https://github.com/profanity-im/profanity/pull/1881 Give all MUC title commands a consistent command structure and appearance. - `/roster room use name|jid` and `/roster room show|hide server` are now `/roster room title bookmark|jid|localpart|name` - `/statusbar room room|jid` is now `/statusbar room title bookmark|jid|localpart|name` - `/statusbar show|hide jid` and `/statusbar show|hide name` are now `/titlebar room title bookmark|jid|localpart|name` Fix both bugs mentioned in https://github.com/profanity-im/profanity/pull/1881 ### src/ui/mucwin.c:mucwin_generate_title Called by each command to generate a properly formatted title. It checks for "name" first because "name" is the default preference for each command. The last if-statement sets the title to "localpart" for special cases when the title should be "localpart" instead of the user-defined preference. ## Testing ### Preparation Remove preferences that will interfere with testing. ``` sed -i "/roster.rooms.title=/d" profrc sed -i "/statusbar.room.title=/d" profrc sed -i "/titlebar.muc.title=/d" profrc sed -i "/roster.rooms.use.name=/d" profrc sed -i "/roster.rooms.server=/d" profrc sed -i "/statusbar.room=/d" profrc sed -i "/titlebar.muc.title.jid=/d" profrc sed -i "/titlebar.muc.title.name=/d" profrc sed -i "/roster.rooms.by=/d" profrc ``` ### Command Definitions | Test | Window | | :--- | :--- | | `/help roster` | - /roster room title bookmark\|jid\|localpart\|name<br>- room title bookmark\|jid\|localpart\|name : Display the bookmark name, JID, JID localpart, or room name as the roster title for MUCs.<br>- *No /roster show\|hide server*<br>- *No /roster room use jid\|name* | | `/help statusbar` | - /statusbar room title bookmark\|jid\|localpart\|name<br>- room title bookmark\|jid\|localpart\|name : Display the bookmark name, JID, JID localpart, or room name as the title for MUC tabs.<br>- *No /statusbar room jid\|room* | | `/help titlebar` | - /titlebar room title bookmark\|jid\|localpart\|name<br>- room title bookmark\|jid\|localpart\|name : Display the bookmark name, JID, JID localpart, or room name as the MUC window title.<br>- *No /titlebar show\|hide jid\|name* | ### Autocomplete | Test | Command line | | :--- | :--- | | `/roster room <TAB>` | Autocompletes `title` | | `/roster room title <TAB>` | Autocompletes `bookmark\|jid\|localpart\|name` | | `/statusbar room <TAB>` | Autocompletes `title` | | `/statusbar room title <TAB>` | Autocompletes `bookmark\|jid\|localpart\|name` | | `/titlebar room <TAB>` | Autocompletes `title` | | `/titlebar room title <TAB>` | Autocompletes `bookmark\|jid\|localpart\|name` | | `/roster room <TAB>` | Does not autocomplete `use`, `show`, or `hide` | | `/roster room use <TAB>` | Does not autocomplete `name` | | `/roster room show <TAB>` | Does not autocomplete `server` | | `/roster room hide <TAB>` | Does not autocomplete `server` | | `/statusbar room <TAB>` | Does not autocomplete `jid` or `room` | | `/titlebar show <TAB>` | Does not autocomplete `jid` or `name` | | `/titlebar hide <TAB>` | Does not autocomplete `jid` or `name` | ### Set Preferences | Test | Window | profrc | | :--- | :--- | :--- | | `/roster room title bookmark` | Roster MUCs will display 'bookmark' as their title. | roster.rooms.title=bookmark | | `/roster room title jid` | Roster MUCs will display 'jid' as their title. | roster.rooms.title=jid | | `/roster room title localpart` | Roster MUCs will display 'localpart' as their title. | roster.rooms.title=localpart | | `/roster room title name` | Roster MUCs will display 'name' as their title. | roster.rooms.title=name | | `/roster room title invalid` | Invalid usage, see '/help roster' for details. | | | `/statusbar room title bookmark` | Displaying 'bookmark' as the title for MUC tabs. | statusbar.room.title=bookmark | | `/statusbar room title jid` | Displaying 'jid' as the title for MUC tabs. | statusbar.room.title=jid | | `/statusbar room title localpart` | Displaying 'localpart' as the title for MUC tabs. | statusbar.room.title=localpart | | `/statusbar room title name` | Displaying 'name' as the title for MUC tabs. | statusbar.room.title=name | | `/statusbar room title invalid` | Invalid usage, see '/help statusbar' for details. | | | `/titlebar room title bookmark` | MUC windows will display 'bookmark' as the window title. | titlebar.muc.title=bookmark | | `/titlebar room title jid` | MUC windows will display 'jid' as the window title. | titlebar.muc.title=jid | | `/titlebar room title localpart` | MUC windows will display 'localpart' as the window title. | titlebar.muc.title=localpart | | `/titlebar room title name` | MUC windows will display 'name' as the window title. | titlebar.muc.title=name | | `/titlebar room title invalid` | Invalid usage, see '/help titlebar' for details. | | | `/roster room use jid` | Invalid usage, see '/help roster' for details. | | | `/roster room use name` | Invalid usage, see '/help roster' for details. | | | `/roster room show server` | Invalid usage, see '/help roster' for details. | | | `/roster room hide server` | Invalid usage, see '/help roster' for details. | | | `/statusbar room jid` | Invalid usage, see '/help statusbar' for details. | | | `/statusbar room room` | Invalid usage, see '/help statusbar' for details. | | | `/titlebar show jid` | Invalid usage, see '/help titlebar' for details. | | | `/titlebar hide jid` | Invalid usage, see '/help titlebar' for details. | | | `/titlebar show name` | Invalid usage, see '/help titlebar' for details. | | | `/titlebar hide name` | Invalid usage, see '/help titlebar' for details. | | ### Display Set Preferences | Test | Window | | :--- | :--- | | /prefs ui | - Roster rooms title (/roster) : name<br>- Room tab display (/statusbar) : name<br>- MUC window title (/titlebar) : name | ### Test MUC Window #### Test: without *name* preference, without *room name* field ``` /join muc@dmn.im /room config /field1 "" /form submit /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | muc<span/>@dmn.im | muc<span/>@dmn.im | muc<span/>@dmn.im | | `/room config` | | muc<span/>@dmn.im conf | muc<span/>@dmn.im config | | `/field2 edit` | | | muc<span/>@dmn.im config * | | `/msg tst` | tst | muc<span/>@dmn.im/tst | muc<span/>@dmn.im/tst | | `/roster room by service` | muc | | | #### Test: with *name* preference, without *room name* field ``` /roster room title name /statusbar room title name /titlebar room title name /save /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | muc<span/>@dmn.im | muc<span/>@dmn.im | muc<span/>@dmn.im | | `/room config` | | muc<span/>@dmn.im conf | muc<span/>@dmn.im config | | `/field2 edit` | | | muc<span/>@dmn.im config * | | `/msg tst` | tst | muc<span/>@dmn.im/tst | muc<span/>@dmn.im/tst | | `/roster room by service` | muc | | | #### Test: without *name* preference, with *room name* field ``` sed -i "/roster.rooms.title=/d" profrc sed -i "/statusbar.room.title=/d" profrc sed -i "/titlebar.muc.title=/d" profrc /join muc@dmn.im /room config /field1 "my_room" /form submit /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | my_room | my_room | my_room | | `/room config` | | my_room conf | my_room config | | `/field2 edit` | | | my_room config * | | `/msg tst` | tst | my_room/tst | my_room/tst | | `/roster room by service` | my_room | | | #### Test: with *name* preference, with *room name* field ``` /quit /roster room title name /statusbar room title name /titlebar room title name /save /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | my_room | my_room | my_room | | `/room config` | | my_room conf | my_room config | | `/field2 edit` | | | my_room config * | | `/msg tst` | tst | my_room/tst | my_room/tst | | `/roster room by service` | my_room | | | #### Test: with *localpart* preference ``` /quit /roster room title localpart /statusbar room title localpart /titlebar room title localpart /save /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | muc | muc | muc | | `/room config` | | muc conf | muc config | | `/field2 edit` | | | muc config * | | `/msg tst` | tst | muc/tst | muc/tst | | `/roster room by service` | muc | | | #### Test: with *bookmark* preference, without *bookmark name* ``` /quit /roster room title bookmark /statusbar room title bookmark /titlebar room title bookmark /save /quit /bookmark add muc@dmn.im ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/bookmark join muc@dmn.im` | muc<span/>@dmn.im | muc<span/>@dmn.im | muc<span/>@dmn.im | | `/room config` | | muc<span/>@dmn.im conf | muc<span/>@dmn.im config | | `/field2 edit` | | | muc<span/>@dmn.im config * | | `/msg tst` | tst | muc<span/>@dmn.im/tst | muc<span/>@dmn.im/tst | | `/roster room by service` | muc | | | #### Test: with *bookmark* preference, with *bookmark name* ``` /quit /bookmark remove muc@dmn.im /bookmark add muc@dmn.im name "my_bookmark" ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/bookmark join muc@dmn.im` | my_bookmark | my_bookmark | my_bookmark | | `/room config` | | my_bookmark conf | my_bookmark config | | `/field2 edit` | | | my_bookmark config * | | `/msg tst` | tst | my_bookmark/tst | my_bookmark/tst | | `/roster room by service` | my_bookmark | | | #### Test: with *jid* preference ``` /quit /roster room title jid /statusbar room title jid /titlebar room title jid /save /quit ``` | Test | Roster | Statusbar | Titlebar | | :--- | :--- | :--- | :--- | | `/join muc@dmn.im` | muc<span/>@dmn.im | muc<span/>@dmn.im | muc<span/>@dmn.im | | `/room config` | | muc<span/>@dmn.im conf | muc<span/>@dmn.im config | | `/field2 edit` | | | muc<span/>@dmn.im config * | | `/msg tst` | tst | muc<span/>@dmn.im/tst | muc<span/>@dmn.im/tst | | `/roster room by service` | muc | | | ### Test Contact Chat Window Title #### Test: without contact nick ``` /roster add tst@dmn.im ``` | Test | Titlebar | | :--- | :--- | | `/msg tst@dmn.im` | tst<span/>@dmn.im | #### Test: with contact nick ``` /roster add tst@dmn.im my_tst ``` | Test | Titlebar | | :--- | :--- | | `/msg my_tst` | my_tst <tst<span/>@ike.snikket.chat> | ### Test Preference Upgrade #### Test /roster | Test | profrc | | :--- | :--- | | `sed -i '/\[ui\]/a\roster.rooms.use.name=name' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\roster.rooms.use.name=' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\roster.rooms.server=' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\roster.rooms.use.name=jid' profrc` | Original key removed.<br>roster.rooms.title=jid | | `sed -i '/\[ui\]/a\roster.rooms.use.name=jid' profrc`<br>`sed -i '/\[ui\]/a\roster.rooms.server=false' profrc` | Original keys removed.<br>roster.rooms.title=localpart | | `sed -i '/\[ui\]/a\roster.rooms.use.name=jid' profrc`<br>`sed -i '/\[ui\]/a\roster.rooms.server=true' profrc` | Original keys removed.<br>roster.rooms.title=jid | | `sed -i '/\[ui\]/a\roster.rooms.use.name=jid' profrc`<br>`sed -i '/\[ui\]/a\roster.rooms.server=' profrc` | Original keys removed.<br>roster.rooms.title=jid | | `sed -i '/\[ui\]/a\statusbar.room=' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\statusbar.room=room' profrc` | Original key removed.<br>statusbar.room.title=localpart | | `sed -i '/\[ui\]/a\statusbar.room=jid' profrc` | Original key removed.<br>statusbar.room.title=jid | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.name=' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=true' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.name=true' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=false' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.name=false' profrc` | Original key removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=true' profrc`<br>`sed -i '/\[ui\]/a\titlebar.muc.title.name=false' profrc` | Original key removed.<br>titlebar.muc.title=jid | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=false' profrc`<br>`sed -i '/\[ui\]/a\titlebar.muc.title.name=true' profrc` | Original keys removed. | | `sed -i '/\[ui\]/a\titlebar.muc.title.jid=true' profrc`<br>`sed -i '/\[ui\]/a\titlebar.muc.title.name=true' profrc` | Original keys removed. | ### Test Valgrind No memory leaks detected relating to these changes.
This commit is contained in:
IsaacM88
@@ -182,8 +182,7 @@ static Autocomplete roster_presence_ac;
|
||||
static Autocomplete roster_char_ac;
|
||||
static Autocomplete roster_remove_all_ac;
|
||||
static Autocomplete roster_room_ac;
|
||||
static Autocomplete roster_room_show_ac;
|
||||
static Autocomplete roster_room_use_ac;
|
||||
static Autocomplete roster_room_title_ac;
|
||||
static Autocomplete roster_room_position_ac;
|
||||
static Autocomplete roster_room_by_ac;
|
||||
static Autocomplete roster_room_order_ac;
|
||||
@@ -241,6 +240,8 @@ static Autocomplete ox_log_ac;
|
||||
#endif
|
||||
static Autocomplete tls_ac;
|
||||
static Autocomplete titlebar_ac;
|
||||
static Autocomplete titlebar_room_ac;
|
||||
static Autocomplete titlebar_room_title_ac;
|
||||
static Autocomplete titlebar_show_ac;
|
||||
static Autocomplete tls_certpath_ac;
|
||||
static Autocomplete script_ac;
|
||||
@@ -262,6 +263,7 @@ static Autocomplete statusbar_ac;
|
||||
static Autocomplete statusbar_self_ac;
|
||||
static Autocomplete statusbar_chat_ac;
|
||||
static Autocomplete statusbar_room_ac;
|
||||
static Autocomplete statusbar_room_title_ac;
|
||||
static Autocomplete statusbar_show_ac;
|
||||
static Autocomplete statusbar_tabmode_ac;
|
||||
static Autocomplete clear_ac;
|
||||
@@ -601,20 +603,17 @@ cmd_ac_init(void)
|
||||
autocomplete_add(roster_room_ac, "order");
|
||||
autocomplete_add(roster_room_ac, "unread");
|
||||
autocomplete_add(roster_room_ac, "private");
|
||||
autocomplete_add(roster_room_ac, "show");
|
||||
autocomplete_add(roster_room_ac, "hide");
|
||||
autocomplete_add(roster_room_ac, "use");
|
||||
|
||||
roster_room_show_ac = autocomplete_new();
|
||||
autocomplete_add(roster_room_show_ac, "server");
|
||||
autocomplete_add(roster_room_ac, "title");
|
||||
|
||||
roster_room_by_ac = autocomplete_new();
|
||||
autocomplete_add(roster_room_by_ac, "service");
|
||||
autocomplete_add(roster_room_by_ac, "none");
|
||||
|
||||
roster_room_use_ac = autocomplete_new();
|
||||
autocomplete_add(roster_room_use_ac, "jid");
|
||||
autocomplete_add(roster_room_use_ac, "name");
|
||||
roster_room_title_ac = autocomplete_new();
|
||||
autocomplete_add(roster_room_title_ac, "bookmark");
|
||||
autocomplete_add(roster_room_title_ac, "jid");
|
||||
autocomplete_add(roster_room_title_ac, "localpart");
|
||||
autocomplete_add(roster_room_title_ac, "name");
|
||||
|
||||
roster_room_order_ac = autocomplete_new();
|
||||
autocomplete_add(roster_room_order_ac, "name");
|
||||
@@ -941,14 +940,22 @@ cmd_ac_init(void)
|
||||
autocomplete_add(titlebar_ac, "down");
|
||||
autocomplete_add(titlebar_ac, "show");
|
||||
autocomplete_add(titlebar_ac, "hide");
|
||||
autocomplete_add(titlebar_ac, "room");
|
||||
|
||||
titlebar_room_ac = autocomplete_new();
|
||||
autocomplete_add(titlebar_room_ac, "title");
|
||||
|
||||
titlebar_room_title_ac = autocomplete_new();
|
||||
autocomplete_add(titlebar_room_title_ac, "bookmark");
|
||||
autocomplete_add(titlebar_room_title_ac, "jid");
|
||||
autocomplete_add(titlebar_room_title_ac, "localpart");
|
||||
autocomplete_add(titlebar_room_title_ac, "name");
|
||||
|
||||
titlebar_show_ac = autocomplete_new();
|
||||
autocomplete_add(titlebar_show_ac, "tls");
|
||||
autocomplete_add(titlebar_show_ac, "encwarn");
|
||||
autocomplete_add(titlebar_show_ac, "resource");
|
||||
autocomplete_add(titlebar_show_ac, "presence");
|
||||
autocomplete_add(titlebar_show_ac, "jid");
|
||||
autocomplete_add(titlebar_show_ac, "name");
|
||||
|
||||
tls_certpath_ac = autocomplete_new();
|
||||
autocomplete_add(tls_certpath_ac, "set");
|
||||
@@ -1046,8 +1053,13 @@ cmd_ac_init(void)
|
||||
autocomplete_add(statusbar_chat_ac, "jid");
|
||||
|
||||
statusbar_room_ac = autocomplete_new();
|
||||
autocomplete_add(statusbar_room_ac, "room");
|
||||
autocomplete_add(statusbar_room_ac, "jid");
|
||||
autocomplete_add(statusbar_room_ac, "title");
|
||||
|
||||
statusbar_room_title_ac = autocomplete_new();
|
||||
autocomplete_add(statusbar_room_title_ac, "bookmark");
|
||||
autocomplete_add(statusbar_room_title_ac, "jid");
|
||||
autocomplete_add(statusbar_room_title_ac, "localpart");
|
||||
autocomplete_add(statusbar_room_title_ac, "name");
|
||||
|
||||
statusbar_show_ac = autocomplete_new();
|
||||
autocomplete_add(statusbar_show_ac, "name");
|
||||
@@ -1611,8 +1623,7 @@ cmd_ac_reset(ProfWin* window)
|
||||
autocomplete_reset(roster_count_ac);
|
||||
autocomplete_reset(roster_order_ac);
|
||||
autocomplete_reset(roster_room_ac);
|
||||
autocomplete_reset(roster_room_show_ac);
|
||||
autocomplete_reset(roster_room_use_ac);
|
||||
autocomplete_reset(roster_room_title_ac);
|
||||
autocomplete_reset(roster_room_by_ac);
|
||||
autocomplete_reset(roster_unread_ac);
|
||||
autocomplete_reset(roster_room_position_ac);
|
||||
@@ -1672,6 +1683,8 @@ cmd_ac_reset(ProfWin* window)
|
||||
#endif
|
||||
autocomplete_reset(tls_ac);
|
||||
autocomplete_reset(titlebar_ac);
|
||||
autocomplete_reset(titlebar_room_ac);
|
||||
autocomplete_reset(titlebar_room_title_ac);
|
||||
autocomplete_reset(titlebar_show_ac);
|
||||
autocomplete_reset(tls_certpath_ac);
|
||||
autocomplete_reset(console_ac);
|
||||
@@ -1687,6 +1700,7 @@ cmd_ac_reset(ProfWin* window)
|
||||
autocomplete_reset(statusbar_self_ac);
|
||||
autocomplete_reset(statusbar_chat_ac);
|
||||
autocomplete_reset(statusbar_room_ac);
|
||||
autocomplete_reset(statusbar_room_title_ac);
|
||||
autocomplete_reset(statusbar_show_ac);
|
||||
autocomplete_reset(statusbar_tabmode_ac);
|
||||
autocomplete_reset(clear_ac);
|
||||
@@ -1794,8 +1808,7 @@ cmd_ac_uninit(void)
|
||||
autocomplete_free(roster_count_ac);
|
||||
autocomplete_free(roster_order_ac);
|
||||
autocomplete_free(roster_room_ac);
|
||||
autocomplete_free(roster_room_show_ac);
|
||||
autocomplete_free(roster_room_use_ac);
|
||||
autocomplete_free(roster_room_title_ac);
|
||||
autocomplete_free(roster_room_by_ac);
|
||||
autocomplete_free(roster_unread_ac);
|
||||
autocomplete_free(roster_room_position_ac);
|
||||
@@ -1853,6 +1866,8 @@ cmd_ac_uninit(void)
|
||||
#endif
|
||||
autocomplete_free(tls_ac);
|
||||
autocomplete_free(titlebar_ac);
|
||||
autocomplete_free(titlebar_room_ac);
|
||||
autocomplete_free(titlebar_room_title_ac);
|
||||
autocomplete_free(titlebar_show_ac);
|
||||
autocomplete_free(tls_certpath_ac);
|
||||
autocomplete_free(script_ac);
|
||||
@@ -1874,6 +1889,7 @@ cmd_ac_uninit(void)
|
||||
autocomplete_free(statusbar_self_ac);
|
||||
autocomplete_free(statusbar_chat_ac);
|
||||
autocomplete_free(statusbar_room_ac);
|
||||
autocomplete_free(statusbar_room_title_ac);
|
||||
autocomplete_free(statusbar_show_ac);
|
||||
autocomplete_free(statusbar_tabmode_ac);
|
||||
autocomplete_free(clear_ac);
|
||||
@@ -2265,15 +2281,7 @@ _roster_autocomplete(ProfWin* window, const char* const input, gboolean previous
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
result = autocomplete_param_with_ac(input, "/roster room show", roster_room_show_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
result = autocomplete_param_with_ac(input, "/roster room hide", roster_room_show_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
result = autocomplete_param_with_ac(input, "/roster room use", roster_room_use_ac, TRUE, previous);
|
||||
result = autocomplete_param_with_ac(input, "/roster room title", roster_room_title_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
@@ -3549,6 +3557,16 @@ _titlebar_autocomplete(ProfWin* window, const char* const input, gboolean previo
|
||||
{
|
||||
char* result = NULL;
|
||||
|
||||
result = autocomplete_param_with_ac(input, "/titlebar room title", titlebar_room_title_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
|
||||
result = autocomplete_param_with_ac(input, "/titlebar room", titlebar_room_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
|
||||
result = autocomplete_param_with_ac(input, "/titlebar show", titlebar_show_ac, TRUE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
@@ -4130,6 +4148,11 @@ _statusbar_autocomplete(ProfWin* window, const char* const input, gboolean previ
|
||||
}
|
||||
|
||||
found = autocomplete_param_with_ac(input, "/statusbar room", statusbar_room_ac, TRUE, previous);
|
||||
if (found) {
|
||||
return found;
|
||||
}
|
||||
|
||||
found = autocomplete_param_with_ac(input, "/statusbar room title", statusbar_room_title_ac, TRUE, previous);
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
@@ -275,9 +275,7 @@ static const struct cmd_t command_defs[] = {
|
||||
"/roster room by service|none",
|
||||
"/roster room order name|unread",
|
||||
"/roster room unread before|after|off",
|
||||
"/roster room show server",
|
||||
"/roster room hide server",
|
||||
"/roster room use name|jid",
|
||||
"/roster room title bookmark|jid|localpart|name",
|
||||
"/roster private room|group|off",
|
||||
"/roster private char <char>|none",
|
||||
"/roster header char <char>|none",
|
||||
@@ -349,10 +347,7 @@ static const struct cmd_t command_defs[] = {
|
||||
{ "room unread before", "Show unread message count before room." },
|
||||
{ "room unread after", "Show unread message count after room." },
|
||||
{ "room unread off", "Do not show unread message count for rooms." },
|
||||
{ "room show server", "Show the conference server with room JIDs." },
|
||||
{ "room hide server", "Do not show the conference server with room JIDs." },
|
||||
{ "room use name", "Use the MUC name as room name." },
|
||||
{ "room use jid", "Use the JID as room name." },
|
||||
{ "room title bookmark|jid|localpart|name", "Display the bookmark name, JID, JID localpart, or room name as the roster title for MUCs." },
|
||||
{ "private room", "Show room private chats with the room." },
|
||||
{ "private group", "Show room private chats as a separate roster group." },
|
||||
{ "private off", "Do not show room private chats." },
|
||||
@@ -1241,7 +1236,7 @@ static const struct cmd_t command_defs[] = {
|
||||
|
||||
|
||||
{ CMD_PREAMBLE("/titlebar",
|
||||
parse_args, 1, 2, &cons_titlebar_setting)
|
||||
parse_args, 1, 3, &cons_titlebar_setting)
|
||||
CMD_SUBFUNCS(
|
||||
{ "show", cmd_titlebar_show_hide },
|
||||
{ "hide", cmd_titlebar_show_hide })
|
||||
@@ -1251,7 +1246,8 @@ static const struct cmd_t command_defs[] = {
|
||||
CMD_SYN(
|
||||
"/titlebar up",
|
||||
"/titlebar down",
|
||||
"/titlebar show|hide [encwarn|resource|tls]")
|
||||
"/titlebar show|hide encwarn|resource|tls",
|
||||
"/titlebar room title bookmark|jid|localpart|name")
|
||||
CMD_DESC(
|
||||
"Titlebar settings.")
|
||||
CMD_ARGS(
|
||||
@@ -1260,12 +1256,12 @@ static const struct cmd_t command_defs[] = {
|
||||
{ "show tls", "Show or hide TLS indicator in the titlebar." },
|
||||
{ "show encwarn", "Enable or disable the unencrypted warning message in the titlebar." },
|
||||
{ "show resource", "Show or hide the current resource in the titlebar." },
|
||||
{ "show name", "Show the nickname or MUC name in the titlebar." },
|
||||
{ "show jid", "Show the JID in the titlebar." })
|
||||
{ "room title bookmark|jid|localpart|name", "Display the bookmark name, JID, JID localpart, or room name as the MUC window title." })
|
||||
CMD_EXAMPLES(
|
||||
"/titlebar up",
|
||||
"/titlebar show tls",
|
||||
"/titlebar hide encwarn")
|
||||
"/titlebar hide encwarn",
|
||||
"/titlebar room title localpart")
|
||||
},
|
||||
|
||||
{ CMD_PREAMBLE("/mainwin",
|
||||
@@ -1284,7 +1280,7 @@ static const struct cmd_t command_defs[] = {
|
||||
},
|
||||
|
||||
{ CMD_PREAMBLE("/statusbar",
|
||||
parse_args, 1, 2, &cons_statusbar_setting)
|
||||
parse_args, 1, 3, &cons_statusbar_setting)
|
||||
CMD_MAINFUNC(cmd_statusbar)
|
||||
CMD_TAGS(
|
||||
CMD_TAG_UI)
|
||||
@@ -1296,7 +1292,7 @@ static const struct cmd_t command_defs[] = {
|
||||
"/statusbar tabmode default|actlist",
|
||||
"/statusbar self user|barejid|fulljid|off",
|
||||
"/statusbar chat user|jid",
|
||||
"/statusbar room room|jid",
|
||||
"/statusbar room title bookmark|jid|localpart|name",
|
||||
"/statusbar up",
|
||||
"/statusbar down")
|
||||
CMD_DESC(
|
||||
@@ -1311,7 +1307,7 @@ static const struct cmd_t command_defs[] = {
|
||||
{ "self user|barejid|fulljid", "Show account user name, barejid, fulljid as status bar title." },
|
||||
{ "self off", "Disable showing self as status bar title." },
|
||||
{ "chat user|jid", "Show users name, or fulljid. Change needs a redraw/restart to take effect." },
|
||||
{ "room room|jid", "Show room name, or the fulljid for room tabs." },
|
||||
{ "room title bookmark|jid|localpart|name", "Display the bookmark name, JID, JID localpart, or room name as the title for MUC tabs." },
|
||||
{ "up", "Move the status bar up the screen." },
|
||||
{ "down", "Move the status bar down the screen." })
|
||||
CMD_EXAMPLES(
|
||||
|
||||
@@ -2855,49 +2855,17 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
}
|
||||
} else if (g_strcmp0(args[1], "show") == 0) {
|
||||
if (g_strcmp0(args[2], "server") == 0) {
|
||||
cons_show("Roster room server enabled.");
|
||||
prefs_set_boolean(PREF_ROSTER_ROOMS_SERVER, TRUE);
|
||||
} else if (g_strcmp0(args[1], "title") == 0) {
|
||||
if (g_strcmp0(args[2], "bookmark") == 0 || g_strcmp0(args[2], "jid") == 0 || g_strcmp0(args[2], "localpart") == 0 || g_strcmp0(args[2], "name") == 0) {
|
||||
cons_show("Roster MUCs will display '%s' as their title.", args[2]);
|
||||
prefs_set_string(PREF_ROSTER_ROOMS_TITLE, args[2]);
|
||||
if (conn_status == JABBER_CONNECTED) {
|
||||
rosterwin_roster();
|
||||
}
|
||||
return TRUE;
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
}
|
||||
} else if (g_strcmp0(args[1], "hide") == 0) {
|
||||
if (g_strcmp0(args[2], "server") == 0) {
|
||||
cons_show("Roster room server disabled.");
|
||||
prefs_set_boolean(PREF_ROSTER_ROOMS_SERVER, FALSE);
|
||||
if (conn_status == JABBER_CONNECTED) {
|
||||
rosterwin_roster();
|
||||
}
|
||||
return TRUE;
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
}
|
||||
} else if (g_strcmp0(args[1], "use") == 0) {
|
||||
if (g_strcmp0(args[2], "jid") == 0) {
|
||||
cons_show("Roster room display jid as name.");
|
||||
prefs_set_string(PREF_ROSTER_ROOMS_USE_AS_NAME, "jid");
|
||||
if (conn_status == JABBER_CONNECTED) {
|
||||
rosterwin_roster();
|
||||
}
|
||||
return TRUE;
|
||||
} else if (g_strcmp0(args[2], "name") == 0) {
|
||||
cons_show("Roster room display room name as name.");
|
||||
prefs_set_string(PREF_ROSTER_ROOMS_USE_AS_NAME, "name");
|
||||
if (conn_status == JABBER_CONNECTED) {
|
||||
rosterwin_roster();
|
||||
}
|
||||
return TRUE;
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
}
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
@@ -6089,6 +6057,15 @@ cmd_titlebar(ProfWin* window, const char* const command, gchar** args)
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
if (g_strcmp0(args[0], "room") == 0) {
|
||||
if (g_strcmp0(args[1], "title") == 0) {
|
||||
if (g_strcmp0(args[2], "bookmark") == 0 || g_strcmp0(args[2], "jid") == 0 || g_strcmp0(args[2], "localpart") == 0 || g_strcmp0(args[2], "name") == 0) {
|
||||
cons_show("MUC windows will display '%s' as the window title.", args[2]);
|
||||
prefs_set_string(PREF_TITLEBAR_MUC_TITLE, args[2]);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cons_bad_cmd_usage(command);
|
||||
|
||||
@@ -6113,12 +6090,6 @@ cmd_titlebar_show_hide(ProfWin* window, const char* const command, gchar** args)
|
||||
} else if (g_strcmp0(args[1], "presence") == 0) {
|
||||
cons_show("Showing contact presence in titlebar enabled.");
|
||||
prefs_set_boolean(PREF_PRESENCE, TRUE);
|
||||
} else if (g_strcmp0(args[1], "jid") == 0) {
|
||||
cons_show("Showing MUC JID in titlebar as title enabled.");
|
||||
prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_JID, TRUE);
|
||||
} else if (g_strcmp0(args[1], "name") == 0) {
|
||||
cons_show("Showing MUC name in titlebar as title enabled.");
|
||||
prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_NAME, TRUE);
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
}
|
||||
@@ -6136,12 +6107,6 @@ cmd_titlebar_show_hide(ProfWin* window, const char* const command, gchar** args)
|
||||
} else if (g_strcmp0(args[1], "presence") == 0) {
|
||||
cons_show("Showing contact presence in titlebar disabled.");
|
||||
prefs_set_boolean(PREF_PRESENCE, FALSE);
|
||||
} else if (g_strcmp0(args[1], "jid") == 0) {
|
||||
cons_show("Showing MUC JID in titlebar as title disabled.");
|
||||
prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_JID, FALSE);
|
||||
} else if (g_strcmp0(args[1], "name") == 0) {
|
||||
cons_show("Showing MUC name in titlebar as title disabled.");
|
||||
prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_NAME, FALSE);
|
||||
} else {
|
||||
cons_bad_cmd_usage(command);
|
||||
}
|
||||
@@ -6367,17 +6332,13 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args)
|
||||
}
|
||||
|
||||
if (g_strcmp0(args[0], "room") == 0) {
|
||||
if (g_strcmp0(args[1], "jid") == 0) {
|
||||
prefs_set_string(PREF_STATUSBAR_ROOM, "jid");
|
||||
cons_show("Using jid for room tabs.");
|
||||
ui_resize();
|
||||
return TRUE;
|
||||
}
|
||||
if (g_strcmp0(args[1], "room") == 0) {
|
||||
prefs_set_string(PREF_STATUSBAR_ROOM, "room");
|
||||
cons_show("Using room name for room tabs.");
|
||||
ui_resize();
|
||||
return TRUE;
|
||||
if (g_strcmp0(args[1], "title") == 0) {
|
||||
if (g_strcmp0(args[2], "bookmark") == 0 || g_strcmp0(args[2], "jid") == 0 || g_strcmp0(args[2], "localpart") == 0 || g_strcmp0(args[2], "name") == 0) {
|
||||
prefs_set_string(PREF_STATUSBAR_ROOM_TITLE, args[2]);
|
||||
cons_show("Displaying '%s' as the title for MUC tabs.", args[2]);
|
||||
ui_resize();
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
cons_bad_cmd_usage(command);
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user