aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Merge branch 'master' into configure

Browse Source
This commit is contained in:
James Booth 2016-09-26 00:57:58 +01:00
commit 5bd01cf1ec
36 changed files with 886 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,3 +1,8 @@
0.6.0
=====
- Allow moving vertical window positions (/titlebar, /mainwin, /statusbar, /inputwin)
0.5.0
=====

3
Makefile.am
View File

@ -20,6 +20,7 @@ core_sources = \
src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \
src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
src/ui/screen.h src/ui/screen.c \
src/ui/console.c src/ui/notifier.c \
src/ui/win_types.h \
src/ui/window_list.c src/ui/window_list.h \
@ -186,7 +187,7 @@ themes_sources = themes/*
icons_sources = icons/*
script_sources = bootstrap.sh configure-debug install-all.sh
script_sources = bootstrap.sh configure-debug
man_sources = docs/profanity.1

2
README.md
View File

@ -15,3 +15,5 @@ Homepage: http://www.profanity.im
Chat room: profanitydev@conference.jabber.org
Mailing List: https://groups.google.com/forum/#!forum/profanitydev
Plugins repository: https://github.com/boothj5/profanity-plugins

2
configure.ac
View File

@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([profanity], [0.5.0], [boothj5web@gmail.com])
AC_INIT([profanity], [0.6.0], [boothj5web@gmail.com])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/main.c])

216
install-all.sh
View File

@ -1,216 +0,0 @@
#!/bin/bash
set -o errtrace
STATUS=development
error_handler()
{
ERR_CODE=$?
echo "Error $ERR_CODE with command '$BASH_COMMAND' on line ${BASH_LINENO[0]}. Exiting."
exit $ERR_CODE
}
trap error_handler ERR
debian_prepare()
{
echo
echo Profanity installer ... updating apt repositories
echo
sudo apt-get update
echo
echo Profanity installer... installing dependencies
echo
sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libreadline-dev libtool libgpgme11-dev libgtk2.0-dev autoconf-archive
}
fedora_prepare()
{
echo
echo Profanity installer... installing dependencies
echo
sudo dnf -y install gcc git autoconf automake openssl-devel expat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool gpgme-devel gtk2-devel autoconf-archive
}
opensuse_prepare()
{
echo
echo Profanity installer...installing dependencies
echo
sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool libgpgme-devel autoconf-archive
}
centos_prepare()
{
echo
echo Profanity installer...installing dependencies
echo
sudo yum -y install epel-release
sudo yum -y install git
sudo yum -y install gcc autoconf automake cmake
sudo yum -y install openssl-devel expat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool gpgme-devel autoconf-archive
}
cygwin_prepare()
{
echo
echo Profanity installer... installing dependencies
echo
if ! command -v apt-cyg &>/dev/null; then cyg_install_apt_cyg; fi
if [ -n "$CYG_MIRROR" ]; then
apt-cyg -m $CYG_MIRROR install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel libgcrypt-devel libreadline-devel libgpgme-devel libtool libpcre-devel libisl10 libcloog-isl4 autoconf-archive
else
apt-cyg install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel libgcrypt-devel libreadline-devel libgpgme-devel libtool libpcre-devel libisl10 libcloog-isl4 autoconf-archive
fi
}
install_lib_mesode()
{
echo
echo Profanity installer... installing libmesode
echo
git clone https://github.com/boothj5/libmesode.git
cd libmesode
./bootstrap.sh
./configure --prefix=$1
make
sudo make install
cd ..
}
install_profanity()
{
echo
echo Profanity installer... installing Profanity
echo
if [ "${STATUS}" = "development" ]; then
./bootstrap.sh
fi
./configure
make
sudo make install
}
cyg_install_apt_cyg()
{
echo
echo Profanity installer... installing apt-cyg
echo
wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg
#wget --no-check-certificate https://raw.github.com/boothj5/apt-cyg/master/apt-cyg
#wget http://apt-cyg.googlecode.com/svn/trunk/apt-cyg
chmod +x apt-cyg
mv apt-cyg /usr/local/bin/
}
cyg_install_lib_mesode()
{
echo
echo Profanity installer... installing libmesode
echo
git clone https://github.com/boothj5/libmesode.git
cd libmesode
./bootstrap.sh
./bootstrap.sh # second call seems to fix problem on cygwin
./configure --prefix=/usr
make
make install
cd ..
}
cyg_install_profanity()
{
echo
echo Profanity installer... installing Profanity
echo
if [ "${STATUS}" = "development" ]; then
./bootstrap.sh
fi
./configure
make
make install
}
cleanup()
{
echo
echo Profanity installer... cleaning up
echo
echo Removing libmesode repository...
rm -rf libmesode
echo
echo Profanity installer... complete!
echo
echo Type \'profanity\' to run.
echo
}
while getopts m: opt
do
case "$opt" in
m) CYG_MIRROR=$OPTARG;;
esac
done
OS=`uname -s`
DIST=unknown
if [ "${OS}" = "Linux" ]; then
if [ -f /etc/fedora-release ]; then
DIST=fedora
elif [ -f /etc/debian_version ]; then
DIST=debian
elif [ -f /etc/centos-release ]; then
DIST=centos
elif [ -f /etc/os-release ]; then
DIST=opensuse
fi
else
echo $OS | grep -i cygwin
if [ "$?" -eq 0 ]; then
DIST=cygwin
fi
fi
case "$DIST" in
unknown) echo The install script will not work on this OS.
echo Try a manual install instead.
exit
;;
fedora) fedora_prepare
install_lib_mesode /usr
install_profanity
;;
debian) debian_prepare
install_lib_mesode /usr
install_profanity
;;
opensuse) opensuse_prepare
install_lib_mesode /usr/local
sudo /sbin/ldconfig
install_profanity
;;
centos) centos_prepare
install_lib_mesode /usr
sudo ldconfig
install_profanity
;;
cygwin) cygwin_prepare
cyg_install_lib_mesode
cyg_install_profanity
;;
esac
cleanup

37
src/command/cmd_ac.c
View File

@ -83,7 +83,7 @@ static char* _ban_autocomplete(ProfWin *window, const char *const input);
static char* _affiliation_autocomplete(ProfWin *window, const char *const input);
static char* _role_autocomplete(ProfWin *window, const char *const input);
static char* _resource_autocomplete(ProfWin *window, const char *const input);
static char* _titlebar_autocomplete(ProfWin *window, const char *const input);
static char* _wintitle_autocomplete(ProfWin *window, const char *const input);
static char* _inpblock_autocomplete(ProfWin *window, const char *const input);
static char* _time_autocomplete(ProfWin *window, const char *const input);
static char* _receipts_autocomplete(ProfWin *window, const char *const input);
@ -123,7 +123,7 @@ static Autocomplete autoaway_ac;
static Autocomplete autoaway_mode_ac;
static Autocomplete autoaway_presence_ac;
static Autocomplete autoconnect_ac;
static Autocomplete titlebar_ac;
static Autocomplete wintitle_ac;
static Autocomplete theme_ac;
static Autocomplete theme_load_ac;
static Autocomplete account_ac;
@ -194,6 +194,7 @@ static Autocomplete blocked_ac;
static Autocomplete tray_ac;
static Autocomplete presence_ac;
static Autocomplete presence_setting_ac;
static Autocomplete winpos_ac;
void
cmd_ac_init(void)
@ -280,9 +281,9 @@ cmd_ac_init(void)
autocomplete_add(sub_ac, "sent");
autocomplete_add(sub_ac, "received");
titlebar_ac = autocomplete_new();
autocomplete_add(titlebar_ac, "show");
autocomplete_add(titlebar_ac, "goodbye");
wintitle_ac = autocomplete_new();
autocomplete_add(wintitle_ac, "show");
autocomplete_add(wintitle_ac, "goodbye");
log_ac = autocomplete_new();
autocomplete_add(log_ac, "maxsize");
@ -735,6 +736,10 @@ cmd_ac_init(void)
autocomplete_add(presence_setting_ac, "all");
autocomplete_add(presence_setting_ac, "online");
autocomplete_add(presence_setting_ac, "none");
winpos_ac = autocomplete_new();
autocomplete_add(winpos_ac, "up");
autocomplete_add(winpos_ac, "down");
}
void
@ -960,7 +965,7 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(roster_remove_all_ac);
autocomplete_reset(roster_private_ac);
autocomplete_reset(group_ac);
autocomplete_reset(titlebar_ac);
autocomplete_reset(wintitle_ac);
autocomplete_reset(bookmark_ac);
autocomplete_reset(bookmark_property_ac);
autocomplete_reset(otr_ac);
@ -998,6 +1003,7 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(tray_ac);
autocomplete_reset(presence_ac);
autocomplete_reset(presence_setting_ac);
autocomplete_reset(winpos_ac);
autocomplete_reset(script_ac);
if (script_show_ac) {
@ -1043,7 +1049,7 @@ cmd_ac_uninit(void)
autocomplete_free(notify_mention_ac);
autocomplete_free(notify_trigger_ac);
autocomplete_free(sub_ac);
autocomplete_free(titlebar_ac);
autocomplete_free(wintitle_ac);
autocomplete_free(log_ac);
autocomplete_free(prefs_ac);
autocomplete_free(autoaway_ac);
@ -1120,6 +1126,7 @@ cmd_ac_uninit(void)
autocomplete_free(tray_ac);
autocomplete_free(presence_ac);
autocomplete_free(presence_setting_ac);
autocomplete_free(winpos_ac);
}
static char*
@ -1200,8 +1207,8 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
}
}
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping" };
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac };
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping", "/titlebar", "/mainwin", "/statusbar", "/inputwin" };
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac, winpos_ac, winpos_ac, winpos_ac, winpos_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
@ -1235,7 +1242,7 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
g_hash_table_insert(ac_funcs, "/affiliation", _affiliation_autocomplete);
g_hash_table_insert(ac_funcs, "/role", _role_autocomplete);
g_hash_table_insert(ac_funcs, "/resource", _resource_autocomplete);
g_hash_table_insert(ac_funcs, "/titlebar", _titlebar_autocomplete);
g_hash_table_insert(ac_funcs, "/wintitle", _wintitle_autocomplete);
g_hash_table_insert(ac_funcs, "/inpblock", _inpblock_autocomplete);
g_hash_table_insert(ac_funcs, "/time", _time_autocomplete);
g_hash_table_insert(ac_funcs, "/receipts", _receipts_autocomplete);
@ -1250,7 +1257,7 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
g_hash_table_insert(ac_funcs, "/sendfile", _sendfile_autocomplete);
g_hash_table_insert(ac_funcs, "/blocked", _blocked_autocomplete);
g_hash_table_insert(ac_funcs, "/tray", _tray_autocomplete);
g_hash_table_insert(ac_funcs, "/presence", _presence_autocomplete);
g_hash_table_insert(ac_funcs, "/presence", _presence_autocomplete);
int len = strlen(input);
char parsed[len+1];
@ -2069,21 +2076,21 @@ _resource_autocomplete(ProfWin *window, const char *const input)
}
static char*
_titlebar_autocomplete(ProfWin *window, const char *const input)
_wintitle_autocomplete(ProfWin *window, const char *const input)
{
char *found = NULL;
found = autocomplete_param_with_func(input, "/titlebar show", prefs_autocomplete_boolean_choice);
found = autocomplete_param_with_func(input, "/wintitle show", prefs_autocomplete_boolean_choice);
if (found) {
return found;
}
found = autocomplete_param_with_func(input, "/titlebar goodbye", prefs_autocomplete_boolean_choice);
found = autocomplete_param_with_func(input, "/wintitle goodbye", prefs_autocomplete_boolean_choice);
if (found) {
return found;
}
found = autocomplete_param_with_ac(input, "/titlebar", titlebar_ac, FALSE);
found = autocomplete_param_with_ac(input, "/wintitle", wintitle_ac, FALSE);
if (found) {
return found;
}

78
src/command/cmd_defs.c
View File

@ -1302,6 +1302,74 @@ static struct cmd_t command_defs[] =
CMD_NOEXAMPLES
},
{ "/titlebar",
parse_args, 1, 1, &cons_winpos_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_titlebar)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/titlebar up",
"/titlebar down")
CMD_DESC(
"Move the title bar.")
CMD_ARGS(
{ "up", "Move the title bar up the screen." },
{ "down", "Move the title bar down the screen." })
CMD_NOEXAMPLES
},
{ "/mainwin",
parse_args, 1, 1, &cons_winpos_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_mainwin)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/mainwin up",
"/mainwin down")
CMD_DESC(
"Move the main window.")
CMD_ARGS(
{ "up", "Move the main window up the screen." },
{ "down", "Move the main window down the screen." })
CMD_NOEXAMPLES
},
{ "/statusbar",
parse_args, 1, 1, &cons_winpos_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_statusbar)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/statusbar up",
"/statusbar down")
CMD_DESC(
"Move the status bar.")
CMD_ARGS(
{ "up", "Move the status bar up the screen." },
{ "down", "Move the status bar down the screen." })
CMD_NOEXAMPLES
},
{ "/inputwin",
parse_args, 1, 1, &cons_winpos_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_inputwin)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/inputwin up",
"/inputwin down")
CMD_DESC(
"Move the input window.")
CMD_ARGS(
{ "up", "Move the input window up the screen." },
{ "down", "Move the input window down the screen." })
CMD_NOEXAMPLES
},
{ "/notify",
parse_args_with_freetext, 0, 4, NULL,
CMD_NOSUBFUNCS
@ -1475,15 +1543,15 @@ static struct cmd_t command_defs[] =
CMD_NOEXAMPLES
},
{ "/titlebar",
parse_args, 2, 2, &cons_titlebar_setting,
{ "/wintitle",
parse_args, 2, 2, &cons_wintitle_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_titlebar)
CMD_MAINFUNC(cmd_wintitle)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/titlebar show on|off",
"/titlebar goodbye on|off")
"/wintitle show on|off",
"/wintitle goodbye on|off")
CMD_DESC(
"Allow Profanity to modify the window title bar.")
CMD_ARGS(

145
src/command/cmd_funcs.c
View File

@ -1662,7 +1662,7 @@ cmd_theme(ProfWin *window, const char *const command, gchar **args)
} else {
ui_hide_all_room_rosters();
}
ui_redraw();
ui_resize();
cons_show("Loaded theme: %s", args[1]);
} else {
cons_show("Couldn't find theme: %s", args[1]);
@ -4212,13 +4212,6 @@ cmd_room(ProfWin *window, const char *const command, gchar **args)
gboolean
cmd_occupants(ProfWin *window, const char *const command, gchar **args)
{
jabber_conn_status_t conn_status = connection_get_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
if (g_strcmp0(args[0], "size") == 0) {
if (!args[1]) {
cons_bad_cmd_usage(command);
@ -4265,6 +4258,12 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args)
}
}
jabber_conn_status_t conn_status = connection_get_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
if (window->type != WIN_MUC) {
cons_show("Cannot apply setting when not in chat room.");
return TRUE;
@ -5057,7 +5056,7 @@ cmd_states(ProfWin *window, const char *const command, gchar **args)
}
gboolean
cmd_titlebar(ProfWin *window, const char *const command, gchar **args)
cmd_wintitle(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "show") != 0 && g_strcmp0(args[0], "goodbye") != 0) {
cons_bad_cmd_usage(command);
@ -5067,9 +5066,9 @@ cmd_titlebar(ProfWin *window, const char *const command, gchar **args)
ui_clear_win_title();
}
if (g_strcmp0(args[0], "show") == 0) {
_cmd_set_boolean_preference(args[1], command, "Titlebar show", PREF_TITLEBAR_SHOW);
_cmd_set_boolean_preference(args[1], command, "Window title show", PREF_WINTITLE_SHOW);
} else {
_cmd_set_boolean_preference(args[1], command, "Titlebar goodbye", PREF_TITLEBAR_GOODBYE);
_cmd_set_boolean_preference(args[1], command, "Window title goodbye", PREF_WINTITLE_GOODBYE);
}
return TRUE;
@ -5522,6 +5521,130 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
gboolean
cmd_titlebar(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "up") == 0) {
gboolean result = prefs_titlebar_pos_up();
if (result) {
ui_resize();
cons_show("Title bar moved up.");
} else {
cons_show("Could not move title bar up.");
}
return TRUE;
}
if (g_strcmp0(args[0], "down") == 0) {
gboolean result = prefs_titlebar_pos_down();
if (result) {
ui_resize();
cons_show("Title bar moved down.");
} else {
cons_show("Could not move title bar down.");
}
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}
gboolean
cmd_mainwin(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "up") == 0) {
gboolean result = prefs_mainwin_pos_up();
if (result) {
ui_resize();
cons_show("Main window moved up.");
} else {
cons_show("Could not move main window up.");
}
return TRUE;
}
if (g_strcmp0(args[0], "down") == 0) {
gboolean result = prefs_mainwin_pos_down();
if (result) {
ui_resize();
cons_show("Main window moved down.");
} else {
cons_show("Could not move main window down.");
}
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}
gboolean
cmd_statusbar(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "up") == 0) {
gboolean result = prefs_statusbar_pos_up();
if (result) {
ui_resize();
cons_show("Status bar moved up");
} else {
cons_show("Could not move status bar up.");
}
return TRUE;
}
if (g_strcmp0(args[0], "down") == 0) {
gboolean result = prefs_statusbar_pos_down();
if (result) {
ui_resize();
cons_show("Status bar moved down.");
} else {
cons_show("Could not move status bar down.");
}
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}
gboolean
cmd_inputwin(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "up") == 0) {
gboolean result = prefs_inputwin_pos_up();
if (result) {
ui_resize();
cons_show("Input window moved up.");
} else {
cons_show("Could not move input window up.");
}
return TRUE;
}
if (g_strcmp0(args[0], "down") == 0) {
gboolean result = prefs_inputwin_pos_down();
if (result) {
ui_resize();
cons_show("Input window moved down.");
} else {
cons_show("Could not move input window down.");
}
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}
gboolean
cmd_log(ProfWin *window, const char *const command, gchar **args)
{

6
src/command/cmd_funcs.h
View File

@ -128,7 +128,7 @@ gboolean cmd_status(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_sub(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_theme(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_tiny(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_titlebar(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_wintitle(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_vercheck(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_who(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_win(ProfWin *window, const char *const command, gchar **args);
@ -149,6 +149,10 @@ gboolean cmd_wrap(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_time(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_resource(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_inpblock(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_titlebar(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_mainwin(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_statusbar(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_inputwin(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_encwarn(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_script(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_export(ProfWin *window, const char *const command, gchar **args);

326
src/config/preferences.c
View File

@ -143,6 +143,18 @@ prefs_load(void)
prefs_free_string(value);
}
// move pre 0.6.0 titlebar settings to wintitle
if (g_key_file_has_key(prefs, PREF_GROUP_UI, "titlebar.show", NULL)) {
gboolean show = g_key_file_get_boolean(prefs, PREF_GROUP_UI, "titlebar.show", NULL);
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "wintitle.show", show);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar.show", NULL);
}
if (g_key_file_has_key(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL)) {
gboolean goodbye = g_key_file_get_boolean(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL);
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "wintitle.goodbye", goodbye);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL);
}
_save_prefs();
boolean_choice_ac = autocomplete_new();
@ -1049,6 +1061,308 @@ prefs_get_room_notify_triggers(void)
return result;
}
ProfWinPlacement*
prefs_create_profwin_placement(int titlebar, int mainwin, int statusbar, int inputwin)
{
ProfWinPlacement *placement = malloc(sizeof(ProfWinPlacement));
placement->titlebar_pos = titlebar;
placement->mainwin_pos = mainwin;
placement->statusbar_pos = statusbar;
placement->inputwin_pos = inputwin;
return placement;
}
void
prefs_free_win_placement(ProfWinPlacement *placement)
{
free(placement);
}
ProfWinPlacement*
prefs_get_win_placement(void)
{
// read from settings file
int titlebar_pos = g_key_file_get_integer(prefs, PREF_GROUP_UI, "titlebar.position", NULL);
int mainwin_pos = g_key_file_get_integer(prefs, PREF_GROUP_UI, "mainwin.position", NULL);
int statusbar_pos = g_key_file_get_integer(prefs, PREF_GROUP_UI, "statusbar.position", NULL);
int inputwin_pos = g_key_file_get_integer(prefs, PREF_GROUP_UI, "inputwin.position", NULL);
// default if setting invalid, or not present
if (titlebar_pos < 1 || titlebar_pos > 4) {
titlebar_pos = 1;
}
if (mainwin_pos < 1 || mainwin_pos > 4) {
mainwin_pos = 2;
}
if (statusbar_pos < 1 || statusbar_pos > 4) {
statusbar_pos = 3;
}
if (inputwin_pos < 1 || inputwin_pos > 4) {
inputwin_pos = 4;
}
// return default if duplicates found
if (titlebar_pos == mainwin_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
if (titlebar_pos == statusbar_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
if (titlebar_pos == inputwin_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
if (mainwin_pos == statusbar_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
if (mainwin_pos == inputwin_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
if (statusbar_pos == inputwin_pos) {
return prefs_create_profwin_placement(1, 2, 3, 4);
}
// return settings
return prefs_create_profwin_placement(titlebar_pos, mainwin_pos, statusbar_pos, inputwin_pos);
}
void
prefs_save_win_placement(ProfWinPlacement *placement)
{
g_key_file_set_integer(prefs, PREF_GROUP_UI, "titlebar.position", placement->titlebar_pos);
g_key_file_set_integer(prefs, PREF_GROUP_UI, "mainwin.position", placement->mainwin_pos);
g_key_file_set_integer(prefs, PREF_GROUP_UI, "statusbar.position", placement->statusbar_pos);
g_key_file_set_integer(prefs, PREF_GROUP_UI, "inputwin.position", placement->inputwin_pos);
_save_prefs();
}
gboolean
prefs_titlebar_pos_up(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos<5; pos++) {
if (placement->titlebar_pos == pos) {
placement->titlebar_pos = pos-1;
if (placement->mainwin_pos == pos-1) {
placement->mainwin_pos = pos;
} else if (placement->statusbar_pos == pos-1) {
placement->statusbar_pos = pos;
} else if (placement->inputwin_pos == pos-1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_mainwin_pos_up(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos<5; pos++) {
if (placement->mainwin_pos == pos) {
placement->mainwin_pos = pos-1;
if (placement->titlebar_pos == pos-1) {
placement->titlebar_pos = pos;
} else if (placement->statusbar_pos == pos-1) {
placement->statusbar_pos = pos;
} else if (placement->inputwin_pos == pos-1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_statusbar_pos_up(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos<5; pos++) {
if (placement->statusbar_pos == pos) {
placement->statusbar_pos = pos-1;
if (placement->titlebar_pos == pos-1) {
placement->titlebar_pos = pos;
} else if (placement->mainwin_pos == pos-1) {
placement->mainwin_pos = pos;
} else if (placement->inputwin_pos == pos-1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_inputwin_pos_up(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos<5; pos++) {
if (placement->inputwin_pos == pos) {
placement->inputwin_pos = pos-1;
if (placement->titlebar_pos == pos-1) {
placement->titlebar_pos = pos;
} else if (placement->mainwin_pos == pos-1) {
placement->mainwin_pos = pos;
} else if (placement->statusbar_pos == pos-1) {
placement->statusbar_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_titlebar_pos_down(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos<4; pos++) {
if (placement->titlebar_pos == pos) {
placement->titlebar_pos = pos+1;
if (placement->mainwin_pos == pos+1) {
placement->mainwin_pos = pos;
} else if (placement->statusbar_pos == pos+1) {
placement->statusbar_pos = pos;
} else if (placement->inputwin_pos == pos+1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_mainwin_pos_down(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos<4; pos++) {
if (placement->mainwin_pos == pos) {
placement->mainwin_pos = pos+1;
if (placement->titlebar_pos == pos+1) {
placement->titlebar_pos = pos;
} else if (placement->statusbar_pos == pos+1) {
placement->statusbar_pos = pos;
} else if (placement->inputwin_pos == pos+1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_statusbar_pos_down(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos<4; pos++) {
if (placement->statusbar_pos == pos) {
placement->statusbar_pos = pos+1;
if (placement->titlebar_pos == pos+1) {
placement->titlebar_pos = pos;
} else if (placement->mainwin_pos == pos+1) {
placement->mainwin_pos = pos;
} else if (placement->inputwin_pos == pos+1) {
placement->inputwin_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_inputwin_pos_down(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos<4; pos++) {
if (placement->inputwin_pos == pos) {
placement->inputwin_pos = pos+1;
if (placement->titlebar_pos == pos+1) {
placement->titlebar_pos = pos;
} else if (placement->mainwin_pos == pos+1) {
placement->mainwin_pos = pos;
} else if (placement->statusbar_pos == pos+1) {
placement->statusbar_pos = pos;
}
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
return TRUE;
}
}
prefs_free_win_placement(placement);
return FALSE;
}
gboolean
prefs_add_alias(const char *const name, const char *const value)
{
@ -1162,8 +1476,8 @@ _get_group(preference_t pref)
case PREF_BEEP:
case PREF_THEME:
case PREF_VERCHECK:
case PREF_TITLEBAR_SHOW:
case PREF_TITLEBAR_GOODBYE:
case PREF_WINTITLE_SHOW:
case PREF_WINTITLE_GOODBYE:
case PREF_FLASH:
case PREF_INTYPE:
case PREF_HISTORY:
@ -1281,10 +1595,10 @@ _get_key(preference_t pref)
return "theme";
case PREF_VERCHECK:
return "vercheck";
case PREF_TITLEBAR_SHOW:
return "titlebar.show";
case PREF_TITLEBAR_GOODBYE:
return "titlebar.goodbye";
case PREF_WINTITLE_SHOW:
return "wintitle.show";
case PREF_WINTITLE_GOODBYE:
return "wintitle.goodbye";
case PREF_FLASH:
return "flash";
case PREF_TRAY:

25
src/config/preferences.h
View File

@ -49,8 +49,8 @@ typedef enum {
PREF_BEEP,
PREF_VERCHECK,
PREF_THEME,
PREF_TITLEBAR_SHOW,
PREF_TITLEBAR_GOODBYE,
PREF_WINTITLE_SHOW,
PREF_WINTITLE_GOODBYE,
PREF_FLASH,
PREF_TRAY,
PREF_TRAY_READ,
@ -148,6 +148,13 @@ typedef struct prof_alias_t {
gchar *value;
} ProfAlias;
typedef struct prof_winplacement_t {
int titlebar_pos;
int mainwin_pos;
int statusbar_pos;
int inputwin_pos;
} ProfWinPlacement;
void prefs_load(void);
void prefs_close(void);
@ -239,6 +246,20 @@ gboolean prefs_add_room_notify_trigger(const char * const text);
gboolean prefs_remove_room_notify_trigger(const char * const text);
GList* prefs_get_room_notify_triggers(void);
ProfWinPlacement* prefs_get_win_placement(void);
void prefs_free_win_placement(ProfWinPlacement *placement);
gboolean prefs_titlebar_pos_up(void);
gboolean prefs_titlebar_pos_down(void);
gboolean prefs_mainwin_pos_up(void);
gboolean prefs_mainwin_pos_down(void);
gboolean prefs_statusbar_pos_up(void);
gboolean prefs_statusbar_pos_down(void);
gboolean prefs_inputwin_pos_up(void);
gboolean prefs_inputwin_pos_down(void);
ProfWinPlacement* prefs_create_profwin_placement(int titlebar, int mainwin, int statusbar, int inputwin);
void prefs_save_win_placement(ProfWinPlacement *placement);
gboolean prefs_get_boolean(preference_t pref);
void prefs_set_boolean(preference_t pref, gboolean value);
char* prefs_get_string(preference_t pref);

16
src/config/theme.c
View File

@ -150,6 +150,8 @@ theme_init(const char *const theme_name)
g_hash_table_insert(defaults, strdup("roster.room.trigger"), strdup("green"));
g_hash_table_insert(defaults, strdup("roster.room.mention"), strdup("green"));
g_hash_table_insert(defaults, strdup("occupants.header"), strdup("yellow"));
_load_preferences();
}
gboolean
@ -428,7 +430,6 @@ _load_preferences(void)
_set_string_preference("roster.private", PREF_ROSTER_PRIVATE);
_set_string_preference("roster.count", PREF_ROSTER_COUNT);
if (g_key_file_has_key(theme, "ui", "occupants.size", NULL)) {
gint occupants_size = g_key_file_get_integer(theme, "ui", "occupants.size", NULL);
prefs_set_occupants_size(occupants_size);
@ -529,6 +530,19 @@ _load_preferences(void)
g_free(ch);
}
}
if (g_key_file_has_key(theme, "ui", "titlebar.position", NULL) &&
g_key_file_has_key(theme, "ui", "mainwin.position", NULL) &&
g_key_file_has_key(theme, "ui", "statusbar.position", NULL) &&
g_key_file_has_key(theme, "ui", "inputwin.position", NULL)) {
int titlebar_pos = g_key_file_get_integer(theme, "ui", "titlebar.position", NULL);
int mainwin_pos = g_key_file_get_integer(theme, "ui", "mainwin.position", NULL);
int statusbar_pos = g_key_file_get_integer(theme, "ui", "statusbar.position", NULL);
int inputwin_pos = g_key_file_get_integer(theme, "ui", "inputwin.position", NULL);
ProfWinPlacement *placement = prefs_create_profwin_placement(titlebar_pos, mainwin_pos, statusbar_pos, inputwin_pos);
prefs_save_win_placement(placement);
prefs_free_win_placement(placement);
}
}
void

2
src/plugins/plugins.c
View File

@ -839,4 +839,6 @@ plugins_shutdown(void)
plugin_settings_close();
callbacks_close();
disco_close();
g_hash_table_destroy(plugins);
plugins = NULL;
}

5
src/profanity.c
View File

@ -203,13 +203,14 @@ _init(char *log_level)
tray_init();
#endif
inp_nonblocking(TRUE);
ui_resize();
}
static void
_shutdown(void)
{
if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
if (prefs_get_boolean(PREF_WINTITLE_SHOW)) {
if (prefs_get_boolean(PREF_WINTITLE_GOODBYE)) {
ui_goodbye_title();
} else {
ui_clear_win_title();

28
src/ui/console.c
View File

@ -1339,17 +1339,17 @@ cons_vercheck_setting(void)
}
void
cons_titlebar_setting(void)
cons_wintitle_setting(void)
{
if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
cons_show("Titlebar show (/titlebar) : ON");
if (prefs_get_boolean(PREF_WINTITLE_SHOW)) {
cons_show("Window title show (/wintitle) : ON");
} else {
cons_show("Titlebar show (/titlebar) : OFF");
cons_show("Window title show (/wintitle) : OFF");
}
if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
cons_show("Titlebar goodbye (/titlebar) : ON");
if (prefs_get_boolean(PREF_WINTITLE_GOODBYE)) {
cons_show("Window title goodbye (/wintitle) : ON");
} else {
cons_show("Titlebar goodbye (/titlebar) : OFF");
cons_show("Window title goodbye (/wintitle) : OFF");
}
}
@ -1534,6 +1534,7 @@ cons_show_ui_prefs(void)
cons_beep_setting();
cons_flash_setting();
cons_splash_setting();
cons_winpos_setting();
cons_wrap_setting();
cons_winstidy_setting();
cons_time_setting();
@ -1543,7 +1544,7 @@ cons_show_ui_prefs(void)
cons_occupants_setting();
cons_roster_setting();
cons_privileges_setting();
cons_titlebar_setting();
cons_wintitle_setting();
cons_encwarn_setting();
cons_presence_setting();
cons_inpblock_setting();
@ -1751,6 +1752,17 @@ cons_inpblock_setting(void)
}
}
void
cons_winpos_setting(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
cons_show("Title bar postion (/titlebar) : %d", placement->titlebar_pos);
cons_show("Main window postion (/mainwin) : %d", placement->mainwin_pos);
cons_show("Status bar postion (/statusbar) : %d", placement->statusbar_pos);
cons_show("Input window postion (/inputwin) : %d", placement->inputwin_pos);
prefs_free_win_placement(placement);
}
void
cons_log_setting(void)
{

4
src/ui/core.c
View File

@ -133,7 +133,7 @@ ui_update(void)
win_update_virtual(current);
if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
if (prefs_get_boolean(PREF_WINTITLE_SHOW)) {
_ui_draw_term_title();
}
title_bar_update_virtual();
@ -370,7 +370,7 @@ ui_handle_login_account_success(ProfAccount *account, gboolean secured)
} else {
ui_hide_all_room_rosters();
}
ui_redraw();
ui_resize();
} else {
cons_show("Couldn't find account theme: %s", account->theme);
}

7
src/ui/inputwin.c
View File

@ -62,6 +62,7 @@
#include "config/preferences.h"
#include "config/theme.h"
#include "ui/ui.h"
#include "ui/screen.h"
#include "ui/statusbar.h"
#include "ui/inputwin.h"
#include "ui/window.h"
@ -280,9 +281,9 @@ inp_put_back(void)
static void
_inp_win_update_virtual(void)
{
int wrows, wcols;
getmaxyx(stdscr, wrows, wcols);
pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
int wcols = getmaxx(stdscr);
int row = screen_inputwin_row();
pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
}
static void

123
src/ui/screen.c Normal file
View File

@ -0,0 +1,123 @@
/*
* screen.c
*
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
*
* 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
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* 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.
*
*/
#include "config.h"
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
#endif
#include "config/preferences.h"
int
_screen_line_row(int win_pos, int mainwin_pos) {
int wrows = getmaxy(stdscr);
if (win_pos == 1) {
return 0;
}
if (win_pos == 2) {
int row = 1;
if (mainwin_pos == 1) {
row = wrows-3;
}
return row;
}
if (win_pos == 3) {
int row = 2;
if (mainwin_pos == 1 || mainwin_pos == 2) {
row = wrows-2;
}
return row;
}
return wrows-1;
}
int
screen_titlebar_row(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int row = _screen_line_row(placement->titlebar_pos, placement->mainwin_pos);
prefs_free_win_placement(placement);
return row;
}
int
screen_statusbar_row(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int row = _screen_line_row(placement->statusbar_pos, placement->mainwin_pos);
prefs_free_win_placement(placement);
return row;
}
int
screen_inputwin_row(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int row = _screen_line_row(placement->inputwin_pos, placement->mainwin_pos);
prefs_free_win_placement(placement);
return row;
}
int
screen_mainwin_row_start(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int row = placement->mainwin_pos-1;
prefs_free_win_placement(placement);
return row;
}
int
screen_mainwin_row_end(void)
{
ProfWinPlacement *placement = prefs_get_win_placement();
int wrows = getmaxy(stdscr);
int row = wrows - (5 - placement->mainwin_pos);
prefs_free_win_placement(placement);
return row;
}

40
src/ui/screen.h Normal file
View File

@ -0,0 +1,40 @@
/*
* screen.h
*
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
*
* 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
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* 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.
*
*/
int screen_titlebar_row(void);
int screen_statusbar_row(void);
int screen_inputwin_row(void);
int screen_mainwin_row_start(void);
int screen_mainwin_row_end(void);

14
src/ui/statusbar.c
View File

@ -49,6 +49,7 @@
#include "ui/ui.h"
#include "ui/statusbar.h"
#include "ui/inputwin.h"
#include "ui/screen.h"
#define TIME_CHECK 60000000
@ -74,8 +75,8 @@ static void _status_bar_draw(void);
void
create_status_bar(void)
{
int rows, cols, i;
getmaxyx(stdscr, rows, cols);
int i;
int cols = getmaxx(stdscr);
is_active[1] = TRUE;
is_new[1] = FALSE;
@ -89,7 +90,8 @@ create_status_bar(void)
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
status_bar = newwin(1, cols, rows-2, 0);
int row = screen_statusbar_row();
status_bar = newwin(1, cols, row, 0);
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
wattron(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, cols - 34, _active);
@ -115,14 +117,14 @@ status_bar_update_virtual(void)
void
status_bar_resize(void)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
int cols = getmaxx(stdscr);
werase(status_bar);
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
mvwin(status_bar, rows-2, 0);
int row = screen_statusbar_row();
mvwin(status_bar, row, 0);
wresize(status_bar, 1, cols);
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
wattron(status_bar, bracket_attrs);

9
src/ui/titlebar.c
View File

@ -46,6 +46,7 @@
#include "ui/inputwin.h"
#include "ui/window_list.h"
#include "ui/window.h"
#include "ui/screen.h"
#include "xmpp/roster_list.h"
#include "xmpp/chat_session.h"
@ -67,7 +68,8 @@ create_title_bar(void)
{
int cols = getmaxx(stdscr);
win = newwin(1, cols, 0, 0);
int row = screen_titlebar_row();
win = newwin(1, cols, row, 0);
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
title_bar_console();
title_bar_set_presence(CONTACT_OFFLINE);
@ -101,6 +103,11 @@ title_bar_resize(void)
{
int cols = getmaxx(stdscr);
werase(win);
int row = screen_titlebar_row();
mvwin(win, row, 0);
wresize(win, 1, cols);
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));

3
src/ui/ui.h
View File

@ -299,7 +299,7 @@ void cons_presence_setting(void);
void cons_wrap_setting(void);
void cons_winstidy_setting(void);
void cons_time_setting(void);
void cons_titlebar_setting(void);
void cons_wintitle_setting(void);
void cons_notify_setting(void);
void cons_show_desktop_prefs(void);
void cons_states_setting(void);
@ -317,6 +317,7 @@ void cons_reconnect_setting(void);
void cons_autoping_setting(void);
void cons_autoconnect_setting(void);
void cons_inpblock_setting(void);
void cons_winpos_setting(void);
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity);
void cons_show_contact_offline(PContact contact, char *resource, char *status);
void cons_theme_properties(void);

34
src/ui/window.c
View File

@ -52,6 +52,7 @@
#include "config/preferences.h"
#include "ui/ui.h"
#include "ui/window.h"
#include "ui/screen.h"
#include "xmpp/xmpp.h"
#include "xmpp/roster_list.h"
@ -604,9 +605,10 @@ win_resize(ProfWin *window)
void
win_update_virtual(ProfWin *window)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
int cols = getmaxx(stdscr);
int row_start = screen_mainwin_row_start();
int row_end = screen_mainwin_row_end();
if (window->layout->type == LAYOUT_SPLIT) {
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
if (layout->subwin) {
@ -616,44 +618,46 @@ win_update_virtual(ProfWin *window)
} else {
subwin_cols = win_roster_cols();
}
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, cols-1);
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, cols-1);
}
} else {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, row_start, 0, row_end, cols-1);
}
}
void
win_refresh_without_subwin(ProfWin *window)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
int cols = getmaxx(stdscr);
if ((window->type == WIN_MUC) || (window->type == WIN_CONSOLE)) {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
int row_start = screen_mainwin_row_start();
int row_end = screen_mainwin_row_end();
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, row_start, 0, row_end, cols-1);
}
}
void
win_refresh_with_subwin(ProfWin *window)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
int cols = getmaxx(stdscr);
int subwin_cols = 0;
int row_start = screen_mainwin_row_start();
int row_end = screen_mainwin_row_end();
if (window->type == WIN_MUC) {
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
subwin_cols = win_occpuants_cols();
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1);
} else if (window->type == WIN_CONSOLE) {
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
subwin_cols = win_roster_cols();
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1);
}
}

3
src/xmpp/capabilities.c
View File

@ -310,8 +310,7 @@ caps_lookup(const char *const jid)
gboolean
caps_jid_has_feature(const char *const jid, const char *const feature)
{
char *ver = g_hash_table_lookup(jid_to_ver, jid);
EntityCapabilities *caps = ver ? _caps_by_ver(ver) : _caps_by_jid(jid);
EntityCapabilities *caps = caps_lookup(jid);
if (caps == NULL) {
return FALSE;

2
tests/functionaltests/proftest.c
View File

@ -174,6 +174,8 @@ init_prof_test(void **state)
assert_true(prof_output_exact("Word wrap disabled"));
prof_input("/roster hide");
assert_true(prof_output_exact("Roster disabled"));
prof_input("/occupants default hide");
assert_true(prof_output_exact("Occupant list disabled"));
prof_input("/time console off");
prof_input("/time console off");
assert_true(prof_output_exact("Console time display disabled."));

8
tests/unittests/test_server_events.c
View File

@ -17,6 +17,7 @@
void console_shows_online_presence_when_set_online(void **state)
{
prefs_set_string(PREF_STATUSES_CONSOLE, "online");
plugins_init();
roster_create();
char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE);
@ -29,11 +30,13 @@ void console_shows_online_presence_when_set_online(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy();
plugins_shutdown();
}
void console_shows_online_presence_when_set_all(void **state)
{
prefs_set_string(PREF_STATUSES_CONSOLE, "all");
plugins_init();
roster_create();
char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE);
@ -46,11 +49,13 @@ void console_shows_online_presence_when_set_all(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy();
plugins_shutdown();
}
void console_shows_dnd_presence_when_set_all(void **state)
{
prefs_set_string(PREF_STATUSES_CONSOLE, "all");
plugins_init();
roster_create();
char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE);
@ -63,10 +68,12 @@ void console_shows_dnd_presence_when_set_all(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy();
plugins_shutdown();
}
void handle_offline_removes_chat_session(void **state)
{
plugins_init();
roster_create();
chat_sessions_init();
char *barejid = "friend@server.chat.com";
@ -85,6 +92,7 @@ void handle_offline_removes_chat_session(void **state)
roster_destroy();
chat_sessions_clear();
plugins_shutdown();
}
void lost_connection_clears_chat_sessions(void **state)

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

@ -428,7 +428,7 @@ void cons_encwarn_setting(void) {}
void cons_time_setting(void) {}
void cons_mouse_setting(void) {}
void cons_statuses_setting(void) {}
void cons_titlebar_setting(void) {}
void cons_wintitle_setting(void) {}
void cons_notify_setting(void) {}
void cons_states_setting(void) {}
void cons_outtype_setting(void) {}
@ -445,6 +445,7 @@ void cons_reconnect_setting(void) {}
void cons_autoping_setting(void) {}
void cons_autoconnect_setting(void) {}
void cons_inpblock_setting(void) {}
void cons_winpos_setting(void) {}
void cons_tray_setting(void) {}
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)

4
tests/unittests/unittests.c
View File

@ -429,7 +429,9 @@ int main(int argc, char* argv[]) {
unit_test_setup_teardown(console_shows_dnd_presence_when_set_all,
load_preferences,
close_preferences),
unit_test(handle_offline_removes_chat_session),
unit_test_setup_teardown(handle_offline_removes_chat_session,
load_preferences,
close_preferences),
unit_test(lost_connection_clears_chat_sessions),
unit_test(cmd_alias_add_shows_usage_when_no_args),

1
theme_template
View File

@ -138,3 +138,4 @@ pgp.char=
console.muc=
console.chat=
console.private=
inputwin.position=

4
themes/bios
View File

@ -130,3 +130,7 @@ otr.char=@
pgp.char=%
tls.show=true
console.muc=first
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4

5
themes/boothj5
View File

@ -137,3 +137,8 @@ tls.show=true
console.muc=first
console.chat=all
console.private=all
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4

5
themes/boothj5_slack
View File

@ -133,3 +133,8 @@ tls.show=true
console.muc=first
console.chat=all
console.private=all
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4

5
themes/complex
View File

@ -58,3 +58,8 @@ tls.show=true
console.muc=all
console.chat=all
console.private=all
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4

7
themes/forest
View File

@ -75,3 +75,10 @@ roster.room.mention=bold_green
roster.room.trigger=bold_green
occupants.header=bold_green
receipt.sent=bold_black
[ui]
titlebar.position=1
inputwin.position=2
statusbar.position=3
mainwin.position=4

6
themes/original
View File

@ -75,3 +75,9 @@ roster.room.mention=green
roster.room.trigger=green
occupants.header=yellow
receipt.sent=red
[ui]
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4

4
themes/simple
View File

@ -45,3 +45,7 @@ tls.show=false
console.muc=first
console.chat=first
console.private=first
titlebar.position=1
mainwin.position=2
statusbar.position=3
inputwin.position=4