Wed Feb 23 15:37:40 2005 Michael Jennings (mej)
Merged in previous autoFUCK changes from libast. Added a feature to specify a command to be run in place of the normal PC speaker beep. ---------------------------------------------------------------------- SVN revision: 13484
This commit is contained in:
parent
a60b18a851
commit
fb382f1f52
|
@ -5293,3 +5293,10 @@ Wed Jan 5 15:17:51 2005 Michael Jennings (mej)
|
||||||
|
|
||||||
Spec dependency fixes.
|
Spec dependency fixes.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Wed Feb 23 15:37:40 2005 Michael Jennings (mej)
|
||||||
|
|
||||||
|
Merged in previous autoFUCK changes from libast.
|
||||||
|
|
||||||
|
Added a feature to specify a command to be run in place of the normal
|
||||||
|
PC speaker beep.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
%define compression gz
|
%define compression gz
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%define __os_install_post /usr/lib/rpm/brp-compress
|
||||||
|
|
||||||
Summary: Enlightened terminal emulator
|
Summary: Enlightened terminal emulator
|
||||||
Name: Eterm
|
Name: Eterm
|
||||||
Version: 0.9.4
|
Version: 0.9.4
|
||||||
|
@ -30,14 +32,16 @@ have the Imlib2 library installed.
|
||||||
%setup -a 1
|
%setup -a 1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="$RPM_OPT_FLAGS"
|
#CFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
CFLAGS="-O0 -g3"
|
||||||
export CFLAGS
|
export CFLAGS
|
||||||
|
|
||||||
# When using the configure macro, I also specify all the directory
|
# When using the configure macro, I also specify all the directory
|
||||||
# macros I use for compatibility with older versions of the macro
|
# macros I use for compatibility with older versions of the macro
|
||||||
%configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \
|
%configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \
|
||||||
--datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \
|
--datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \
|
||||||
--enable-multi-charset --enable-escreen --enable-auto-encoding %{?acflags}
|
--enable-multi-charset --enable-escreen --enable-auto-encoding \
|
||||||
|
--with-debugging=9 %{?acflags}
|
||||||
%{__make} %{?mflags}
|
%{__make} %{?mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
39
autogen.sh
39
autogen.sh
|
@ -15,45 +15,50 @@ DIE=0
|
||||||
echo "Generating configuration files for Eterm, please wait...."
|
echo "Generating configuration files for Eterm, please wait...."
|
||||||
|
|
||||||
LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize"
|
LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize"
|
||||||
AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader"
|
ACLOCAL_CHOICES="$ACLOCAL aclocal"
|
||||||
ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal"
|
AUTOCONF_CHOICES="$AUTOCONF autoconf"
|
||||||
AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake"
|
AUTOHEADER_CHOICES="$AUTOHEADER autoheader"
|
||||||
AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf"
|
AUTOMAKE_CHOICES="$AUTOMAKE automake"
|
||||||
|
|
||||||
for i in $LIBTOOLIZE_CHOICES ; do
|
for i in $LIBTOOLIZE_CHOICES ; do
|
||||||
$i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break
|
$i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break
|
||||||
done
|
done
|
||||||
[ "x$LIBTOOLIZE" = "x" ] && broken libtool
|
[ "x$LIBTOOLIZE" = "x" ] && broken libtool
|
||||||
|
|
||||||
for i in $AUTOHEADER_CHOICES ; do
|
|
||||||
$i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
|
|
||||||
done
|
|
||||||
[ "x$AUTOHEADER" = "x" ] && broken autoconf
|
|
||||||
|
|
||||||
for i in $ACLOCAL_CHOICES ; do
|
for i in $ACLOCAL_CHOICES ; do
|
||||||
$i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break
|
$i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break
|
||||||
done
|
done
|
||||||
[ "x$ACLOCAL" = "x" ] && broken automake
|
[ "x$ACLOCAL" = "x" ] && broken automake
|
||||||
|
|
||||||
for i in $AUTOMAKE_CHOICES ; do
|
|
||||||
$i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
|
|
||||||
done
|
|
||||||
[ "x$AUTOMAKE" = "x" ] && broken automake
|
|
||||||
|
|
||||||
for i in $AUTOCONF_CHOICES ; do
|
for i in $AUTOCONF_CHOICES ; do
|
||||||
$i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break
|
$i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break
|
||||||
done
|
done
|
||||||
[ "x$AUTOCONF" = "x" ] && broken autoconf
|
[ "x$AUTOCONF" = "x" ] && broken autoconf
|
||||||
|
|
||||||
|
for i in $AUTOHEADER_CHOICES ; do
|
||||||
|
$i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
|
||||||
|
done
|
||||||
|
[ "x$AUTOHEADER" = "x" ] && broken autoconf
|
||||||
|
|
||||||
|
for i in $AUTOMAKE_CHOICES ; do
|
||||||
|
$i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
|
||||||
|
done
|
||||||
|
[ "x$AUTOMAKE" = "x" ] && broken automake
|
||||||
|
|
||||||
# Export them so configure can AC_SUBST() them.
|
# Export them so configure can AC_SUBST() them.
|
||||||
export LIBTOOLIZE AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
|
export LIBTOOLIZE ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE
|
||||||
|
|
||||||
|
# Check for existing libast.m4 we can use. Use the local one if not.
|
||||||
|
if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
|
||||||
|
ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
|
||||||
|
fi
|
||||||
|
|
||||||
# Run the stuff.
|
# Run the stuff.
|
||||||
(set -x && $LIBTOOLIZE -c -f)
|
(set -x && $LIBTOOLIZE -c -f)
|
||||||
(set -x && $AUTOHEADER)
|
|
||||||
(set -x && $ACLOCAL $ACLOCAL_FLAGS)
|
(set -x && $ACLOCAL $ACLOCAL_FLAGS)
|
||||||
(set -x && $AUTOMAKE -a -c)
|
|
||||||
(set -x && $AUTOCONF)
|
(set -x && $AUTOCONF)
|
||||||
|
(set -x && $AUTOHEADER)
|
||||||
|
(set -x && $AUTOMAKE -a -c)
|
||||||
|
|
||||||
# Run configure.
|
# Run configure.
|
||||||
./configure "$@"
|
./configure "$@"
|
||||||
|
|
39
configure.in
39
configure.in
|
@ -3,23 +3,23 @@ dnl# $Id$
|
||||||
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
|
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=true
|
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
|
||||||
test "x$AUTOHEADER" = "x" && AUTOHEADER=true
|
test "x$ACLOCAL" = "x" && ACLOCAL=aclocal
|
||||||
test "x$ACLOCAL" = "x" && ACLOCAL=true
|
test "x$AUTOCONF" = "x" && AUTOCONF=autoconf
|
||||||
test "x$AUTOMAKE" = "x" && AUTOMAKE=true
|
test "x$AUTOHEADER" = "x" && AUTOHEADER=autoheader
|
||||||
test "x$AUTOCONF" = "x" && AUTOCONF=true
|
test "x$AUTOMAKE" = "x" && AUTOMAKE=automake
|
||||||
|
|
||||||
AC_SUBST(LIBTOOLIZE)
|
AC_SUBST(LIBTOOLIZE)
|
||||||
AC_SUBST(AUTOHEADER)
|
|
||||||
AC_SUBST(ACLOCAL)
|
AC_SUBST(ACLOCAL)
|
||||||
AC_SUBST(AUTOMAKE)
|
|
||||||
AC_SUBST(AUTOCONF)
|
AC_SUBST(AUTOCONF)
|
||||||
|
AC_SUBST(AUTOHEADER)
|
||||||
|
AC_SUBST(AUTOMAKE)
|
||||||
|
|
||||||
SAVE_LIBTOOLIZE="$LIBTOOLIZE"
|
SAVE_LIBTOOLIZE="$LIBTOOLIZE"
|
||||||
SAVE_AUTOHEADER="$AUTOHEADER"
|
|
||||||
SAVE_ACLOCAL="$ACLOCAL"
|
SAVE_ACLOCAL="$ACLOCAL"
|
||||||
SAVE_AUTOMAKE="$AUTOMAKE"
|
|
||||||
SAVE_AUTOCONF="$AUTOCONF"
|
SAVE_AUTOCONF="$AUTOCONF"
|
||||||
|
SAVE_AUTOHEADER="$AUTOHEADER"
|
||||||
|
SAVE_AUTOMAKE="$AUTOMAKE"
|
||||||
|
|
||||||
AC_INIT(src/feature.h)
|
AC_INIT(src/feature.h)
|
||||||
AM_INIT_AUTOMAKE(Eterm, 0.9.4)
|
AM_INIT_AUTOMAKE(Eterm, 0.9.4)
|
||||||
|
@ -33,11 +33,22 @@ AUTHORS="Michael Jennings (mej@eterm.org) "
|
||||||
AC_SUBST(AUTHORS)
|
AC_SUBST(AUTHORS)
|
||||||
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
|
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
|
||||||
|
|
||||||
LIBTOOLIZE="$SAVE_LIBTOOLIZE"
|
LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}"
|
||||||
AUTOHEADER="$SAVE_AUTOHEADER"
|
ACLOCAL="${SAVE_ACLOCAL:-aclocal}"
|
||||||
ACLOCAL="$SAVE_ACLOCAL"
|
AUTOCONF="${SAVE_AUTOCONF:-autoconf}"
|
||||||
AUTOMAKE="$SAVE_AUTOMAKE"
|
AUTOHEADER="${SAVE_AUTOHEADER:-autoheader}"
|
||||||
AUTOCONF="$SAVE_AUTOCONF"
|
AUTOMAKE="${SAVE_AUTOMAKE:-automake}"
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(for preferred libtoolize)
|
||||||
|
AC_MSG_RESULT($LIBTOOLIZE)
|
||||||
|
AC_MSG_CHECKING(for preferred aclocal)
|
||||||
|
AC_MSG_RESULT($ACLOCAL)
|
||||||
|
AC_MSG_CHECKING(for preferred autoconf)
|
||||||
|
AC_MSG_RESULT($AUTOCONF)
|
||||||
|
AC_MSG_CHECKING(for preferred autoheader)
|
||||||
|
AC_MSG_RESULT($AUTOHEADER)
|
||||||
|
AC_MSG_CHECKING(for preferred automake)
|
||||||
|
AC_MSG_RESULT($AUTOMAKE)
|
||||||
|
|
||||||
dnl# Find RCS Ident info from source files
|
dnl# Find RCS Ident info from source files
|
||||||
AC_DEFINE_UNQUOTED(ACTIONS_IDENT, "`grep '$''Id:' $srcdir/src/actions.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [actions.c RCS ID])
|
AC_DEFINE_UNQUOTED(ACTIONS_IDENT, "`grep '$''Id:' $srcdir/src/actions.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [actions.c RCS ID])
|
||||||
|
|
|
@ -150,6 +150,7 @@ int rs_delay = -1;
|
||||||
unsigned char rs_es_dock = BBAR_DOCKED_BOTTOM;
|
unsigned char rs_es_dock = BBAR_DOCKED_BOTTOM;
|
||||||
char *rs_es_font = NULL;
|
char *rs_es_font = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
spif_charptr_t rs_beep_command = NULL;
|
||||||
spif_uint32_t rs_opacity = 0xffffffff;
|
spif_uint32_t rs_opacity = 0xffffffff;
|
||||||
unsigned int rs_line_space = 0;
|
unsigned int rs_line_space = 0;
|
||||||
unsigned int rs_meta_mod = 0, rs_alt_mod = 0, rs_numlock_mod = 0;
|
unsigned int rs_meta_mod = 0, rs_alt_mod = 0, rs_numlock_mod = 0;
|
||||||
|
@ -342,6 +343,7 @@ spifopt_t option_list[] = {
|
||||||
SPIFOPT_STR_LONG("finished-text", "post-termination terminal text", rs_finished_text),
|
SPIFOPT_STR_LONG("finished-text", "post-termination terminal text", rs_finished_text),
|
||||||
SPIFOPT_STR_LONG("term-name", "value to use for setting $TERM", rs_term_name),
|
SPIFOPT_STR_LONG("term-name", "value to use for setting $TERM", rs_term_name),
|
||||||
SPIFOPT_STR_LONG("pipe-name", "filename of console pipe to emulate -C", rs_pipe_name),
|
SPIFOPT_STR_LONG("pipe-name", "filename of console pipe to emulate -C", rs_pipe_name),
|
||||||
|
SPIFOPT_STR_LONG("beep-command", "command to run instead of normal beep", rs_beep_command),
|
||||||
#ifdef ESCREEN
|
#ifdef ESCREEN
|
||||||
SPIFOPT_STR('U', "url", "a URL pointing to a screen session to pick up", rs_url),
|
SPIFOPT_STR('U', "url", "a URL pointing to a screen session to pick up", rs_url),
|
||||||
SPIFOPT_STR('Z', "firewall", "connect session via forwarded port", rs_hop),
|
SPIFOPT_STR('Z', "firewall", "connect session via forwarded port", rs_hop),
|
||||||
|
@ -405,7 +407,11 @@ version(void)
|
||||||
" " SCREEN_IDENT "\n"
|
" " SCREEN_IDENT "\n"
|
||||||
" " SCROLLBAR_IDENT "\n"
|
" " SCROLLBAR_IDENT "\n"
|
||||||
" " STARTUP_IDENT "\n"
|
" " STARTUP_IDENT "\n"
|
||||||
" " SYSTEM_IDENT "\n" " " TERM_IDENT "\n" " " TIMER_IDENT "\n" " " UTMP_IDENT "\n" " " WINDOWS_IDENT "\n" "\n");
|
" " SYSTEM_IDENT "\n"
|
||||||
|
" " TERM_IDENT "\n"
|
||||||
|
" " TIMER_IDENT "\n"
|
||||||
|
" " UTMP_IDENT "\n"
|
||||||
|
" " WINDOWS_IDENT "\n" "\n");
|
||||||
|
|
||||||
printf("Debugging configuration: ");
|
printf("Debugging configuration: ");
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
@ -1473,6 +1479,9 @@ parse_misc(char *buff, void *state)
|
||||||
} else if (!BEG_STRCASECMP(buff, "term_name ")) {
|
} else if (!BEG_STRCASECMP(buff, "term_name ")) {
|
||||||
RESET_AND_ASSIGN(rs_term_name, get_word(2, buff));
|
RESET_AND_ASSIGN(rs_term_name, get_word(2, buff));
|
||||||
|
|
||||||
|
} else if (!BEG_STRCASECMP(buff, "beep_command ")) {
|
||||||
|
RESET_AND_ASSIGN(rs_beep_command, get_word(2, buff));
|
||||||
|
|
||||||
} else if (!BEG_STRCASECMP(buff, "debug ")) {
|
} else if (!BEG_STRCASECMP(buff, "debug ")) {
|
||||||
DEBUG_LEVEL = (unsigned int) strtoul(get_pword(2, buff), (char **) NULL, 0);
|
DEBUG_LEVEL = (unsigned int) strtoul(get_pword(2, buff), (char **) NULL, 0);
|
||||||
|
|
||||||
|
@ -3830,6 +3839,7 @@ save_config(char *path, unsigned char save_theme)
|
||||||
fprintf(fp, " min_anchor_size %d\n", rs_min_anchor_size);
|
fprintf(fp, " min_anchor_size %d\n", rs_min_anchor_size);
|
||||||
fprintf(fp, " border_width %d\n", TermWin.internalBorder);
|
fprintf(fp, " border_width %d\n", TermWin.internalBorder);
|
||||||
fprintf(fp, " term_name %s\n", getenv("TERM"));
|
fprintf(fp, " term_name %s\n", getenv("TERM"));
|
||||||
|
fprintf(fp, " beep_command \"%s\"\n", rs_beep_command);
|
||||||
fprintf(fp, " debug %d\n", DEBUG_LEVEL);
|
fprintf(fp, " debug %d\n", DEBUG_LEVEL);
|
||||||
if (save_theme && rs_exec_args && rs_theme && strcmp(rs_theme, PACKAGE)) {
|
if (save_theme && rs_exec_args && rs_theme && strcmp(rs_theme, PACKAGE)) {
|
||||||
fprintf(fp, " exec ");
|
fprintf(fp, " exec ");
|
||||||
|
|
|
@ -127,6 +127,7 @@ extern char *rs_es_font;
|
||||||
#endif
|
#endif
|
||||||
extern spif_uint32_t rs_opacity;
|
extern spif_uint32_t rs_opacity;
|
||||||
extern unsigned int rs_line_space;
|
extern unsigned int rs_line_space;
|
||||||
|
extern spif_charptr_t rs_beep_command;
|
||||||
extern unsigned int rs_meta_mod, rs_alt_mod, rs_numlock_mod;
|
extern unsigned int rs_meta_mod, rs_alt_mod, rs_numlock_mod;
|
||||||
#ifndef NO_BOLDFONT
|
#ifndef NO_BOLDFONT
|
||||||
extern char *rs_boldFont;
|
extern char *rs_boldFont;
|
||||||
|
|
|
@ -1546,8 +1546,11 @@ scr_bell(void)
|
||||||
if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_VISUAL_BELL)) {
|
if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_VISUAL_BELL)) {
|
||||||
scr_rvideo_mode(!rvideo);
|
scr_rvideo_mode(!rvideo);
|
||||||
scr_rvideo_mode(!rvideo);
|
scr_rvideo_mode(!rvideo);
|
||||||
} else
|
} else if (!SPIF_PTR_ISNULL(rs_beep_command)) {
|
||||||
|
system_no_wait(SPIF_CAST_C(char *) rs_beep_command);
|
||||||
|
} else {
|
||||||
XBell(Xdisplay, 0);
|
XBell(Xdisplay, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue