xterm: Changes to 'upstream-unstable'
MANIFEST | 4
Makefile.in | 36 -
THANKS | 7
aclocal.m4 | 32 -
button.c | 4
charproc.c | 7
configure | 965 +++++++++++++++++++++++------------------------
configure.in | 8
fontutils.c | 6
koi8rxterm.man | 6
main.c | 460 ++++++++++++++--------
minstall.in | 133 ++++++
minstall.sh | 125 ------
misc.c | 152 +++++++
package/debian/changelog | 12
package/xterm.spec | 4
ptyx.h | 9
resize.man | 24 -
termcap | 48 +-
terminfo | 24 -
trace.c | 88 ++++
trace.h | 12
uxterm.man | 6
version.h | 4
xstrings.c | 75 +++
xstrings.h | 10
xterm.h | 12
xterm.log.html | 76 +++
xterm.man | 110 ++---
29 files changed, 1539 insertions(+), 920 deletions(-)
New commits:
commit e2853acdc3e5209924a7030e9083299bfd3f7003
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 28 17:56:20 2011 +0200
Imported Upstream version 273
diff --git a/MANIFEST b/MANIFEST
index 4e2d987..083ef51 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-272, version xterm-272
+MANIFEST for xterm-273, version xterm-273
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 9cc073a..17684ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.184 2011/08/19 09:08:05 tom Exp $
+## $XTermId: Makefile.in,v 1.186 2011/08/25 09:25:51 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -130,7 +130,7 @@ all : $(PROGRAMS)
grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
.man.$(manext) :
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS)
.$(manext).html :
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man" >$@
@@ -142,13 +142,13 @@ all : $(PROGRAMS)
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | nroff -Tascii -man | col -bx" >$@
.ms.html :
- GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.ms | groff -Thtml -ms" >$@
+ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -ms" >$@
.ms.ps :
- $(SHELL) -c "tbl $*.ms | groff -ms" >$@
+ $(SHELL) -c "tbl $< | groff -ms" >$@
.ms.txt :
- GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.ms | nroff -Tascii -ms | col -bx" >$@
+ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | nroff -Tascii -ms | col -bx" >$@
.ps.pdf :
ps2pdf $*.ps
@@ -222,10 +222,10 @@ install-full ::
install \
install-man \
install-full :: $(MANDIR)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@@ -252,10 +252,10 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm
@no_icondir@install \
@no_icondir@install-icon \
@no_icondir@install-full :: $(ICONDIR)
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_32x32.xpm $(ICONDIR)/$(actual_xterm)-color_32x32.xpm
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_48x48.xpm $(ICONDIR)/$(actual_xterm)-color_48x48.xpm
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_32x32.xpm $(ICONDIR)/$(actual_xterm)_32x32.xpm
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_48x48.xpm $(ICONDIR)/$(actual_xterm)_48x48.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_32x32.xpm $(ICONDIR)/$(actual_xterm)-color_32x32.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_48x48.xpm $(ICONDIR)/$(actual_xterm)-color_48x48.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_32x32.xpm $(ICONDIR)/$(actual_xterm)_32x32.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_48x48.xpm $(ICONDIR)/$(actual_xterm)_48x48.xpm
@no_icondir@ @echo "... installed icons"
install ::
@@ -359,11 +359,11 @@ docs-ctlseqs \
docs :: ctlseqs.html \
ctlseqs.pdf \
ctlseqs.ps \
- ctlseqs.txt
-ctlseqs.html : ctlseqs.ms
+ $(srcdir)/ctlseqs.txt
+ctlseqs.html : $(srcdir)/ctlseqs.ms
ctlseqs.pdf : ctlseqs.ps
-ctlseqs.ps : ctlseqs.ms
-ctlseqs.txt : ctlseqs.ms
+ctlseqs.ps : $(srcdir)/ctlseqs.ms
+ctlseqs.txt : $(srcdir)/ctlseqs.ms
################################################################################
docs-resize \
docs :: resize.html \
diff --git a/main.c b/main.c
index e93e7c9..981e98d 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.655 2011/08/24 22:59:53 tom Exp $ */
+/* $XTermId: main.c,v 1.656 2011/08/25 08:55:31 tom Exp $ */
/*
* W A R N I N G
@@ -2014,7 +2014,7 @@ main(int argc, char *argv[]ENVP_ARG)
Help();
quit = True;
} else if (!strcmp(option_ptr->option, "-class")) {
- if ((my_class = option_value) == 0) {
+ if ((my_class = x_strdup(option_value)) == 0) {
Help();
quit = True;
}
@@ -2307,6 +2307,7 @@ main(int argc, char *argv[]ENVP_ARG)
case 'e':
if (strcmp(argv[0], "-e"))
Syntax(*argv);
+ command_to_exec = (argv + 1);
break;
case 'i':
if (strcmp(argv[0], "-into"))
diff --git a/package/debian/changelog b/package/debian/changelog
index 9bedb10..aef201f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (273) unstable; urgency=low
+
+ * Build-fixes/regressions from #272.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 25 Aug 2011 05:42:58 -0400
+
xterm-dev (272) unstable; urgency=low
* Build-fix for termcap systems.
diff --git a/package/xterm.spec b/package/xterm.spec
index 112474c..869a848 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,7 +1,7 @@
-# $XTermId: xterm.spec,v 1.14 2011/07/16 00:40:45 tom Exp $
+# $XTermId: xterm.spec,v 1.15 2011/08/25 09:42:35 tom Exp $
Summary: A text-based Web browser
Name: xterm-dev
-Version: 272
+Version: 273
Release: 1
License: X11
Group: Applications/Internet
diff --git a/version.h b/version.h
index 1a7dd90..6e465d8 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.330 2011/07/16 00:40:34 tom Exp $
+ * $XTermId: version.h,v 1.331 2011/08/25 09:05:00 tom Exp $
* ----------------------------------------------------------------------------
* this file is part of xterm
*
@@ -39,7 +39,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 272
+#define XTERM_PATCH 273
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xstrings.c b/xstrings.c
index 08bdcd6..a2be441 100644
--- a/xstrings.c
+++ b/xstrings.c
@@ -1,4 +1,4 @@
-/* $XTermId: xstrings.c,v 1.39 2011/08/21 17:27:33 tom Exp $ */
+/* $XTermId: xstrings.c,v 1.40 2011/08/25 08:55:55 tom Exp $ */
/************************************************************
@@ -269,7 +269,7 @@ x_strdup(const char *s)
char *result = 0;
if (s != 0) {
- char *t = CastMallocN(char, strlen(s));
+ char *t = CastMallocN(char, strlen(s) + 1);
if (t != 0) {
strcpy(t, s);
}
diff --git a/xterm.log.html b/xterm.log.html
index 7099958..925b87a 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1078 2011/08/24 10:52:09 tom Exp $
+ $XTermId: xterm.log.html,v 1.1081 2011/08/25 09:29:41 tom Exp $
-->
<HTML>
<HEAD>
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_273">Patch #273 - 2011/08/25</A>
<LI><A HREF="#xterm_272">Patch #272 - 2011/08/24</A>
<LI><A HREF="#xterm_271">Patch #271 - 2011/07/14</A>
<LI><A HREF="#xterm_270">Patch #270 - 2011/04/26</A>
@@ -331,6 +332,24 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_273">Patch #273 - 2011/08/25</A></H1>
+<ul>
+ <li>build-fix for out-of-tree "make docs" rule.
+
+ <li>correct a typo in <code>x_strdup</code>, from
+ <a href="#xterm_198">patch #198</a>
+ changes.
+
+ <li>correct initialization for <code>-e</code> option, broken in
+ <a href="#xterm_272">patch #272</a>
+ changes (report by Gabriele Balducci).
+
+ <li>build-fix for out-of-tree builds to address <code>minstall</code>
+ script changes in
+ <a href="#xterm_272">patch #272</a>
+ (patch by Thierry Reding).
+</ul>
+
<H1><A NAME="xterm_272">Patch #272 - 2011/08/24</A></H1>
<ul>
<li>document limitation of <code>Gtk</code> in connection with xterm's
commit 706f6cbf654b4f69575107a12079ce042dcc7b8d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 28 17:55:43 2011 +0200
Imported Upstream version 272
diff --git a/MANIFEST b/MANIFEST
index 757e8e0..4e2d987 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-271, version xterm-271
+MANIFEST for xterm-272, version xterm-272
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -60,7 +60,7 @@ main.h default definitions for 'xterm'
make.com build-script for VMS port of 'xterm'
menu.c popup/pulldown menus for 'xterm'
menu.h interface of menu.c
-minstall.sh script for installing manpages
+minstall.in script for installing manpages
misc.c miscellaneous utility functions for 'xterm'
os2main.c main program for OS/2 EMX port of 'xterm'
plink.sh script to prune unneeded libraries from link
diff --git a/Makefile.in b/Makefile.in
index e3b746c..9cc073a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.181 2011/07/14 22:13:45 tom Exp $
+## $XTermId: Makefile.in,v 1.184 2011/08/19 09:08:05 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -130,7 +130,7 @@ all : $(PROGRAMS)
grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
.man.$(manext) :
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $< $@ $(appsdir)
+ $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS)
.$(manext).html :
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man" >$@
@@ -222,10 +222,10 @@ install-full ::
install \
install-man \
install-full :: $(MANDIR)
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir)
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir)
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir)
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir)
+ $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@@ -335,7 +335,7 @@ clean : mostlyclean
distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
- -$(RM) df-install
+ -$(RM) df-install minstall
distclean \
docs-clean ::
diff --git a/THANKS b/THANKS
index 97d533c..223c10d 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.4 2011/02/11 10:55:53 tom Exp $
+-- $XTermId: THANKS,v 1.5 2011/08/21 00:52:56 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -65,6 +65,7 @@ Frank Guangxin Liu
Frank Liu
Gael Roualland
George Peter Staplin
+Gertjan Halkes
Greg Badros
Greg Klanderman
Greg Smith
@@ -99,8 +100,10 @@ Kevin Schoedel
Kiyokazu Suto
Larry Riedel
Lee Olsen
+Lo�Minier
Marc Bevand
Marc La France
+Marco Peereboom
Marius Tolzmann
Mark Waggoner
Markus Kuhn
@@ -121,6 +124,7 @@ Miroslav Lichvar
Nam SungHyun
Nelson Beebe
N�th M�on
+Nicolas George
Ovidiu Gheorghioiu
Paul Gilmartin
Paul Giordano
@@ -150,6 +154,7 @@ Stuart Lissaman
Sven Verdoolaege
Taneli Huuskonen
Ted Phelps
+Thierry Reding
Thomas Wolff
Tim Adye
Tim Pope
diff --git a/aclocal.m4 b/aclocal.m4
index 9f3625a..a78eb7e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.309 2011/07/14 23:36:54 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.310 2011/07/17 19:28:03 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -1219,7 +1219,7 @@ AC_TRY_COMPILE([
test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13
+dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature.
@@ -1243,7 +1243,7 @@ linux*|gnu*|k*bsd*-gnu) #(vi
openbsd[[2-9]].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
-freebsd*) #(vi
+dragonfly*|freebsd*) #(vi
LD_RPATH_OPT="-rpath "
;;
netbsd*) #(vi
@@ -3261,7 +3261,7 @@ elif test "$cf_x_athena_inc" != default ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33
+dnl CF_X_ATHENA_LIBS version: 11 updated: 2011/07/17 15:25:45
dnl ----------------
dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -3277,19 +3277,24 @@ for cf_path in default \
/usr/local
do
for cf_lib in \
- "-l$cf_x_athena_root -lXmu" \
- "-l$cf_x_athena_root -lXpm -lXmu" \
- "-l${cf_x_athena_root}_s -lXmu_s"
+ ${cf_x_athena_root} \
+ ${cf_x_athena_root}7 \
+ ${cf_x_athena_root}6
+ do
+ for cf_libs in \
+ "-l$cf_lib -lXmu" \
+ "-l$cf_lib -lXpm -lXmu" \
+ "-l${cf_lib}_s -lXmu_s"
do
if test -z "$cf_x_athena_lib" ; then
cf_save="$LIBS"
cf_test=XawSimpleMenuAddGlobalActions
if test $cf_path != default ; then
- CF_ADD_LIBS(-L$cf_path/lib $cf_lib)
- AC_MSG_CHECKING(for $cf_lib in $cf_path)
+ CF_ADD_LIBS(-L$cf_path/lib $cf_libs)
+ AC_MSG_CHECKING(for $cf_libs in $cf_path)
else
- CF_ADD_LIBS($cf_lib)
- AC_MSG_CHECKING(for $cf_test in $cf_lib)
+ CF_ADD_LIBS($cf_libs)
+ AC_MSG_CHECKING(for $cf_test in $cf_libs)
fi
AC_TRY_LINK([
#include <X11/Intrinsic.h>
@@ -3300,12 +3305,13 @@ $cf_test((XtAppContext) 0)],
[cf_result=no])
AC_MSG_RESULT($cf_result)
if test "$cf_result" = yes ; then
- cf_x_athena_lib="$cf_lib"
+ cf_x_athena_lib="$cf_libs"
break
fi
LIBS="$cf_save"
fi
- done
+ done # cf_libs
+ done # cf_lib
done
if test -z "$cf_x_athena_lib" ; then
diff --git a/button.c b/button.c
index 2c2df45..c8678d0 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.398 2011/07/04 21:49:39 tom Exp $ */
+/* $XTermId: button.c,v 1.399 2011/08/19 00:09:26 Marco.Peereboom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -2312,7 +2312,7 @@ SelectSet(XtermWidget xw,
if (!isSameCELL(&(screen->startSel), &(screen->endSel))) {
SaltTextAway(xw, &(screen->startSel), &(screen->endSel), params, num_params);
} else {
- DisownSelection(xw);
+ ScrnDisownSelection(xw);
}
}
diff --git a/charproc.c b/charproc.c
index ac780d3..ec212f8 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1126 2011/07/10 23:19:26 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1127 2011/08/22 23:36:42 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -5435,8 +5435,11 @@ VTRun(XtermWidget xw)
}
#endif
screen->is_running = True;
+ if (screen->embed_high && screen->embed_wide) {
+ ScreenResize(xw, screen->embed_wide, screen->embed_high, &(xw->flags));
+ }
#if OPT_MAXIMIZE
- if (resource.fullscreen == esTrue || resource.fullscreen == esAlways)
+ else if (resource.fullscreen == esTrue || resource.fullscreen == esAlways)
FullScreen(term, True);
#endif
if (!setjmp(VTend))
diff --git a/configure b/configure
index b2ce8e4..10ed580 100755
--- a/configure
+++ b/configure
@@ -11116,24 +11116,29 @@ for cf_path in default \
/usr/local
do
for cf_lib in \
- "-l$cf_x_athena_root -lXmu" \
- "-l$cf_x_athena_root -lXpm -lXmu" \
- "-l${cf_x_athena_root}_s -lXmu_s"
+ ${cf_x_athena_root} \
+ ${cf_x_athena_root}7 \
+ ${cf_x_athena_root}6
+ do
+ for cf_libs in \
+ "-l$cf_lib -lXmu" \
+ "-l$cf_lib -lXpm -lXmu" \
+ "-l${cf_lib}_s -lXmu_s"
do
if test -z "$cf_x_athena_lib" ; then
cf_save="$LIBS"
cf_test=XawSimpleMenuAddGlobalActions
if test $cf_path != default ; then
- LIBS="-L$cf_path/lib $cf_lib $LIBS"
- echo "$as_me:11128: checking for $cf_lib in $cf_path" >&5
-echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
+ LIBS="-L$cf_path/lib $cf_libs $LIBS"
+ echo "$as_me:11133: checking for $cf_libs in $cf_path" >&5
+echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
else
- LIBS="$cf_lib $LIBS"
- echo "$as_me:11132: checking for $cf_test in $cf_lib" >&5
-echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
+ LIBS="$cf_libs $LIBS"
+ echo "$as_me:11137: checking for $cf_test in $cf_libs" >&5
+echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 11136 "configure"
+#line 11141 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -11149,16 +11154,16 @@ $cf_test((XtAppContext) 0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11157: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11155: \$? = $ac_status" >&5
+ echo "$as_me:11160: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11158: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11163: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11161: \$? = $ac_status" >&5
+ echo "$as_me:11166: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11167,19 +11172,20 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:11170: result: $cf_result" >&5
+ echo "$as_me:11175: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
- cf_x_athena_lib="$cf_lib"
+ cf_x_athena_lib="$cf_libs"
break
fi
LIBS="$cf_save"
fi
- done
+ done # cf_libs
+ done # cf_lib
done
if test -z "$cf_x_athena_lib" ; then
- { { echo "$as_me:11182: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ { { echo "$as_me:11188: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11195,23 +11201,23 @@ fi
for ac_header in X11/Xpoll.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11198: checking for $ac_header" >&5
+echo "$as_me:11204: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11204 "configure"
+#line 11210 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:11208: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11214: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11214: \$? = $ac_status" >&5
+ echo "$as_me:11220: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11230,7 +11236,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:11233: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11239: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -11240,16 +11246,16 @@ EOF
fi
done
-echo "$as_me:11243: checking for declaration of fd_set" >&5
+echo "$as_me:11249: checking for declaration of fd_set" >&5
echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6
if test "${cf_cv_type_fd_set+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:11249: testing sys/types alone ..." 1>&5
+echo "${as_me:-configure}:11255: testing sys/types alone ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11252 "configure"
+#line 11258 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11262,26 +11268,26 @@ fd_set x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11271: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11268: \$? = $ac_status" >&5
+ echo "$as_me:11274: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11271: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11277: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11274: \$? = $ac_status" >&5
+ echo "$as_me:11280: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=sys/types.h
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "${as_me:-configure}:11281: testing X11/Xpoll.h ..." 1>&5
+echo "${as_me:-configure}:11287: testing X11/Xpoll.h ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11284 "configure"
+#line 11290 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -11296,26 +11302,26 @@ fd_set x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11302: \$? = $ac_status" >&5
+ echo "$as_me:11308: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11305: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11311: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11308: \$? = $ac_status" >&5
+ echo "$as_me:11314: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=X11/Xpoll.h
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "${as_me:-configure}:11315: testing sys/select.h ..." 1>&5
+echo "${as_me:-configure}:11321: testing sys/select.h ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11318 "configure"
+#line 11324 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11329,16 +11335,16 @@ fd_set x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11338: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11335: \$? = $ac_status" >&5
+ echo "$as_me:11341: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11338: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11344: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11341: \$? = $ac_status" >&5
+ echo "$as_me:11347: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=sys/select.h
else
@@ -11352,7 +11358,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11355: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:11361: result: $cf_cv_type_fd_set" >&5
echo "${ECHO_T}$cf_cv_type_fd_set" >&6
if test $cf_cv_type_fd_set = sys/select.h ; then
cat >>confdefs.h <<\EOF
@@ -11361,7 +11367,7 @@ EOF
fi
-echo "$as_me:11364: checking for declaration of fd_mask" >&5
+echo "$as_me:11370: checking for declaration of fd_mask" >&5
echo $ECHO_N "checking for declaration of fd_mask... $ECHO_C" >&6
if test "${cf_cv_type_fd_mask+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11369,7 +11375,7 @@ else
if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 11372 "configure"
+#line 11378 "configure"
#include "confdefs.h"
#include <X11/Xpoll.h>
@@ -11382,27 +11388,27 @@ fd_mask x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11391: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11388: \$? = $ac_status" >&5
+ echo "$as_me:11394: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11391: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11397: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11394: \$? = $ac_status" >&5
+ echo "$as_me:11400: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "${as_me:-configure}:11401: testing if we must define CSRG_BASED ..." 1>&5
+echo "${as_me:-configure}:11407: testing if we must define CSRG_BASED ..." 1>&5
# Xosdefs.h on Mac OS X may not define this (but it should).
cat >conftest.$ac_ext <<_ACEOF
-#line 11405 "configure"
+#line 11411 "configure"
#include "confdefs.h"
#define CSRG_BASED
@@ -11416,16 +11422,16 @@ fd_mask x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11422: \$? = $ac_status" >&5
+ echo "$as_me:11428: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11425: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11431: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11428: \$? = $ac_status" >&5
+ echo "$as_me:11434: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_mask=CSRG_BASED
else
@@ -11440,7 +11446,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:11443: result: $cf_cv_type_fd_mask" >&5
+echo "$as_me:11449: result: $cf_cv_type_fd_mask" >&5
echo "${ECHO_T}$cf_cv_type_fd_mask" >&6
if test x$cf_cv_type_fd_mask = xCSRG_BASED ; then
cat >>confdefs.h <<\EOF
@@ -11449,14 +11455,14 @@ EOF
fi
-echo "$as_me:11452: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:11458: checking for IRIX 6.5 baud-rate redefinitions" >&5
echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6
if test "${cf_cv_termio_c_ispeed+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11459 "configure"
+#line 11465 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11474,16 +11480,16 @@ foo.c_ospeed = B9600;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11480: \$? = $ac_status" >&5
+ echo "$as_me:11486: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11483: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11489: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11486: \$? = $ac_status" >&5
+ echo "$as_me:11492: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termio_c_ispeed=yes
@@ -11495,7 +11501,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11498: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:11504: result: $cf_cv_termio_c_ispeed" >&5
echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6
test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF
#define HAVE_TERMIO_C_ISPEED 1
@@ -11508,7 +11514,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
case $host_os in #(vi
freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is known to work.
-echo "$as_me:11511: checking for openpty in -lutil" >&5
+echo "$as_me:11517: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
if test "${ac_cv_lib_util_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11516,7 +11522,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lutil $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11519 "configure"
+#line 11525 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11535,16 +11541,16 @@ openpty ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11544: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11541: \$? = $ac_status" >&5
+ echo "$as_me:11547: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11550: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11547: \$? = $ac_status" >&5
+ echo "$as_me:11553: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_util_openpty=yes
else
@@ -11555,7 +11561,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11558: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:11564: result: $ac_cv_lib_util_openpty" >&5
echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
if test $ac_cv_lib_util_openpty = yes; then
cat >>confdefs.h <<EOF
@@ -11572,13 +11578,13 @@ fi
for ac_func in grantpt
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11575: checking for $ac_func" >&5
+echo "$as_me:11581: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11581 "configure"
+#line 11587 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -11609,16 +11615,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11618: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11615: \$? = $ac_status" >&5
+ echo "$as_me:11621: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11618: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11624: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11621: \$? = $ac_status" >&5
+ echo "$as_me:11627: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -11628,7 +11634,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11631: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11637: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -11637,7 +11643,7 @@ EOF
else
-echo "$as_me:11640: checking for openpty in -lutil" >&5
+echo "$as_me:11646: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
if test "${ac_cv_lib_util_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11645,7 +11651,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lutil $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11648 "configure"
+#line 11654 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11664,16 +11670,16 @@ openpty ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11667: \"$ac_link\"") >&5
Reply to: