xterm: Changes to 'debian-unstable'
INSTALL | 18
MANIFEST | 3
Makefile.in | 9
XTerm.ad | 8
aclocal.m4 | 158 ++
charproc.c | 75 +
config.guess | 37
config.sub | 75 -
configure | 2889 ++++++++++++++++++++++++-----------------------
configure.in | 54
data.h | 7
debian/changelog | 11
df-install.in | 91 +
error.h | 3
fontutils.c | 98 +
fontutils.h | 8
main.c | 55
menu.c | 132 +-
menu.h | 14
misc.c | 14
os2main.c | 20
package/debian/changelog | 6
package/debian/rules | 10
package/xterm.spec | 4
print.c | 115 +
ptyx.h | 62 -
screen.c | 22
scrollbar.c | 11
trace.c | 6
version.h | 4
xterm.h | 12
xterm.log.html | 76 +
xterm.man | 124 +-
33 files changed, 2559 insertions(+), 1672 deletions(-)
New commits:
commit 4609424884a34efb6a9e5e9996a8606255bd0a94
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 00:05:58 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 45d1c34..1bd7d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (270-1) UNRELEASED; urgency=low
+xterm (270-1) unstable; urgency=low
* New upstream release:
- Add printModeOnXError and printFileOnXError resources, which allow
@@ -7,7 +7,7 @@ xterm (270-1) UNRELEASED; urgency=low
- Fix translations vs. fullscreen initializations to handle a corner
case (Closes: #612978).
- -- Cyril Brulebois <kibi@debian.org> Thu, 02 Jun 2011 23:57:21 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 03 Jun 2011 00:05:53 +0200
xterm (269-1) unstable; urgency=low
commit 77a365fd928ae612f568e23f0cf09b1be2b222cf
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 00:04:31 2011 +0200
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index 0d3c056..45d1c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xterm (270-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Add printModeOnXError and printFileOnXError resources, which allow
+ the user to specify that xterm will write the contents of its screen
+ to a file if it is exiting due to an X error (Closes: #280457).
+ - Fix translations vs. fullscreen initializations to handle a corner
+ case (Closes: #612978).
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 02 Jun 2011 23:57:21 +0200
+
xterm (269-1) unstable; urgency=low
* New upstream release:
commit 1816c00f92661cf3ef349c9962532cbcbf8d103d
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jun 2 23:53:48 2011 +0200
Import xterm 270
diff --git a/INSTALL b/INSTALL
index 4f1cd8c..0cdf04a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.123 2010/06/14 08:57:22 tom Exp $
+-- $XTermId: INSTALL,v 1.124 2011/04/22 09:30:55 tom Exp $
-------------------------------------------------------------------------------
--- Copyright 1997-2009,2010 by Thomas E. Dickey
+-- Copyright 1997-2010,2011 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -29,9 +29,9 @@
-- authorization.
-------------------------------------------------------------------------------
-Xterm is normally built as part of the X Window System source tree, using
-imake to generate a Makefile from Imakefile. You can also use the
-configure script to generate a Makefile from Makefile.in:
+Xterm was originally built as part of the X Window System source tree, using
+imake to generate a Makefile from Imakefile. You can also use the configure
+script to generate a Makefile from Makefile.in:
+ If you have imake (or xmkmf), then you can use those directly,
or use the configure script, which normally uses those tools
@@ -524,6 +524,14 @@ The options (in alphabetic order):
Use --without-app-defaults or --with-app-defaults=no to disable the
feature.
+ --with-desktop-category=XXX one or more desktop catgories or auto
+ This is a list of names. The configure script maps blanks and commas
+ to semicolons (";") which are used by the desktop utils as a separator.
+
+ The default value "auto" tells the configure script to look
+ at existing ".desktop" files for xterm and common terminal
+ emulators, to use those.
+
--with-freetype-cflags -D/-I options for compiling with FreeType library
Override options provided by xft-config or freetype-config.
diff --git a/MANIFEST b/MANIFEST
index fe2ab6d..58226e8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-269, version xterm-269
+MANIFEST for xterm-270, version xterm-270
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -41,6 +41,7 @@ ctlseqs.txt generated rendition of ctlseqs.ms
cursor.c VT100 low-level cursor movement
data.c global data declarations
data.h global data external-definitions
+df-install.in utility script for desktop-files
doublechr.c VT100 double-size character support
error.h error-code definitions for 'xterm'
fontutils.c xterm functions for (re)loading fonts
diff --git a/Makefile.in b/Makefile.in
index e0f8586..69cc21d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-## $XTermId: Makefile.in,v 1.175 2011/02/13 18:17:55 tom Exp $
+## $XTermId: Makefile.in,v 1.177 2011/04/22 08:51:33 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
-# Copyright 1997-2009,2010 by Thomas E. Dickey
+# Copyright 1997-2010,2011 by Thomas E. Dickey
#
# All Rights Reserved
#
@@ -330,8 +330,8 @@ uninstall-full ::
@desktop_utils@DESKTOP_FLAGS = @DESKTOP_FLAGS@
@desktop_utils@install-desktop \
@desktop_utils@install-full ::
-@desktop_utils@ desktop-file-install $(DESKTOP_FLAGS) xterm.desktop
-@desktop_utils@ desktop-file-install $(DESKTOP_FLAGS) uxterm.desktop
+@desktop_utils@ $(SHELL) df-install $(DESKTOP_FLAGS) $(srcdir)/xterm.desktop
+@desktop_utils@ $(SHELL) df-install $(DESKTOP_FLAGS) $(srcdir)/uxterm.desktop
################################################################################
mostlyclean :
-$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
@@ -341,6 +341,7 @@ clean : mostlyclean
distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
+@desktop_utils@ -$(RM) df-install
distclean \
docs-clean ::
diff --git a/XTerm.ad b/XTerm.ad
index dd99d9f..8d34dd0 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.94 2011/01/19 22:05:58 tom Exp $
+! $XTermId: XTerm.ad,v 1.96 2011/04/22 22:48:00 tom Exp $
! -----------------------------------------------------------------------------
! this file is part of xterm
!
@@ -117,12 +117,14 @@
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
-*fontMenu*font-linedrawing*Label: Line-Drawing Characters
+*fontMenu*allow-bold-fonts*Label: Bold Fonts
+*fontMenu*font-linedrawing*Label: Line-Drawing Characters
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
*fontMenu*font-packed*Label: Packed Font
*fontMenu*render-font*Label: TrueType Fonts
-*fontMenu*utf8-mode*Label: UTF-8
+*fontMenu*utf8-mode*Label: UTF-8 Encoding
+*fontMenu*utf8-fonts*Label: UTF-8 Fonts
*fontMenu*utf8-title*Label: UTF-8 Titles
*fontMenu*allow-color-ops*Label: Allow Color Ops
diff --git a/aclocal.m4 b/aclocal.m4
index c847776..110642c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.295 2011/02/19 01:30:06 Thierry.Reding Exp $
+dnl $XTermId: aclocal.m4,v 1.301 2011/04/22 09:18:49 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -376,6 +376,36 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_DESKTOP version: 2 updated: 2011/04/22 05:17:37
+dnl ------------------
+dnl Handle a configure option "--disable-desktop", which sets a shell
+dnl variable $desktop_utils to a "#" if the feature is not wanted, or to an
+dnl empty string if enabled. The variable is used to substitute in front of
+dnl corresponding makefile-rules.
+dnl
+dnl It also tells the configure script to substitute the environment variable
+dnl $DESKTOP_FLAGS, which can be used by external scripts to customize the
+dnl invocation of desktop-file-util.
+dnl
+dnl $1 = program name
+AC_DEFUN([CF_DISABLE_DESKTOP],[
+# Comment-out the install-desktop rule if the desktop-utils are not found.
+AC_MSG_CHECKING(if you want to install desktop files)
+CF_ARG_OPTION(desktop,
+ [ --disable-desktop disable install of $1 desktop files],
+ [enable_desktop=$enableval],
+ [enable_desktop=$enableval],yes)
+AC_MSG_RESULT($enable_desktop)
+
+desktop_utils=
+if test "$enable_desktop" = yes ; then
+AC_CHECK_PROG(desktop_utils,desktop-file-install,yes,no)
+fi
+
+test "$desktop_utils" = yes && desktop_utils= || desktop_utils="#"
+AC_SUBST(DESKTOP_FLAGS)
+])
+dnl ---------------------------------------------------------------------------
dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
dnl ---------------
dnl You can always use "make -n" to see the actual options, but it's hard to
@@ -1356,7 +1386,7 @@ case ".[$]$1" in #(vi
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
+dnl CF_PKG_CONFIG version: 6 updated: 2011/04/17 06:36:21
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
AC_DEFUN([CF_PKG_CONFIG],
@@ -2612,6 +2642,125 @@ AC_DEFUN([CF_VERBOSE],
CF_MSG_LOG([$1])
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WITH_APP_DEFAULTS version: 1 updated: 2011/04/21 18:12:37
+dnl --------------------
+dnl Handle configure option "--with-app-defaults", setting these shell
+dnl variables:
+dnl $appsdir is the option value, used for installing app-defaults files.
+dnl $no_appsdir is a "#" (comment) if "--without-app-defaults" is given.
+AC_DEFUN(CF_WITH_APP_DEFAULTS,[
+AC_MSG_CHECKING(for directory to install resource files)
+CF_WITH_PATH(app-defaults,
+ [ --with-app-defaults=DIR directory in which to install resource files],
+ [appsdir],[EPREFIX/lib/X11/app-defaults],
+ ['\$(exec_prefix)/lib/X11/app-defaults'])
+AC_MSG_RESULT($appsdir)
+AC_SUBST(appsdir)
+
+no_appsdir=
+test "$appsdir" = no && no_appsdir="#"
+AC_SUBST(no_appsdir)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_DESKTOP_CATEGORY version: 1 updated: 2011/04/22 05:17:37
+dnl ------------------------
+dnl Taking into account the absence of standardization of desktop categories
+dnl take a look to see whether other applications on the current system are
+dnl assigned any/all of a set of suggested categories.
+dnl
+dnl $1 = program name
+dnl $2 = case-pattern to match comparable desktop files to obtain category
+dnl This pattern may contain wildcards.
+dnl $3 = suggested categories, also a case-pattern but without wildcards,
+dnl since it doubles as a default value.
+dnl
+dnl The macro tells the configure script to substitute the $DESKTOP_CATEGORY
+dnl value.
+AC_DEFUN([CF_WITH_DESKTOP_CATEGORY],[
+AC_REQUIRE([CF_DISABLE_DESKTOP])
+
+if test -z "$desktop_utils"
+then
+ AC_MSG_CHECKING(for requested desktop-category)
+ AC_ARG_WITH(desktop-category,
+ [ --with-desktop-category=XXX one or more desktop catgories or auto],
+ [cf_desktop_want=$withval],
+ [cf_desktop_want=auto])
+ AC_MSG_RESULT($cf_desktop_want)
+
+ if test "$cf_desktop_want" = auto
+ then
+ rm -rf conftest*
+ cf_desktop_also=
+ for cf_desktop_dir in \
+ /usr/share/app-install \
+ /usr/share/applications
+ do
+ if test -d $cf_desktop_dir
+ then
+ find $cf_desktop_dir -name '*.desktop' | \
+ while true
+ do
+ read cf_desktop_path
+ test -z "$cf_desktop_path" && break
+ cf_desktop_name=`basename $cf_desktop_path .desktop`
+ case $cf_desktop_name in #(vi
+ $1|*-$1|$2)
+ CF_VERBOSE(inspect $cf_desktop_path)
+ egrep '^Categories=' $cf_desktop_path | \
+ tr ';' '\n' | \
+ sed -e 's%^.*=%%' -e '/^$/d' >>conftest.1
+ ;;
+ esac
+ done
+ fi
+ done
+ if test -s conftest.1
+ then
+ cf_desktop_last=
+ sort conftest.1 | \
+ while true
+ do
+ read cf_desktop_this
+ test -z "$cf_desktop_this" && break
+ case $cf_desktop_this in #(vi
+ Qt|GTK|KDE|GNOME) #(vi
+ ;;
+ $3)
+ test "x$cf_desktop_last" != "x$cf_desktop_this" && echo $cf_desktop_this >>conftest.2
+ ;;
+ esac
+ cf_desktop_last=$cf_desktop_this
+ done
+ cf_desktop_want=`cat conftest.2 | tr '\n' ';'`
+ fi
+ fi
+ DESKTOP_CATEGORY=`echo "$cf_desktop_want" | sed -e 's/[[ ,]]/;/g'`
+ CF_VERBOSE(resulting category=$DESKTOP_CATEGORY)
+ AC_SUBST(DESKTOP_CATEGORY)
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ICONDIR version: 1 updated: 2011/04/21 18:12:37
+dnl ---------------
+dnl Handle configure option "--with-icondir", setting these shell
+dnl variables:
+dnl $icondir is the option value, used for installing icon/pixmap files.
+dnl $no_icondir is a "#" (comment) if "--without-icondir" is given.
+AC_DEFUN([CF_WITH_ICONDIR],[
+AC_MSG_CHECKING(for directory to install icons)
+CF_WITH_PATH(icondir,
+ [ --with-icondir=DIR directory in which to install icons],
+ [icondir],[EPREFIX/share/pixmaps],
+ ['\$(exec_prefix)/share/pixmaps'])
+AC_MSG_RESULT($icondir)
+AC_SUBST(icondir)
+
+no_icondir=
+test "$icondir" = no && no_icondir="#"
+AC_SUBST(no_icondir)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_IMAKE_CFLAGS version: 9 updated: 2010/05/26 05:38:42
dnl --------------------
dnl xterm and similar programs build more readily when propped up with imake's
@@ -2767,7 +2916,7 @@ AC_TRY_LINK([
test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT)
])
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42
+dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -2786,6 +2935,9 @@ case $host_os in #(vi
aix[[456]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
+cygwin) #(vi
+ cf_XOPEN_SOURCE=600
+ ;;
darwin[[0-8]].*) #(vi
cf_xopen_source="-D_APPLE_C_SOURCE"
;;
diff --git a/charproc.c b/charproc.c
index c9f6506..5e0cb2f 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1112 2011/02/20 00:50:46 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1121 2011/04/24 22:57:13 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -358,6 +358,7 @@ static XtActionsRec actionsList[] = {
#endif
#if OPT_WIDE_CHARS
{ "set-utf8-mode", HandleUTF8Mode },
+ { "set-utf8-fonts", HandleUTF8Fonts },
{ "set-utf8-title", HandleUTF8Title },
#endif
};
@@ -373,6 +374,7 @@ static XtResource xterm_resources[] =
Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, DEF_ALLOW_WINDOW),
Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False),
Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False),
+ Bres(XtNallowBoldFonts, XtCAllowBoldFonts, screen.allowBoldFonts, True),
Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False),
Bres(XtNalwaysHighlight, XtCAlwaysHighlight, screen.always_highlight, False),
Bres(XtNappcursorDefault, XtCAppcursorDefault, misc.appcursorDefault, False),
@@ -656,7 +658,8 @@ static XtResource xterm_resources[] =
Ires(XtNcombiningChars, XtCCombiningChars, screen.max_combining, 2),
Ires(XtNmkSamplePass, XtCMkSamplePass, misc.mk_samplepass, 256),
Ires(XtNmkSampleSize, XtCMkSampleSize, misc.mk_samplesize, 1024),
- Ires(XtNutf8, XtCUtf8, screen.utf8_mode, uDefault),
+ Sres(XtNutf8, XtCUtf8, screen.utf8_mode_s, "default"),
+ Sres(XtNutf8Fonts, XtCUtf8Fonts, screen.utf8_fonts_s, "default"),
Sres(XtNwideBoldFont, XtCWideBoldFont, misc.default_font.f_wb, DEFWIDEBOLDFONT),
Sres(XtNwideFont, XtCWideFont, misc.default_font.f_w, DEFWIDEFONT),
Sres(XtNutf8SelectTypes, XtCUtf8SelectTypes, screen.utf8_select_types, NULL),
@@ -1279,6 +1282,15 @@ select_charset(struct ParseState *sp, int type, int size)
}
static int
+minus_if_default(int which)
+{
+ int result = (nparam > which) ? param[which] : -1;
+ if (result <= 0)
+ result = -1;
+ return result;
+}
+
+static int
zero_if_default(int which)
{
int result = (nparam > which) ? param[which] : 0;
@@ -4888,7 +4900,7 @@ window_ops(XtermWidget xw)
case ewSetWinSizePixels: /* Resize the window to given size in pixels */
if (AllowWindowOps(xw, ewSetWinSizePixels)) {
- RequestResize(xw, zero_if_default(1), zero_if_default(2), False);
+ RequestResize(xw, minus_if_default(1), minus_if_default(2), False);
}
break;
@@ -4915,7 +4927,7 @@ window_ops(XtermWidget xw)
case ewSetWinSizeChars: /* Resize the text-area, in characters */
if (AllowWindowOps(xw, ewSetWinSizeChars)) {
- RequestResize(xw, zero_if_default(1), zero_if_default(2), True);
+ RequestResize(xw, minus_if_default(1), minus_if_default(2), True);
}
break;
@@ -5662,6 +5674,7 @@ VTInitialize_locale(XtermWidget xw)
TRACE(("VTInitialize_locale\n"));
TRACE(("... request screen.utf8_mode = %d\n", screen->utf8_mode));
+ TRACE(("... request screen.utf8_fonts = %d\n", screen->utf8_fonts));
if (screen->utf8_mode < 0)
screen->utf8_mode = uFalse;
@@ -5770,9 +5783,26 @@ VTInitialize_locale(XtermWidget xw)
}
#endif /* OPT_LUIT_PROG */
+ if (screen->utf8_fonts == uDefault) {
+ switch (screen->utf8_mode) {
+ case uFalse:
+ case uTrue:
+ screen->utf8_fonts = screen->utf8_mode;
+ break;
+ case uDefault:
+ /* should not happen */
+ screen->utf8_fonts = uTrue;
+ break;
+ case uAlways:
+ /* use this to disable menu entry */
+ break;
+ }
+ }
+
screen->utf8_inparse = (Boolean) (screen->utf8_mode != uFalse);
TRACE(("... updated screen.utf8_mode = %d\n", screen->utf8_mode));
+ TRACE(("... updated screen.utf8_fonts = %d\n", screen->utf8_fonts));
TRACE(("...VTInitialize_locale done\n"));
}
#endif
@@ -5980,6 +6010,16 @@ VTInitialize(Widget wrequest,
#undef DATA
#endif
+#if OPT_WIDE_CHARS
+#define DATA(name) { #name, u##name }
+ static FlagList tblUtf8Mode[] =
+ {
+ DATA(Always)
+ ,DATA(Default)
+ };
+#undef DATA
+#endif
+
XtermWidget request = (XtermWidget) wrequest;
XtermWidget wnew = (XtermWidget) new_arg;
Widget my_parent = SHELL_OF(wnew);
@@ -6063,6 +6103,7 @@ VTInitialize(Widget wrequest,
init_Bres(screen.force_all_chars);
#endif
init_Bres(screen.free_bold_box);
+ init_Bres(screen.allowBoldFonts);
init_Bres(screen.c132);
init_Bres(screen.curses);
@@ -6539,6 +6580,12 @@ VTInitialize(Widget wrequest,
#endif
#if OPT_WIDE_CHARS
+ /* setup data for next call */
+ request->screen.utf8_mode =
+ extendedBoolean(request->screen.utf8_mode_s, tblUtf8Mode, uLast);
+ request->screen.utf8_fonts =
+ extendedBoolean(request->screen.utf8_fonts_s, tblUtf8Mode, uLast);
+
VTInitialize_locale(request);
init_Bres(screen.utf8_latin1);
init_Bres(screen.utf8_title);
@@ -6552,6 +6599,7 @@ VTInitialize(Widget wrequest,
init_Ires(screen.utf8_inparse);
init_Ires(screen.utf8_mode);
+ init_Ires(screen.utf8_fonts);
init_Ires(screen.max_combining);
if (TScreenOf(wnew)->max_combining < 0) {
@@ -6600,6 +6648,7 @@ VTInitialize(Widget wrequest,
#endif
decode_wcwidth(wnew);
+ xtermSaveVTFonts(wnew);
#endif /* OPT_WIDE_CHARS */
init_Bres(screen.always_bold_mode);
@@ -6949,10 +6998,16 @@ VTRealize(Widget w,
Exit(1);
}
#if OPT_WIDE_CHARS
- if (TScreenOf(xw)->utf8_mode) {
+ if (screen->utf8_mode) {
TRACE(("check if this is a wide font, if not try again\n"));
- if (xtermLoadWideFonts(xw, False))
+ if (xtermLoadWideFonts(xw, False)) {
SetVTFont(xw, screen->menu_font_number, True, NULL);
+ /* we will not be able to switch to ISO-8859-1 */
+ if (!screen->mergedVTFonts) {
+ screen->utf8_fonts = uAlways;
+ update_font_utf8_fonts();
+ }
+ }
}
#endif
@@ -7088,7 +7143,7 @@ VTRealize(Widget w,
values->bit_gravity = (GravityIsNorthWest(xw)
? NorthWestGravity
: ForgetGravity);
- TScreenOf(xw)->fullVwin.window = XtWindow(xw) =
+ screen->fullVwin.window = XtWindow(xw) =
XCreateWindow(XtDisplay(xw), XtWindow(XtParent(xw)),
xw->core.x, xw->core.y,
xw->core.width, xw->core.height, BorderWidth(xw),
@@ -7193,7 +7248,7 @@ VTRealize(Widget w,
#if OPT_I18N_SUPPORT && OPT_INPUT_METHOD
VTInitI18N(xw);
#else
- TScreenOf(xw)->xic = NULL;
+ screen->xic = NULL;
#endif
#if OPT_NUM_LOCK
VTInitModifiers(xw);
@@ -8860,8 +8915,10 @@ VTInitTranslations(void)
*/
if (resource.fullscreen == esNever) {
for (item = 0; item < XtNumber(table); ++item) {
- if (!strcmp(table[item].name, "fullscreen"))
+ if (!strcmp(table[item].name, "fullscreen")) {
table[item].wanted = False;
+ TRACE(("omit(%s):\n%s\n", table[item].name, table[item].value));
+ }
}
}
#endif
diff --git a/config.guess b/config.guess
index bec935b..e4b6966 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2911 Free Software Foundation, Inc.
-timestamp='2010-09-24'
+timestamp='2011-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,8 +57,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -92,7 +92,7 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -326,8 +329,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -495,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -820,8 +823,8 @@ EOF
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -934,14 +937,14 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
+ echo or32-unknown-linux-gnu
+ exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit ;;
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
diff --git a/config.sub b/config.sub
index de11910..7c62c34 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-09-11'
+timestamp='2011-04-01'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -76,8 +76,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -175,10 +175,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -283,12 +283,13 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
- | nds32 | nds32le | nds32be\
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
@@ -296,12 +297,12 @@ case $basic_machine in
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
@@ -324,7 +325,15 @@ case $basic_machine in
ms1)
basic_machine=mt-unknown
;;
-
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -382,24 +391,25 @@ case $basic_machine in
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -539,7 +549,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -826,10 +836,10 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
- -nextstep* )
+ -nextstep*)
;;
-ns2*)
os=-nextstep2
@@ -948,11 +958,14 @@ case $basic_machine in
pn)
basic_machine=pn-gould
;;
- power) basic_machine=power-ibm
+ power)
+ basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe)
+ basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -960,9 +973,11 @@ case $basic_machine in
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64) basic_machine=powerpc64-unknown
+ ppc64)
+ basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*)
+ basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1046,6 +1061,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1178,6 +1196,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1400,7 +1421,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1597,7 +1618,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
diff --git a/configure b/configure
index 36eeeb2..2219c01 100755
--- a/configure
+++ b/configure
@@ -686,6 +686,7 @@ Compile/Install Options:
--with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults)
--with-icondir=DIR directory in which to install icons (default: EPREFIX/share/pixmaps)
--disable-desktop disable install of xterm desktop files
+ --with-desktop-category=XXX one or more desktop catgories or auto
--with-reference=XXX program to use as permissions-reference
--with-xterm-symlink=XXX make symbolic link to installed xterm
--disable-setuid disable setuid in xterm, do not install setuid/setgid
@@ -958,7 +959,7 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:961: loading site script $ac_site_file" >&5
+ { echo "$as_me:962: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -969,7 +970,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:972: loading cache $cache_file" >&5
+ { echo "$as_me:973: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -977,7 +978,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:980: creating cache $cache_file" >&5
+ { echo "$as_me:981: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -993,21 +994,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:996: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:997: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:1000: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:1001: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:1006: error: \`$ac_var' has changed since the previous run:" >&5
Reply to: