mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into osx-functional
This commit is contained in:
commit
347f5e5724
@ -186,7 +186,7 @@ themes_sources = themes/*
|
|||||||
|
|
||||||
icons_sources = icons/*
|
icons_sources = icons/*
|
||||||
|
|
||||||
script_sources = bootstrap.sh configure-debug install-all.sh
|
script_sources = bootstrap.sh configure-debug
|
||||||
|
|
||||||
man_sources = docs/profanity.1
|
man_sources = docs/profanity.1
|
||||||
|
|
||||||
|
@ -15,3 +15,5 @@ Homepage: http://www.profanity.im
|
|||||||
Chat room: profanitydev@conference.jabber.org
|
Chat room: profanitydev@conference.jabber.org
|
||||||
|
|
||||||
Mailing List: https://groups.google.com/forum/#!forum/profanitydev
|
Mailing List: https://groups.google.com/forum/#!forum/profanitydev
|
||||||
|
|
||||||
|
Plugins repository: https://github.com/boothj5/profanity-plugins
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
autoreconf -fiv
|
mkdir -p m4
|
||||||
|
autoreconf -i $@
|
||||||
|
15
configure.ac
15
configure.ac
@ -1,7 +1,7 @@
|
|||||||
# -*- Autoconf -*-
|
# -*- Autoconf -*-
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_INIT([profanity], [0.5.0], [boothj5web@gmail.com])
|
AC_INIT([profanity], [0.5.1], [boothj5web@gmail.com])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_SRCDIR([src/main.c])
|
AC_CONFIG_SRCDIR([src/main.c])
|
||||||
@ -96,10 +96,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# c
|
# c
|
||||||
LT_INIT
|
if test "x$PLATFORM" = xcygwin; then
|
||||||
if test "x$enable_plugins" = xno; then
|
|
||||||
AM_CONDITIONAL([BUILD_C_API], [false])
|
AM_CONDITIONAL([BUILD_C_API], [false])
|
||||||
elif test "x$enable_c_plugins" != xno; then
|
else
|
||||||
|
LT_INIT
|
||||||
|
if test "x$enable_plugins" = xno; then
|
||||||
|
AM_CONDITIONAL([BUILD_C_API], [false])
|
||||||
|
elif test "x$enable_c_plugins" != xno; then
|
||||||
AC_CHECK_LIB([dl], [main],
|
AC_CHECK_LIB([dl], [main],
|
||||||
[AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
|
[AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
|
||||||
[AS_IF(
|
[AS_IF(
|
||||||
@ -107,8 +110,9 @@ elif test "x$enable_c_plugins" != xno; then
|
|||||||
[AC_MSG_ERROR([dl library needed to run C plugins])],
|
[AC_MSG_ERROR([dl library needed to run C plugins])],
|
||||||
[AM_CONDITIONAL([BUILD_C_API], [false])])
|
[AM_CONDITIONAL([BUILD_C_API], [false])])
|
||||||
])
|
])
|
||||||
else
|
else
|
||||||
AM_CONDITIONAL([BUILD_C_API], [false])
|
AM_CONDITIONAL([BUILD_C_API], [false])
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# threading
|
# threading
|
||||||
@ -305,7 +309,6 @@ echo "AM_CFLAGS : $AM_CFLAGS"
|
|||||||
echo "AM_CPPFLAGS : $AM_CPPFLAGS"
|
echo "AM_CPPFLAGS : $AM_CPPFLAGS"
|
||||||
echo "AM_LDFLAGS : $AM_LDFLAGS"
|
echo "AM_LDFLAGS : $AM_LDFLAGS"
|
||||||
echo "LIBS : $LIBS"
|
echo "LIBS : $LIBS"
|
||||||
echo "XML Parser : $PARSER"
|
|
||||||
echo "Install themes : $THEMES_INSTALL"
|
echo "Install themes : $THEMES_INSTALL"
|
||||||
echo "Themes path : $THEMES_PATH"
|
echo "Themes path : $THEMES_PATH"
|
||||||
echo "Icons path : $ICONS_PATH"
|
echo "Icons path : $ICONS_PATH"
|
||||||
|
216
install-all.sh
216
install-all.sh
@ -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
|
|
@ -194,6 +194,7 @@ static Autocomplete blocked_ac;
|
|||||||
static Autocomplete tray_ac;
|
static Autocomplete tray_ac;
|
||||||
static Autocomplete presence_ac;
|
static Autocomplete presence_ac;
|
||||||
static Autocomplete presence_setting_ac;
|
static Autocomplete presence_setting_ac;
|
||||||
|
static Autocomplete inputwin_ac;
|
||||||
|
|
||||||
void
|
void
|
||||||
cmd_ac_init(void)
|
cmd_ac_init(void)
|
||||||
@ -735,6 +736,10 @@ cmd_ac_init(void)
|
|||||||
autocomplete_add(presence_setting_ac, "all");
|
autocomplete_add(presence_setting_ac, "all");
|
||||||
autocomplete_add(presence_setting_ac, "online");
|
autocomplete_add(presence_setting_ac, "online");
|
||||||
autocomplete_add(presence_setting_ac, "none");
|
autocomplete_add(presence_setting_ac, "none");
|
||||||
|
|
||||||
|
inputwin_ac = autocomplete_new();
|
||||||
|
autocomplete_add(inputwin_ac, "top");
|
||||||
|
autocomplete_add(inputwin_ac, "bottom");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -998,6 +1003,7 @@ cmd_ac_reset(ProfWin *window)
|
|||||||
autocomplete_reset(tray_ac);
|
autocomplete_reset(tray_ac);
|
||||||
autocomplete_reset(presence_ac);
|
autocomplete_reset(presence_ac);
|
||||||
autocomplete_reset(presence_setting_ac);
|
autocomplete_reset(presence_setting_ac);
|
||||||
|
autocomplete_reset(inputwin_ac);
|
||||||
|
|
||||||
autocomplete_reset(script_ac);
|
autocomplete_reset(script_ac);
|
||||||
if (script_show_ac) {
|
if (script_show_ac) {
|
||||||
@ -1120,6 +1126,7 @@ cmd_ac_uninit(void)
|
|||||||
autocomplete_free(tray_ac);
|
autocomplete_free(tray_ac);
|
||||||
autocomplete_free(presence_ac);
|
autocomplete_free(presence_ac);
|
||||||
autocomplete_free(presence_setting_ac);
|
autocomplete_free(presence_setting_ac);
|
||||||
|
autocomplete_free(inputwin_ac);
|
||||||
}
|
}
|
||||||
|
|
||||||
static char*
|
static char*
|
||||||
@ -1200,8 +1207,8 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping" };
|
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping", "/inputwin" };
|
||||||
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac };
|
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac, inputwin_ac };
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
|
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
|
||||||
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
|
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
|
||||||
|
@ -1302,6 +1302,23 @@ static struct cmd_t command_defs[] =
|
|||||||
CMD_NOEXAMPLES
|
CMD_NOEXAMPLES
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ "/inputwin",
|
||||||
|
parse_args, 1, 1, &cons_inputwin_setting,
|
||||||
|
CMD_NOSUBFUNCS
|
||||||
|
CMD_MAINFUNC(cmd_inputwin)
|
||||||
|
CMD_TAGS(
|
||||||
|
CMD_TAG_UI)
|
||||||
|
CMD_SYN(
|
||||||
|
"/inputwin top",
|
||||||
|
"/inputwin bottom")
|
||||||
|
CMD_DESC(
|
||||||
|
"Where to display the input window.")
|
||||||
|
CMD_ARGS(
|
||||||
|
{ "top", "Show the input window at the top of the screen." },
|
||||||
|
{ "bottom", "Show the input window at the bottom of the screen." })
|
||||||
|
CMD_NOEXAMPLES
|
||||||
|
},
|
||||||
|
|
||||||
{ "/notify",
|
{ "/notify",
|
||||||
parse_args_with_freetext, 0, 4, NULL,
|
parse_args_with_freetext, 0, 4, NULL,
|
||||||
CMD_NOSUBFUNCS
|
CMD_NOSUBFUNCS
|
||||||
|
@ -1662,7 +1662,7 @@ cmd_theme(ProfWin *window, const char *const command, gchar **args)
|
|||||||
} else {
|
} else {
|
||||||
ui_hide_all_room_rosters();
|
ui_hide_all_room_rosters();
|
||||||
}
|
}
|
||||||
ui_redraw();
|
ui_resize();
|
||||||
cons_show("Loaded theme: %s", args[1]);
|
cons_show("Loaded theme: %s", args[1]);
|
||||||
} else {
|
} else {
|
||||||
cons_show("Couldn't find theme: %s", args[1]);
|
cons_show("Couldn't find theme: %s", args[1]);
|
||||||
@ -5522,6 +5522,20 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_inputwin(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
|
if ((g_strcmp0(args[0], "top") == 0) || (g_strcmp0(args[0], "bottom") == 0)) {
|
||||||
|
prefs_set_string(PREF_INPUTWIN, args[0]);
|
||||||
|
ui_resize();
|
||||||
|
cons_show("Set input window position to %s", args[0]);
|
||||||
|
} else {
|
||||||
|
cons_bad_cmd_usage(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
cmd_log(ProfWin *window, const char *const command, gchar **args)
|
cmd_log(ProfWin *window, const char *const command, gchar **args)
|
||||||
{
|
{
|
||||||
|
@ -149,6 +149,7 @@ gboolean cmd_wrap(ProfWin *window, const char *const command, gchar **args);
|
|||||||
gboolean cmd_time(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_resource(ProfWin *window, const char *const command, gchar **args);
|
||||||
gboolean cmd_inpblock(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_inpblock(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_encwarn(ProfWin *window, const char *const command, gchar **args);
|
||||||
gboolean cmd_script(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);
|
gboolean cmd_export(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
@ -1211,6 +1211,7 @@ _get_group(preference_t pref)
|
|||||||
case PREF_RESOURCE_MESSAGE:
|
case PREF_RESOURCE_MESSAGE:
|
||||||
case PREF_ENC_WARN:
|
case PREF_ENC_WARN:
|
||||||
case PREF_INPBLOCK_DYNAMIC:
|
case PREF_INPBLOCK_DYNAMIC:
|
||||||
|
case PREF_INPUTWIN:
|
||||||
case PREF_TLS_SHOW:
|
case PREF_TLS_SHOW:
|
||||||
case PREF_CONSOLE_MUC:
|
case PREF_CONSOLE_MUC:
|
||||||
case PREF_CONSOLE_PRIVATE:
|
case PREF_CONSOLE_PRIVATE:
|
||||||
@ -1443,6 +1444,8 @@ _get_key(preference_t pref)
|
|||||||
return "resource.message";
|
return "resource.message";
|
||||||
case PREF_INPBLOCK_DYNAMIC:
|
case PREF_INPBLOCK_DYNAMIC:
|
||||||
return "inpblock.dynamic";
|
return "inpblock.dynamic";
|
||||||
|
case PREF_INPUTWIN:
|
||||||
|
return "inputwin.position";
|
||||||
case PREF_ENC_WARN:
|
case PREF_ENC_WARN:
|
||||||
return "enc.warn";
|
return "enc.warn";
|
||||||
case PREF_PGP_LOG:
|
case PREF_PGP_LOG:
|
||||||
@ -1571,6 +1574,8 @@ _get_default_string(preference_t pref)
|
|||||||
case PREF_CONSOLE_PRIVATE:
|
case PREF_CONSOLE_PRIVATE:
|
||||||
case PREF_CONSOLE_CHAT:
|
case PREF_CONSOLE_CHAT:
|
||||||
return "all";
|
return "all";
|
||||||
|
case PREF_INPUTWIN:
|
||||||
|
return "bottom";
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -132,6 +132,7 @@ typedef enum {
|
|||||||
PREF_RESOURCE_TITLE,
|
PREF_RESOURCE_TITLE,
|
||||||
PREF_RESOURCE_MESSAGE,
|
PREF_RESOURCE_MESSAGE,
|
||||||
PREF_INPBLOCK_DYNAMIC,
|
PREF_INPBLOCK_DYNAMIC,
|
||||||
|
PREF_INPUTWIN,
|
||||||
PREF_ENC_WARN,
|
PREF_ENC_WARN,
|
||||||
PREF_PGP_LOG,
|
PREF_PGP_LOG,
|
||||||
PREF_TLS_CERTPATH,
|
PREF_TLS_CERTPATH,
|
||||||
|
@ -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.trigger"), strdup("green"));
|
||||||
g_hash_table_insert(defaults, strdup("roster.room.mention"), strdup("green"));
|
g_hash_table_insert(defaults, strdup("roster.room.mention"), strdup("green"));
|
||||||
g_hash_table_insert(defaults, strdup("occupants.header"), strdup("yellow"));
|
g_hash_table_insert(defaults, strdup("occupants.header"), strdup("yellow"));
|
||||||
|
|
||||||
|
_load_preferences();
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
@ -427,7 +429,7 @@ _load_preferences(void)
|
|||||||
_set_string_preference("roster.rooms.by", PREF_ROSTER_ROOMS_BY);
|
_set_string_preference("roster.rooms.by", PREF_ROSTER_ROOMS_BY);
|
||||||
_set_string_preference("roster.private", PREF_ROSTER_PRIVATE);
|
_set_string_preference("roster.private", PREF_ROSTER_PRIVATE);
|
||||||
_set_string_preference("roster.count", PREF_ROSTER_COUNT);
|
_set_string_preference("roster.count", PREF_ROSTER_COUNT);
|
||||||
|
_set_string_preference("inputwin.position", PREF_INPUTWIN);
|
||||||
|
|
||||||
if (g_key_file_has_key(theme, "ui", "occupants.size", NULL)) {
|
if (g_key_file_has_key(theme, "ui", "occupants.size", NULL)) {
|
||||||
gint occupants_size = g_key_file_get_integer(theme, "ui", "occupants.size", NULL);
|
gint occupants_size = g_key_file_get_integer(theme, "ui", "occupants.size", NULL);
|
||||||
|
@ -1534,6 +1534,7 @@ cons_show_ui_prefs(void)
|
|||||||
cons_beep_setting();
|
cons_beep_setting();
|
||||||
cons_flash_setting();
|
cons_flash_setting();
|
||||||
cons_splash_setting();
|
cons_splash_setting();
|
||||||
|
cons_inputwin_setting();
|
||||||
cons_wrap_setting();
|
cons_wrap_setting();
|
||||||
cons_winstidy_setting();
|
cons_winstidy_setting();
|
||||||
cons_time_setting();
|
cons_time_setting();
|
||||||
@ -1751,6 +1752,14 @@ cons_inpblock_setting(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
cons_inputwin_setting(void)
|
||||||
|
{
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
cons_show("Input window postion (/inputwin) : %s", pos);
|
||||||
|
prefs_free_string(pos);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cons_log_setting(void)
|
cons_log_setting(void)
|
||||||
{
|
{
|
||||||
|
@ -282,7 +282,14 @@ _inp_win_update_virtual(void)
|
|||||||
{
|
{
|
||||||
int wrows, wcols;
|
int wrows, wcols;
|
||||||
getmaxyx(stdscr, wrows, wcols);
|
getmaxyx(stdscr, wrows, wcols);
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(inp_win, 0, pad_start, 0, 0, 0, wcols-2);
|
||||||
|
} else {
|
||||||
pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
|
pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -89,7 +89,13 @@ create_status_bar(void)
|
|||||||
|
|
||||||
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
||||||
|
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
status_bar = newwin(1, cols, rows-1, 0);
|
||||||
|
} else {
|
||||||
status_bar = newwin(1, cols, rows-2, 0);
|
status_bar = newwin(1, cols, rows-2, 0);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
|
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
|
||||||
wattron(status_bar, bracket_attrs);
|
wattron(status_bar, bracket_attrs);
|
||||||
mvwprintw(status_bar, 0, cols - 34, _active);
|
mvwprintw(status_bar, 0, cols - 34, _active);
|
||||||
@ -122,7 +128,13 @@ status_bar_resize(void)
|
|||||||
|
|
||||||
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
||||||
|
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
mvwin(status_bar, rows-1, 0);
|
||||||
|
} else {
|
||||||
mvwin(status_bar, rows-2, 0);
|
mvwin(status_bar, rows-2, 0);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
wresize(status_bar, 1, cols);
|
wresize(status_bar, 1, cols);
|
||||||
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
|
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
|
||||||
wattron(status_bar, bracket_attrs);
|
wattron(status_bar, bracket_attrs);
|
||||||
|
@ -67,7 +67,13 @@ create_title_bar(void)
|
|||||||
{
|
{
|
||||||
int cols = getmaxx(stdscr);
|
int cols = getmaxx(stdscr);
|
||||||
|
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
win = newwin(1, cols, 1, 0);
|
||||||
|
} else {
|
||||||
win = newwin(1, cols, 0, 0);
|
win = newwin(1, cols, 0, 0);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
|
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
|
||||||
title_bar_console();
|
title_bar_console();
|
||||||
title_bar_set_presence(CONTACT_OFFLINE);
|
title_bar_set_presence(CONTACT_OFFLINE);
|
||||||
@ -101,6 +107,16 @@ title_bar_resize(void)
|
|||||||
{
|
{
|
||||||
int cols = getmaxx(stdscr);
|
int cols = getmaxx(stdscr);
|
||||||
|
|
||||||
|
werase(win);
|
||||||
|
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
mvwin(win, 1, 0);
|
||||||
|
} else {
|
||||||
|
mvwin(win, 0, 0);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
|
||||||
wresize(win, 1, cols);
|
wresize(win, 1, cols);
|
||||||
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
|
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
|
||||||
|
|
||||||
|
@ -317,6 +317,7 @@ void cons_reconnect_setting(void);
|
|||||||
void cons_autoping_setting(void);
|
void cons_autoping_setting(void);
|
||||||
void cons_autoconnect_setting(void);
|
void cons_autoconnect_setting(void);
|
||||||
void cons_inpblock_setting(void);
|
void cons_inpblock_setting(void);
|
||||||
|
void cons_inputwin_setting(void);
|
||||||
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity);
|
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_show_contact_offline(PContact contact, char *resource, char *status);
|
||||||
void cons_theme_properties(void);
|
void cons_theme_properties(void);
|
||||||
|
@ -616,14 +616,33 @@ win_update_virtual(ProfWin *window)
|
|||||||
} else {
|
} else {
|
||||||
subwin_cols = win_roster_cols();
|
subwin_cols = win_roster_cols();
|
||||||
}
|
}
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
|
||||||
|
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
|
||||||
|
} else {
|
||||||
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
|
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->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
} else {
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, cols-1);
|
||||||
} else {
|
} 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, 1, 0, rows-3, cols-1);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 2, 0, rows-2, cols-1);
|
||||||
} else {
|
} 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, 1, 0, rows-3, cols-1);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -633,8 +652,14 @@ win_refresh_without_subwin(ProfWin *window)
|
|||||||
getmaxyx(stdscr, rows, cols);
|
getmaxyx(stdscr, rows, cols);
|
||||||
|
|
||||||
if ((window->type == WIN_MUC) || (window->type == WIN_CONSOLE)) {
|
if ((window->type == WIN_MUC) || (window->type == WIN_CONSOLE)) {
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 2, 0, rows-2, 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, 1, 0, rows-3, cols-1);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -647,14 +672,28 @@ win_refresh_with_subwin(ProfWin *window)
|
|||||||
if (window->type == WIN_MUC) {
|
if (window->type == WIN_MUC) {
|
||||||
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
|
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
|
||||||
subwin_cols = win_occpuants_cols();
|
subwin_cols = win_occpuants_cols();
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
|
||||||
|
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
|
||||||
|
} else {
|
||||||
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
|
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->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
|
||||||
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
} else if (window->type == WIN_CONSOLE) {
|
} else if (window->type == WIN_CONSOLE) {
|
||||||
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
|
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
|
||||||
subwin_cols = win_roster_cols();
|
subwin_cols = win_roster_cols();
|
||||||
|
char *pos = prefs_get_string(PREF_INPUTWIN);
|
||||||
|
if (g_strcmp0(pos, "top") == 0) {
|
||||||
|
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
|
||||||
|
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
|
||||||
|
} else {
|
||||||
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
|
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->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(pos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -445,6 +445,7 @@ void cons_reconnect_setting(void) {}
|
|||||||
void cons_autoping_setting(void) {}
|
void cons_autoping_setting(void) {}
|
||||||
void cons_autoconnect_setting(void) {}
|
void cons_autoconnect_setting(void) {}
|
||||||
void cons_inpblock_setting(void) {}
|
void cons_inpblock_setting(void) {}
|
||||||
|
void cons_inputwin_setting(void) {}
|
||||||
void cons_tray_setting(void) {}
|
void cons_tray_setting(void) {}
|
||||||
|
|
||||||
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)
|
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)
|
||||||
|
@ -138,3 +138,4 @@ pgp.char=
|
|||||||
console.muc=
|
console.muc=
|
||||||
console.chat=
|
console.chat=
|
||||||
console.private=
|
console.private=
|
||||||
|
inputwin.position=
|
||||||
|
@ -130,3 +130,4 @@ otr.char=@
|
|||||||
pgp.char=%
|
pgp.char=%
|
||||||
tls.show=true
|
tls.show=true
|
||||||
console.muc=first
|
console.muc=first
|
||||||
|
inputwin.position=bottom
|
||||||
|
@ -137,3 +137,4 @@ tls.show=true
|
|||||||
console.muc=first
|
console.muc=first
|
||||||
console.chat=all
|
console.chat=all
|
||||||
console.private=all
|
console.private=all
|
||||||
|
inputwin.position=bottom
|
||||||
|
@ -133,3 +133,4 @@ tls.show=true
|
|||||||
console.muc=first
|
console.muc=first
|
||||||
console.chat=all
|
console.chat=all
|
||||||
console.private=all
|
console.private=all
|
||||||
|
inputwin.position=bottom
|
||||||
|
@ -58,3 +58,4 @@ tls.show=true
|
|||||||
console.muc=all
|
console.muc=all
|
||||||
console.chat=all
|
console.chat=all
|
||||||
console.private=all
|
console.private=all
|
||||||
|
inputwin.position=bottom
|
||||||
|
@ -75,3 +75,6 @@ roster.room.mention=bold_green
|
|||||||
roster.room.trigger=bold_green
|
roster.room.trigger=bold_green
|
||||||
occupants.header=bold_green
|
occupants.header=bold_green
|
||||||
receipt.sent=bold_black
|
receipt.sent=bold_black
|
||||||
|
|
||||||
|
[ui]
|
||||||
|
inputwin.position=top
|
||||||
|
@ -75,3 +75,6 @@ roster.room.mention=green
|
|||||||
roster.room.trigger=green
|
roster.room.trigger=green
|
||||||
occupants.header=yellow
|
occupants.header=yellow
|
||||||
receipt.sent=red
|
receipt.sent=red
|
||||||
|
|
||||||
|
[ui]
|
||||||
|
inputwin.position=bottom
|
||||||
|
@ -45,3 +45,4 @@ tls.show=false
|
|||||||
console.muc=first
|
console.muc=first
|
||||||
console.chat=first
|
console.chat=first
|
||||||
console.private=first
|
console.private=first
|
||||||
|
inputwin.position=bottom
|
||||||
|
Loading…
Reference in New Issue
Block a user