2012-10-21 15:02:20 -04:00
|
|
|
/*
|
2013-02-02 14:57:46 -05:00
|
|
|
* statusbar.c
|
2019-11-13 06:11:05 -05:00
|
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
2012-02-20 15:07:38 -05:00
|
|
|
*
|
2019-01-22 05:31:45 -05:00
|
|
|
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
2023-01-10 04:37:25 -05:00
|
|
|
* Copyright (C) 2019 - 2023 Michael Vetter <jubalh@iodoru.org>
|
2012-10-21 15:02:20 -04:00
|
|
|
*
|
2012-02-20 15:07:38 -05:00
|
|
|
* This file is part of Profanity.
|
|
|
|
*
|
|
|
|
* Profanity is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* Profanity is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-07-23 20:14:49 -04:00
|
|
|
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
|
2012-02-20 15:07:38 -05:00
|
|
|
*
|
2014-08-24 15:57:39 -04:00
|
|
|
* In addition, as a special exception, the copyright holders give permission to
|
|
|
|
* link the code of portions of this program with the OpenSSL library under
|
|
|
|
* certain conditions as described in each individual source file, and
|
|
|
|
* distribute linked combinations including the two.
|
|
|
|
*
|
|
|
|
* You must obey the GNU General Public License in all respects for all of the
|
|
|
|
* code used other than OpenSSL. If you modify file(s) with this exception, you
|
|
|
|
* may extend this exception to your version of the file(s), but you are not
|
|
|
|
* obligated to do so. If you do not wish to do so, delete this exception
|
|
|
|
* statement from your version. If you delete this exception statement from all
|
|
|
|
* source files in the program, then also delete it here.
|
|
|
|
*
|
2012-02-20 15:07:38 -05:00
|
|
|
*/
|
|
|
|
|
2016-03-31 16:05:02 -04:00
|
|
|
#include "config.h"
|
2012-09-08 11:51:09 -04:00
|
|
|
|
2013-08-23 17:39:03 -04:00
|
|
|
#include <assert.h>
|
2012-03-05 20:04:45 -05:00
|
|
|
#include <string.h>
|
2020-07-07 07:53:30 -04:00
|
|
|
#include <stdlib.h>
|
2012-03-05 20:04:45 -05:00
|
|
|
|
2016-03-31 16:05:02 -04:00
|
|
|
#ifdef HAVE_NCURSESW_NCURSES_H
|
2013-01-02 15:27:37 -05:00
|
|
|
#include <ncursesw/ncurses.h>
|
2016-03-31 16:05:02 -04:00
|
|
|
#elif HAVE_NCURSES_H
|
2013-01-03 19:35:54 -05:00
|
|
|
#include <ncurses.h>
|
2020-09-04 06:55:20 -04:00
|
|
|
#elif HAVE_CURSES_H
|
|
|
|
#include <curses.h>
|
2012-09-08 11:51:09 -04:00
|
|
|
#endif
|
2012-05-10 04:55:55 -04:00
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
#include "config/theme.h"
|
2020-07-07 07:53:30 -04:00
|
|
|
#include "config/preferences.h"
|
|
|
|
#include "ui/ui.h"
|
|
|
|
#include "ui/statusbar.h"
|
2014-04-07 16:50:28 -04:00
|
|
|
#include "ui/inputwin.h"
|
2016-09-22 19:56:53 -04:00
|
|
|
#include "ui/screen.h"
|
2018-03-09 16:11:59 -05:00
|
|
|
#include "xmpp/roster_list.h"
|
2020-07-07 07:53:30 -04:00
|
|
|
#include "xmpp/contact.h"
|
2012-02-12 17:20:21 -05:00
|
|
|
|
2020-07-07 08:18:57 -04:00
|
|
|
typedef struct _status_bar_tab_t
|
|
|
|
{
|
2018-03-09 16:11:59 -05:00
|
|
|
win_type_t window_type;
|
2020-07-07 08:18:57 -04:00
|
|
|
char* identifier;
|
2018-03-08 14:55:17 -05:00
|
|
|
gboolean highlight;
|
2020-07-07 08:18:57 -04:00
|
|
|
char* display_name;
|
2018-03-08 14:55:17 -05:00
|
|
|
} StatusBarTab;
|
|
|
|
|
2020-07-07 08:18:57 -04:00
|
|
|
typedef struct _status_bar_t
|
|
|
|
{
|
|
|
|
gchar* time;
|
|
|
|
char* prompt;
|
|
|
|
char* fulljid;
|
|
|
|
GHashTable* tabs;
|
2018-03-08 14:55:17 -05:00
|
|
|
int current_tab;
|
2018-03-07 15:58:07 -05:00
|
|
|
} StatusBar;
|
|
|
|
|
2020-07-07 08:18:57 -04:00
|
|
|
static GTimeZone* tz;
|
|
|
|
static StatusBar* statusbar;
|
|
|
|
static WINDOW* statusbar_win;
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
static int _status_bar_draw_time(int pos);
|
2023-04-03 12:37:23 -04:00
|
|
|
static int _status_bar_draw_maintext(int pos);
|
|
|
|
static int _status_bar_draw_bracket(gboolean current, int pos, const char* ch);
|
2018-03-09 20:30:28 -05:00
|
|
|
static int _status_bar_draw_extended_tabs(int pos);
|
2020-07-07 08:18:57 -04:00
|
|
|
static int _status_bar_draw_tab(StatusBarTab* tab, int pos, int num);
|
|
|
|
static void _destroy_tab(StatusBarTab* tab);
|
2018-03-08 18:11:49 -05:00
|
|
|
static int _tabs_width(void);
|
2020-07-07 08:18:57 -04:00
|
|
|
static char* _display_name(StatusBarTab* tab);
|
2018-03-09 20:30:28 -05:00
|
|
|
static gboolean _extended_new(void);
|
2023-04-03 12:37:23 -04:00
|
|
|
static gboolean _tabmode_is_actlist(void);
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2018-03-07 16:29:41 -05:00
|
|
|
status_bar_init(void)
|
2012-02-12 17:20:21 -05:00
|
|
|
{
|
2018-03-07 16:29:41 -05:00
|
|
|
tz = g_time_zone_new_local();
|
|
|
|
|
2018-03-07 15:58:07 -05:00
|
|
|
statusbar = malloc(sizeof(StatusBar));
|
2018-03-07 16:29:41 -05:00
|
|
|
statusbar->time = NULL;
|
2018-03-10 17:16:52 -05:00
|
|
|
statusbar->prompt = NULL;
|
2018-03-10 17:41:55 -05:00
|
|
|
statusbar->fulljid = NULL;
|
2018-03-08 14:55:17 -05:00
|
|
|
statusbar->tabs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)_destroy_tab);
|
2020-07-07 08:18:57 -04:00
|
|
|
StatusBarTab* console = calloc(1, sizeof(StatusBarTab));
|
2018-03-09 16:11:59 -05:00
|
|
|
console->window_type = WIN_CONSOLE;
|
|
|
|
console->identifier = strdup("console");
|
2019-06-04 05:16:24 -04:00
|
|
|
console->display_name = NULL;
|
2018-03-08 14:55:17 -05:00
|
|
|
g_hash_table_insert(statusbar->tabs, GINT_TO_POINTER(1), console);
|
|
|
|
statusbar->current_tab = 1;
|
2018-03-07 16:29:41 -05:00
|
|
|
|
2016-09-22 19:56:53 -04:00
|
|
|
int row = screen_statusbar_row();
|
2018-03-07 15:58:07 -05:00
|
|
|
int cols = getmaxx(stdscr);
|
|
|
|
statusbar_win = newwin(1, cols, row, 0);
|
2018-03-07 16:29:41 -05:00
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-02-12 17:20:21 -05:00
|
|
|
}
|
|
|
|
|
2018-03-07 16:29:41 -05:00
|
|
|
void
|
|
|
|
status_bar_close(void)
|
|
|
|
{
|
|
|
|
if (tz) {
|
|
|
|
g_time_zone_unref(tz);
|
|
|
|
}
|
|
|
|
if (statusbar) {
|
|
|
|
if (statusbar->time) {
|
|
|
|
g_free(statusbar->time);
|
|
|
|
}
|
2018-03-10 17:16:52 -05:00
|
|
|
if (statusbar->prompt) {
|
|
|
|
free(statusbar->prompt);
|
2018-03-07 17:12:15 -05:00
|
|
|
}
|
2018-03-10 17:41:55 -05:00
|
|
|
if (statusbar->fulljid) {
|
|
|
|
free(statusbar->fulljid);
|
|
|
|
}
|
|
|
|
if (statusbar->tabs) {
|
|
|
|
g_hash_table_destroy(statusbar->tabs);
|
|
|
|
}
|
2018-03-07 17:12:15 -05:00
|
|
|
free(statusbar);
|
2018-03-07 16:29:41 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
|
|
|
status_bar_resize(void)
|
2012-04-21 20:25:19 -04:00
|
|
|
{
|
2016-09-22 19:56:53 -04:00
|
|
|
int cols = getmaxx(stdscr);
|
2018-03-07 15:58:07 -05:00
|
|
|
werase(statusbar_win);
|
2016-09-22 19:56:53 -04:00
|
|
|
int row = screen_statusbar_row();
|
2018-03-07 15:58:07 -05:00
|
|
|
wresize(statusbar_win, 1, cols);
|
2019-12-02 08:03:53 -05:00
|
|
|
mvwin(statusbar_win, row, 0);
|
2018-03-07 16:37:29 -05:00
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-04-21 20:25:19 -04:00
|
|
|
}
|
2012-02-12 17:34:31 -05:00
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
|
|
|
status_bar_set_all_inactive(void)
|
2013-08-29 19:49:38 -04:00
|
|
|
{
|
2018-03-08 14:55:17 -05:00
|
|
|
g_hash_table_remove_all(statusbar->tabs);
|
2013-08-29 19:49:38 -04:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
|
|
|
status_bar_current(int i)
|
2013-10-02 18:33:48 -04:00
|
|
|
{
|
2018-03-08 14:55:17 -05:00
|
|
|
if (i == 0) {
|
|
|
|
statusbar->current_tab = 10;
|
|
|
|
} else {
|
|
|
|
statusbar->current_tab = i;
|
|
|
|
}
|
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2013-10-02 18:33:48 -04:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
|
|
|
status_bar_inactive(const int win)
|
2012-02-12 17:20:21 -05:00
|
|
|
{
|
2018-03-08 14:55:17 -05:00
|
|
|
int true_win = win;
|
|
|
|
if (true_win == 0) {
|
|
|
|
true_win = 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_hash_table_remove(statusbar->tabs, GINT_TO_POINTER(true_win));
|
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-02-12 17:20:21 -05:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2020-07-07 08:18:57 -04:00
|
|
|
_create_tab(const int win, win_type_t wintype, char* identifier, gboolean highlight)
|
2012-02-12 17:20:21 -05:00
|
|
|
{
|
2023-04-03 20:14:52 -04:00
|
|
|
int true_win = win == 0 ? 10 : win;
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2020-07-07 08:18:57 -04:00
|
|
|
StatusBarTab* tab = malloc(sizeof(StatusBarTab));
|
2018-03-09 16:11:59 -05:00
|
|
|
tab->identifier = strdup(identifier);
|
2019-06-04 08:50:25 -04:00
|
|
|
tab->highlight = highlight;
|
2018-03-09 16:11:59 -05:00
|
|
|
tab->window_type = wintype;
|
2019-06-04 05:16:24 -04:00
|
|
|
tab->display_name = NULL;
|
|
|
|
|
|
|
|
if (tab->window_type == WIN_CHAT) {
|
2019-06-04 10:02:56 -04:00
|
|
|
PContact contact = NULL;
|
|
|
|
if (roster_exists()) {
|
|
|
|
contact = roster_get_contact(tab->identifier);
|
|
|
|
}
|
2023-04-03 20:14:52 -04:00
|
|
|
const char* pcontact_name = contact ? p_contact_name(contact) : NULL;
|
2023-06-13 16:01:08 -04:00
|
|
|
auto_gchar gchar* pref = prefs_get_string(PREF_STATUSBAR_CHAT);
|
2023-04-03 20:14:52 -04:00
|
|
|
if (g_strcmp0("user", pref) == 0) {
|
|
|
|
if (pcontact_name) {
|
|
|
|
tab->display_name = strdup(pcontact_name);
|
|
|
|
} else {
|
2023-07-13 09:11:30 -04:00
|
|
|
auto_jid Jid* jidp = jid_create(tab->identifier);
|
2020-03-09 11:33:42 -04:00
|
|
|
if (jidp) {
|
2020-07-07 08:18:57 -04:00
|
|
|
tab->display_name = jidp->localpart != NULL ? strdup(jidp->localpart) : strdup(jidp->barejid);
|
2020-03-09 11:33:42 -04:00
|
|
|
} else {
|
|
|
|
tab->display_name = strdup(tab->identifier);
|
|
|
|
}
|
2019-06-04 05:16:24 -04:00
|
|
|
}
|
2023-04-03 20:14:52 -04:00
|
|
|
} else {
|
|
|
|
tab->display_name = strdup(tab->identifier);
|
2019-06-04 05:16:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-08 14:55:17 -05:00
|
|
|
g_hash_table_replace(statusbar->tabs, GINT_TO_POINTER(true_win), tab);
|
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-02-12 17:20:21 -05:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2020-07-07 08:18:57 -04:00
|
|
|
status_bar_active(const int win, win_type_t wintype, char* identifier)
|
2012-04-19 18:32:44 -04:00
|
|
|
{
|
2019-06-04 08:50:25 -04:00
|
|
|
_create_tab(win, wintype, identifier, FALSE);
|
|
|
|
}
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2019-06-04 08:50:25 -04:00
|
|
|
void
|
|
|
|
status_bar_new(const int win, win_type_t wintype, char* identifier)
|
|
|
|
{
|
|
|
|
_create_tab(win, wintype, identifier, TRUE);
|
2012-02-12 17:20:21 -05:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2020-07-07 08:18:57 -04:00
|
|
|
status_bar_set_prompt(const char* const prompt)
|
2012-02-12 17:20:21 -05:00
|
|
|
{
|
2018-03-10 17:16:52 -05:00
|
|
|
if (statusbar->prompt) {
|
|
|
|
free(statusbar->prompt);
|
|
|
|
statusbar->prompt = NULL;
|
2018-03-07 17:12:15 -05:00
|
|
|
}
|
2018-03-10 17:16:52 -05:00
|
|
|
statusbar->prompt = strdup(prompt);
|
2018-03-07 17:12:15 -05:00
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-02-12 17:20:21 -05:00
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_clear_prompt(void)
|
2012-02-12 17:34:31 -05:00
|
|
|
{
|
2018-03-10 17:16:52 -05:00
|
|
|
if (statusbar->prompt) {
|
|
|
|
free(statusbar->prompt);
|
|
|
|
statusbar->prompt = NULL;
|
2018-03-08 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw();
|
2012-02-12 17:34:31 -05:00
|
|
|
}
|
|
|
|
|
2018-03-10 17:41:55 -05:00
|
|
|
void
|
2020-07-07 08:18:57 -04:00
|
|
|
status_bar_set_fulljid(const char* const fulljid)
|
2018-03-10 17:41:55 -05:00
|
|
|
{
|
|
|
|
if (statusbar->fulljid) {
|
|
|
|
free(statusbar->fulljid);
|
|
|
|
statusbar->fulljid = NULL;
|
|
|
|
}
|
|
|
|
statusbar->fulljid = strdup(fulljid);
|
|
|
|
|
|
|
|
status_bar_draw();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
status_bar_clear_fulljid(void)
|
|
|
|
{
|
|
|
|
if (statusbar->fulljid) {
|
|
|
|
free(statusbar->fulljid);
|
|
|
|
statusbar->fulljid = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
status_bar_draw();
|
|
|
|
}
|
|
|
|
|
2014-04-07 16:12:30 -04:00
|
|
|
void
|
2018-03-10 17:16:52 -05:00
|
|
|
status_bar_draw(void)
|
2014-04-05 20:33:00 -04:00
|
|
|
{
|
2018-03-08 17:27:49 -05:00
|
|
|
werase(statusbar_win);
|
2018-03-07 16:37:29 -05:00
|
|
|
wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));
|
|
|
|
|
2018-03-07 17:12:15 -05:00
|
|
|
int pos = 1;
|
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
pos = _status_bar_draw_time(pos);
|
2018-03-07 16:29:41 -05:00
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
pos = _status_bar_draw_maintext(pos);
|
2018-03-07 16:29:41 -05:00
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
if (!_tabmode_is_actlist()) {
|
|
|
|
pos = getmaxx(stdscr) - _tabs_width();
|
|
|
|
if (pos < 0) {
|
|
|
|
pos = 0;
|
|
|
|
}
|
|
|
|
gint max_tabs = prefs_get_statusbartabs();
|
|
|
|
for (int i = 1; i <= max_tabs; i++) {
|
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
|
|
|
if (tab) {
|
|
|
|
pos = _status_bar_draw_tab(tab, pos, i);
|
|
|
|
}
|
2018-03-07 17:12:15 -05:00
|
|
|
}
|
2018-03-07 16:29:41 -05:00
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
_status_bar_draw_extended_tabs(pos);
|
|
|
|
} else {
|
|
|
|
pos++;
|
|
|
|
guint print_act = 0;
|
|
|
|
guint tabnum = g_hash_table_size(statusbar->tabs);
|
|
|
|
for (guint i = 1; i <= tabnum; ++i) {
|
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
|
|
|
if (tab && tab->highlight) {
|
|
|
|
print_act++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (print_act) {
|
|
|
|
pos = _status_bar_draw_bracket(FALSE, pos, "[");
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "Act: ");
|
|
|
|
pos += 5;
|
|
|
|
int status_attrs = theme_attrs(THEME_STATUS_NEW);
|
|
|
|
|
|
|
|
wattron(statusbar_win, status_attrs);
|
|
|
|
for (guint i = 1; i <= tabnum && print_act; ++i) {
|
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
|
|
|
if (tab && tab->highlight) {
|
|
|
|
if (print_act == 1) {
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "%d", i);
|
|
|
|
pos++;
|
|
|
|
} else {
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "%d,", i);
|
|
|
|
pos += 2;
|
|
|
|
}
|
|
|
|
for (guint limit = 10; i >= limit; limit *= 10) {
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
print_act--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
wattroff(statusbar_win, status_attrs);
|
|
|
|
pos = _status_bar_draw_bracket(FALSE, pos, "]");
|
|
|
|
}
|
|
|
|
}
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
wnoutrefresh(statusbar_win);
|
|
|
|
inp_put_back();
|
|
|
|
}
|
|
|
|
|
2018-03-09 20:30:28 -05:00
|
|
|
static gboolean
|
|
|
|
_extended_new(void)
|
|
|
|
{
|
|
|
|
gint max_tabs = prefs_get_statusbartabs();
|
|
|
|
int tabs_count = g_hash_table_size(statusbar->tabs);
|
|
|
|
if (tabs_count <= max_tabs) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2020-11-09 05:03:54 -05:00
|
|
|
for (int i = max_tabs + 1; i <= tabs_count; i++) {
|
2020-07-07 08:18:57 -04:00
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
2018-03-09 20:30:28 -05:00
|
|
|
if (tab && tab->highlight) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
static int
|
2018-03-09 20:30:28 -05:00
|
|
|
_status_bar_draw_extended_tabs(int pos)
|
2018-03-09 19:32:56 -05:00
|
|
|
{
|
2018-03-09 20:30:28 -05:00
|
|
|
gint max_tabs = prefs_get_statusbartabs();
|
2018-03-10 17:54:02 -05:00
|
|
|
if (max_tabs == 0) {
|
|
|
|
return pos;
|
|
|
|
}
|
2018-03-09 20:30:28 -05:00
|
|
|
|
|
|
|
if (g_hash_table_size(statusbar->tabs) > max_tabs) {
|
|
|
|
gboolean is_current = statusbar->current_tab > max_tabs;
|
|
|
|
|
|
|
|
pos = _status_bar_draw_bracket(is_current, pos, "[");
|
|
|
|
|
2019-09-20 04:40:54 -04:00
|
|
|
int status_attrs;
|
|
|
|
if (is_current) {
|
2019-09-29 09:47:11 -04:00
|
|
|
// currently selected
|
2019-09-20 04:40:54 -04:00
|
|
|
status_attrs = theme_attrs(THEME_STATUS_CURRENT);
|
|
|
|
} else if (_extended_new()) {
|
2019-09-29 09:47:11 -04:00
|
|
|
// new one
|
2018-03-09 20:30:28 -05:00
|
|
|
status_attrs = theme_attrs(THEME_STATUS_NEW);
|
2019-09-20 04:40:54 -04:00
|
|
|
} else {
|
2019-09-29 09:47:11 -04:00
|
|
|
// all other
|
2019-09-20 04:40:54 -04:00
|
|
|
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
|
2018-03-09 20:30:28 -05:00
|
|
|
}
|
|
|
|
wattron(statusbar_win, status_attrs);
|
|
|
|
mvwprintw(statusbar_win, 0, pos, ">");
|
|
|
|
wattroff(statusbar_win, status_attrs);
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
pos = _status_bar_draw_bracket(is_current, pos, "]");
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2020-07-07 08:18:57 -04:00
|
|
|
_status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
|
2018-03-09 20:30:28 -05:00
|
|
|
{
|
|
|
|
int display_num = num == 10 ? 0 : num;
|
|
|
|
gboolean is_current = num == statusbar->current_tab;
|
|
|
|
|
2018-03-09 18:44:28 -05:00
|
|
|
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
2018-03-08 17:27:49 -05:00
|
|
|
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
|
2020-05-21 10:04:26 -04:00
|
|
|
gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ);
|
|
|
|
|
|
|
|
// dont show this
|
|
|
|
if (!show_read && !is_current && !tab->highlight)
|
|
|
|
return pos;
|
2018-03-08 17:27:49 -05:00
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
pos = _status_bar_draw_bracket(is_current, pos, "[");
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2019-09-20 04:40:54 -04:00
|
|
|
int status_attrs;
|
|
|
|
if (is_current) {
|
|
|
|
status_attrs = theme_attrs(THEME_STATUS_CURRENT);
|
|
|
|
} else if (tab->highlight) {
|
2018-03-09 19:32:56 -05:00
|
|
|
status_attrs = theme_attrs(THEME_STATUS_NEW);
|
|
|
|
} else {
|
|
|
|
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
|
2018-03-08 14:55:17 -05:00
|
|
|
}
|
2018-03-09 19:32:56 -05:00
|
|
|
wattron(statusbar_win, status_attrs);
|
|
|
|
if (show_number) {
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "%d", display_num);
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
if (show_number && show_name) {
|
|
|
|
mvwprintw(statusbar_win, 0, pos, ":");
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
if (show_name) {
|
2023-07-11 07:23:58 -04:00
|
|
|
auto_char char* display_name = _display_name(tab);
|
2021-09-29 17:25:38 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", display_name);
|
2018-03-10 19:46:27 -05:00
|
|
|
pos += utf8_display_len(display_name);
|
2018-03-09 19:32:56 -05:00
|
|
|
}
|
|
|
|
wattroff(statusbar_win, status_attrs);
|
|
|
|
|
|
|
|
pos = _status_bar_draw_bracket(is_current, pos, "]");
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2023-04-03 12:37:23 -04:00
|
|
|
_status_bar_draw_bracket(gboolean current, int pos, const char* ch)
|
2018-03-09 19:32:56 -05:00
|
|
|
{
|
|
|
|
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
2018-03-08 14:55:17 -05:00
|
|
|
wattron(statusbar_win, bracket_attrs);
|
2018-03-09 19:32:56 -05:00
|
|
|
if (current) {
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "-");
|
|
|
|
} else {
|
2021-09-29 17:25:38 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", ch);
|
2018-03-09 19:32:56 -05:00
|
|
|
}
|
2018-03-08 14:55:17 -05:00
|
|
|
wattroff(statusbar_win, bracket_attrs);
|
|
|
|
pos++;
|
2018-03-09 19:32:56 -05:00
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
_status_bar_draw_time(int pos)
|
|
|
|
{
|
2023-06-13 16:01:08 -04:00
|
|
|
auto_gchar gchar* time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
|
2018-03-09 19:32:56 -05:00
|
|
|
if (g_strcmp0(time_pref, "off") == 0) {
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (statusbar->time) {
|
|
|
|
g_free(statusbar->time);
|
|
|
|
statusbar->time = NULL;
|
|
|
|
}
|
|
|
|
|
2020-07-07 08:18:57 -04:00
|
|
|
GDateTime* datetime = g_date_time_new_now(tz);
|
|
|
|
statusbar->time = g_date_time_format(datetime, time_pref);
|
2018-03-09 19:32:56 -05:00
|
|
|
assert(statusbar->time != NULL);
|
|
|
|
g_date_time_unref(datetime);
|
|
|
|
|
|
|
|
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
|
|
|
int time_attrs = theme_attrs(THEME_STATUS_TIME);
|
|
|
|
|
|
|
|
size_t len = strlen(statusbar->time);
|
|
|
|
wattron(statusbar_win, bracket_attrs);
|
|
|
|
mvwaddch(statusbar_win, 0, pos, '[');
|
2018-03-08 14:55:17 -05:00
|
|
|
pos++;
|
2018-03-09 19:32:56 -05:00
|
|
|
wattroff(statusbar_win, bracket_attrs);
|
|
|
|
wattron(statusbar_win, time_attrs);
|
2021-09-29 17:25:38 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", statusbar->time);
|
2018-03-09 19:32:56 -05:00
|
|
|
pos += len;
|
|
|
|
wattroff(statusbar_win, time_attrs);
|
2018-03-08 14:55:17 -05:00
|
|
|
wattron(statusbar_win, bracket_attrs);
|
2018-03-09 19:32:56 -05:00
|
|
|
mvwaddch(statusbar_win, 0, pos, ']');
|
2018-03-08 14:55:17 -05:00
|
|
|
wattroff(statusbar_win, bracket_attrs);
|
2018-03-09 19:32:56 -05:00
|
|
|
pos += 2;
|
2018-03-08 14:55:17 -05:00
|
|
|
|
2018-03-09 19:32:56 -05:00
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
static gboolean
|
|
|
|
_tabmode_is_actlist(void)
|
|
|
|
{
|
2023-06-13 16:01:08 -04:00
|
|
|
auto_gchar gchar* tabmode = prefs_get_string(PREF_STATUSBAR_TABMODE);
|
2023-04-03 12:37:23 -04:00
|
|
|
return g_strcmp0(tabmode, "actlist") == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-03-10 17:41:55 -05:00
|
|
|
_status_bar_draw_maintext(int pos)
|
2018-03-09 19:32:56 -05:00
|
|
|
{
|
2023-04-03 12:37:23 -04:00
|
|
|
const char* maintext = NULL;
|
|
|
|
auto_jid Jid* jidp = NULL;
|
2023-06-13 16:01:08 -04:00
|
|
|
auto_gchar gchar* self = prefs_get_string(PREF_STATUSBAR_SELF);
|
2023-04-03 20:14:52 -04:00
|
|
|
|
2018-03-10 17:16:52 -05:00
|
|
|
if (statusbar->prompt) {
|
2021-09-29 17:25:38 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", statusbar->prompt);
|
2023-04-03 12:37:23 -04:00
|
|
|
return utf8_display_len(statusbar->prompt);
|
2023-04-03 20:14:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (g_strcmp0(self, "off") == 0) {
|
2023-04-03 12:37:23 -04:00
|
|
|
return pos;
|
2023-04-03 20:14:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (statusbar->fulljid) {
|
2023-04-03 12:37:23 -04:00
|
|
|
jidp = jid_create(statusbar->fulljid);
|
|
|
|
if (g_strcmp0(self, "user") == 0) {
|
|
|
|
maintext = jidp->localpart;
|
|
|
|
} else if (g_strcmp0(self, "barejid") == 0) {
|
|
|
|
maintext = jidp->barejid;
|
|
|
|
} else {
|
|
|
|
maintext = statusbar->fulljid;
|
|
|
|
}
|
2018-03-10 17:41:55 -05:00
|
|
|
}
|
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
if (maintext == NULL) {
|
|
|
|
return pos;
|
|
|
|
}
|
2019-06-19 10:45:18 -04:00
|
|
|
|
2023-04-03 20:14:52 -04:00
|
|
|
if (statusbar->fulljid) {
|
2023-06-13 16:01:08 -04:00
|
|
|
auto_gchar gchar* pref = prefs_get_string(PREF_STATUSBAR_SELF);
|
2023-04-03 20:14:52 -04:00
|
|
|
|
|
|
|
if (g_strcmp0(pref, "off") == 0) {
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
if (g_strcmp0(pref, "user") == 0) {
|
2023-07-13 09:11:30 -04:00
|
|
|
auto_jid Jid* jidp = jid_create(statusbar->fulljid);
|
2023-04-03 20:14:52 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", jidp->localpart);
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
if (g_strcmp0(pref, "barejid") == 0) {
|
2023-07-13 09:11:30 -04:00
|
|
|
auto_jid Jid* jidp = jid_create(statusbar->fulljid);
|
2023-04-03 20:14:52 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", jidp->barejid);
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", statusbar->fulljid);
|
|
|
|
}
|
|
|
|
|
2023-04-03 12:37:23 -04:00
|
|
|
gboolean actlist_tabmode = _tabmode_is_actlist();
|
|
|
|
auto_gchar gchar* maintext_ = NULL;
|
|
|
|
if (actlist_tabmode) {
|
|
|
|
pos = _status_bar_draw_bracket(FALSE, pos, "[");
|
|
|
|
maintext_ = g_strdup_printf("%d:%s", statusbar->current_tab, maintext);
|
|
|
|
maintext = maintext_;
|
2018-03-09 19:32:56 -05:00
|
|
|
}
|
2023-04-03 12:37:23 -04:00
|
|
|
mvwprintw(statusbar_win, 0, pos, "%s", maintext);
|
|
|
|
pos += utf8_display_len(maintext);
|
|
|
|
if (actlist_tabmode) {
|
|
|
|
pos = _status_bar_draw_bracket(FALSE, pos, "]");
|
|
|
|
}
|
|
|
|
return pos;
|
2014-07-18 18:17:42 -04:00
|
|
|
}
|
2018-03-08 18:11:49 -05:00
|
|
|
|
|
|
|
static void
|
2020-07-07 08:18:57 -04:00
|
|
|
_destroy_tab(StatusBarTab* tab)
|
2018-03-08 18:11:49 -05:00
|
|
|
{
|
|
|
|
if (tab) {
|
2018-03-09 16:11:59 -05:00
|
|
|
if (tab->identifier) {
|
|
|
|
free(tab->identifier);
|
2018-03-08 18:11:49 -05:00
|
|
|
}
|
2019-06-04 05:16:24 -04:00
|
|
|
if (tab->display_name) {
|
|
|
|
free(tab->display_name);
|
|
|
|
}
|
2018-03-08 18:11:49 -05:00
|
|
|
free(tab);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
_tabs_width(void)
|
|
|
|
{
|
2018-03-09 18:44:28 -05:00
|
|
|
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
2018-03-08 18:11:49 -05:00
|
|
|
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
|
2020-05-21 10:04:26 -04:00
|
|
|
gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ);
|
2018-03-08 18:11:49 -05:00
|
|
|
gint max_tabs = prefs_get_statusbartabs();
|
|
|
|
|
2018-03-09 18:44:28 -05:00
|
|
|
if (show_name && show_number) {
|
2018-03-09 20:30:28 -05:00
|
|
|
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
|
2020-11-09 05:03:54 -05:00
|
|
|
for (int i = 1; i <= max_tabs; i++) {
|
2020-07-07 08:18:57 -04:00
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
2018-03-09 17:42:20 -05:00
|
|
|
if (tab) {
|
2020-05-21 10:04:26 -04:00
|
|
|
gboolean is_current = i == statusbar->current_tab;
|
|
|
|
// dont calculate this in because not shown
|
|
|
|
if (!show_read && !is_current && !tab->highlight)
|
|
|
|
continue;
|
|
|
|
|
2023-07-11 07:23:58 -04:00
|
|
|
auto_char char* display_name = _display_name(tab);
|
2018-03-10 19:46:27 -05:00
|
|
|
width += utf8_display_len(display_name);
|
2018-03-09 17:42:20 -05:00
|
|
|
width += 4;
|
2018-03-08 18:11:49 -05:00
|
|
|
}
|
|
|
|
}
|
2018-03-09 17:42:20 -05:00
|
|
|
return width;
|
2018-03-08 18:11:49 -05:00
|
|
|
}
|
2018-03-09 18:44:28 -05:00
|
|
|
|
|
|
|
if (show_name && !show_number) {
|
2018-03-09 20:30:28 -05:00
|
|
|
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
|
2020-11-09 05:03:54 -05:00
|
|
|
for (int i = 1; i <= max_tabs; i++) {
|
2020-07-07 08:18:57 -04:00
|
|
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
2018-03-09 18:44:28 -05:00
|
|
|
if (tab) {
|
2020-05-21 10:04:26 -04:00
|
|
|
gboolean is_current = i == statusbar->current_tab;
|
|
|
|
// dont calculate this in because not shown
|
|
|
|
if (!show_read && !is_current && !tab->highlight)
|
|
|
|
continue;
|
|
|
|
|
2023-07-11 07:23:58 -04:00
|
|
|
auto_char char* display_name = _display_name(tab);
|
2018-03-10 19:46:27 -05:00
|
|
|
width += utf8_display_len(display_name);
|
2018-03-09 18:44:28 -05:00
|
|
|
width += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return width;
|
|
|
|
}
|
|
|
|
|
2018-03-09 20:30:28 -05:00
|
|
|
if (g_hash_table_size(statusbar->tabs) > max_tabs) {
|
|
|
|
return max_tabs * 3 + (g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1);
|
|
|
|
}
|
|
|
|
return g_hash_table_size(statusbar->tabs) * 3 + (g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1);
|
2018-03-08 18:11:49 -05:00
|
|
|
}
|
2018-03-09 16:11:59 -05:00
|
|
|
|
|
|
|
static char*
|
2020-07-07 08:18:57 -04:00
|
|
|
_display_name(StatusBarTab* tab)
|
2018-03-09 16:11:59 -05:00
|
|
|
{
|
2020-07-07 08:18:57 -04:00
|
|
|
char* fullname = NULL;
|
2018-03-10 20:18:46 -05:00
|
|
|
|
2018-03-09 16:11:59 -05:00
|
|
|
if (tab->window_type == WIN_CONSOLE) {
|
2018-03-10 20:18:46 -05:00
|
|
|
fullname = strdup("console");
|
|
|
|
} else if (tab->window_type == WIN_XML) {
|
|
|
|
fullname = strdup("xmlconsole");
|
|
|
|
} else if (tab->window_type == WIN_PLUGIN) {
|
|
|
|
fullname = strdup(tab->identifier);
|
|
|
|
} else if (tab->window_type == WIN_CHAT) {
|
2019-06-04 05:16:24 -04:00
|
|
|
if (tab && tab->display_name) {
|
|
|
|
fullname = strdup(tab->display_name);
|
2018-03-09 16:11:59 -05:00
|
|
|
}
|
2018-03-10 20:18:46 -05:00
|
|
|
} else if (tab->window_type == WIN_MUC) {
|
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.
2023-10-05 20:16:04 -04:00
|
|
|
auto_gchar gchar* mucwin_title = mucwin_generate_title(tab->identifier, PREF_STATUSBAR_ROOM_TITLE);
|
|
|
|
fullname = strdup(mucwin_title);
|
2018-04-11 12:57:50 -04:00
|
|
|
} else if (tab->window_type == WIN_CONFIG) {
|
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.
2023-10-05 20:16:04 -04:00
|
|
|
auto_gchar gchar* mucwin_title = mucwin_generate_title(tab->identifier, PREF_STATUSBAR_ROOM_TITLE);
|
|
|
|
fullname = g_strconcat(mucwin_title, " conf", NULL);
|
2018-03-10 20:18:46 -05:00
|
|
|
} else if (tab->window_type == WIN_PRIVATE) {
|
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.
2023-10-05 20:16:04 -04:00
|
|
|
auto_jid Jid* jid = jid_create(tab->identifier);
|
|
|
|
auto_gchar gchar* mucwin_title = mucwin_generate_title(jid->barejid, PREF_STATUSBAR_ROOM_TITLE);
|
|
|
|
fullname = g_strconcat(mucwin_title, "/", jid->resourcepart, NULL);
|
2018-03-10 20:18:46 -05:00
|
|
|
} else {
|
|
|
|
fullname = strdup("window");
|
2018-03-09 16:11:59 -05:00
|
|
|
}
|
2018-03-10 20:18:46 -05:00
|
|
|
|
|
|
|
gint tablen = prefs_get_statusbartablen();
|
|
|
|
if (tablen == 0) {
|
|
|
|
return fullname;
|
|
|
|
}
|
|
|
|
|
|
|
|
int namelen = utf8_display_len(fullname);
|
|
|
|
if (namelen < tablen) {
|
|
|
|
return fullname;
|
|
|
|
}
|
|
|
|
|
2023-07-11 07:23:58 -04:00
|
|
|
auto_gchar gchar* trimmed = g_utf8_substring(fullname, 0, tablen);
|
2020-07-07 08:18:57 -04:00
|
|
|
char* trimmedname = strdup(trimmed);
|
2023-07-11 07:23:58 -04:00
|
|
|
free(fullname);
|
2018-03-10 20:18:46 -05:00
|
|
|
|
|
|
|
return trimmedname;
|
2018-03-09 16:11:59 -05:00
|
|
|
}
|