xterm: Changes to 'debian-unstable'
MANIFEST | 2
Makefile.in | 7
aclocal.m4 | 178 ++-
button.c | 50
charproc.c | 30
configure | 2434 ++++++++++++++++++++++++++++++++++-------------
configure.in | 4
ctlseqs.ms | 1134 +++++++++++----------
ctlseqs.txt | 1039 ++++++++++----------
debian/changelog | 7
misc.c | 4
package/debian/changelog | 6
package/xterm.spec | 4
trace.h | 9
version.h | 4
xterm.h | 5
xterm.log.html | 39
xterm.man | 16
xtermcfg.hin | 3
19 files changed, 3159 insertions(+), 1816 deletions(-)
New commits:
commit 31d78d266cc24120ac44f78163e010961fedb0e8
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 22 19:16:11 2010 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 5fc33b7..7ef4bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (266-2) UNRELEASED; urgency=low
+xterm (267-1) UNRELEASED; urgency=low
[ Sven Joachim ]
* Prefer lynx-cur over lynx in Build-Depends.
@@ -11,8 +11,11 @@ xterm (266-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update copy of XTerm FAQ to revision 1.158 (dated 2010/11/10)
+ * New upstream release
+ + add copy-selection action (request by Timo Juhani Lindfors,
+ closes: #588785
- -- Sven Joachim <svenjoac@gmx.de> Sat, 20 Nov 2010 13:14:37 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 22 Nov 2010 19:06:50 +0100
xterm (266-1) unstable; urgency=low
commit 8c231dcdea0b7c5e697b7a724ccd63c6ff8bc21c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 22 19:05:14 2010 +0100
Import xterm 267
diff --git a/MANIFEST b/MANIFEST
index ad9bc8d..c5e1d32 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-266, version xterm-266
+MANIFEST for xterm-267, version xterm-267
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index ed86ce2..4d59cb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.172 2010/10/23 18:15:25 tom Exp $
+## $XTermId: Makefile.in,v 1.173 2010/11/13 12:52:34 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -339,8 +339,11 @@ mostlyclean :
clean : mostlyclean
-$(RM) $(PROGRAMS)
-distclean : clean
+distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
+
+distclean \
+docs-clean ::
-$(RM) *.ps *.pdf *.png
-$(SHELL) -c 'for p in xterm resize uxterm koi8rxterm; \
do \
diff --git a/aclocal.m4 b/aclocal.m4
index 0a05548..e0800dc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.285 2010/06/14 21:44:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.293 2010/11/19 10:44:13 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -162,13 +162,26 @@ dnl $1 = libraries to add, with the "-l", etc.
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
+dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl ----------------
+dnl Add a given library after another, e.g., following the one it satisfies a
+dnl dependency for.
+dnl
+dnl $1 = the first library
+dnl $2 = its dependency
+AC_DEFUN([CF_ADD_LIB_AFTER],[
+CF_VERBOSE(...before $LIBS)
+LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/ / /g'`
+CF_VERBOSE(...after $LIBS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
dnl ----------------
dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
dnl in the sharutils 4.2 distribution.
AC_DEFUN([CF_ANSI_CC_CHECK],
[
-AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
cf_cv_ansi_cc=no
cf_save_CFLAGS="$CFLAGS"
cf_save_CPPFLAGS="$CPPFLAGS"
@@ -600,7 +613,7 @@ else
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -627,7 +640,7 @@ if test "$GCC" = yes
then
AC_CHECKING([for $CC __attribute__ directives])
cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -724,7 +737,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
+dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@@ -749,7 +762,7 @@ AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
EOF
@@ -828,7 +841,7 @@ then
done
CFLAGS="$cf_save_CFLAGS"
fi
-rm -f conftest*
+rm -rf conftest*
AC_SUBST(EXTRA_CFLAGS)
])dnl
@@ -1174,7 +1187,7 @@ x-R*)
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
+dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
dnl ------------
dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have
dnl a monocase filesystem.
@@ -1184,10 +1197,10 @@ AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
AC_CHECK_PROGS(CTAGS, exctags ctags)
AC_CHECK_PROGS(ETAGS, exetags etags)
-AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS:-ctags}, yes, no)
if test "$cf_cv_mixedcase" = yes ; then
- AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
+ AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS:-etags}, yes, no)
else
MAKE_UPPER_TAGS=no
fi
@@ -1241,12 +1254,12 @@ fi
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
+dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
dnl ----------
dnl Write a debug message to config.log, along with the line number in the
dnl configure script.
AC_DEFUN([CF_MSG_LOG],[
-echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
+echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
@@ -1262,7 +1275,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
AC_SUBST(PATH_SEPARATOR)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PATH_PROG version: 7 updated: 2009/01/11 20:34:16
+dnl CF_PATH_PROG version: 8 updated: 2010/10/23 16:12:25
dnl ------------
dnl Check for a given program, defining corresponding symbol.
dnl $1 = environment variable, which is suffixed by "_PATH" in the #define.
@@ -1281,7 +1294,7 @@ AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1)
cf_path_prog=""
cf_path_args=""
-IFS="${IFS= }"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- }"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
for cf_temp in $ac_cv_path_$1
do
if test -z "$cf_path_prog" ; then
@@ -1594,7 +1607,7 @@ AC_SUBST(PROG_EXT)
test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_REGEX version: 7 updated: 2010/05/29 16:31:02
+dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44
dnl --------
dnl Attempt to determine if we've got one of the flavors of regular-expression
dnl code that we can support.
@@ -1603,8 +1616,15 @@ AC_DEFUN([CF_REGEX],
cf_regex_func=no
+cf_regex_libs="regex re"
+case $host_os in #(vi
+mingw*)
+ cf_regex_libs="regex.dll $cf_regex_libs"
+ ;;
+esac
+
AC_CHECK_FUNC(regcomp,[cf_regex_func=regcomp],[
- for cf_regex_lib in regex re
+ for cf_regex_lib in $cf_regex_libs
do
AC_CHECK_LIB($cf_regex_lib,regcomp,[
CF_ADD_LIB($cf_regex_lib)
@@ -2641,7 +2661,7 @@ else
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATH version: 9 updated: 2010/05/26 05:38:42
+dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
dnl ------------
dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
dnl defaulting to yes/no.
@@ -2654,7 +2674,7 @@ dnl $5 = default value, if it's an expression & cannot be in the help-message
dnl
AC_DEFUN([CF_WITH_PATH],
[AC_ARG_WITH($1,[$2 ](default: ifelse([$4],,empty,[$4])),,
-ifelse([$4],,[withval="${$3}"],[withval="${$3-ifelse([$5],,[$4],[$5])}"]))dnl
+ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
if ifelse([$5],,true,[test -n "$5"]) ; then
CF_PATH_SYNTAX(withval)
fi
@@ -2822,14 +2842,14 @@ if test -n "$cf_xopen_source" ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 16 updated: 2010/06/14 17:42:30
+dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
dnl -----------
dnl Check for Xaw (Athena) libraries
dnl
dnl Sets $cf_x_athena according to the flavor of Xaw which is used.
AC_DEFUN([CF_X_ATHENA],
[
-cf_x_athena=${cf_x_athena-Xaw}
+cf_x_athena=${cf_x_athena:-Xaw}
AC_MSG_CHECKING(if you want to link with Xaw 3d library)
withval=
@@ -2880,6 +2900,27 @@ if test "$PKG_CONFIG" != none ; then
cf_x_athena_lib="$cf_pkgconfig_libs"
CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+
+AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
+AC_TRY_LINK([
+#include <X11/Xmu/CharSet.h>
+],[
+int check = XmuCompareISOLatin1("big", "small")
+],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])])
+
+ if test "$cf_cv_xaw_compat" = no
+ then
+ # workaround for broken ".pc" files...
+ case "$cf_x_athena_lib" in #(vi
+ *-lXmu*) #(vi
+ ;;
+ *)
+ CF_VERBOSE(work around broken package)
+ CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)])
+ ;;
+ esac
+ fi
+
break])
done
fi
@@ -2999,7 +3040,39 @@ CF_TRY_PKG_CONFIG(Xext,,[
[CF_ADD_LIB(Xext)])])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_X_FREETYPE version: 22 updated: 2010/06/02 05:03:05
+dnl CF_X_FONTCONFIG version: 3 updated: 2010/11/09 05:18:02
+dnl ---------------
+dnl Check for fontconfig library, a dependency of the X FreeType library.
+AC_DEFUN([CF_X_FONTCONFIG],
+[
+AC_REQUIRE([CF_X_FREETYPE])
+
+AC_CACHE_CHECK(for usable Xft/fontconfig package,cf_cv_xft_compat,[
+AC_TRY_LINK([
+#include <X11/Xft/Xft.h>
+],[
+ XftPattern *pat;
+ XftPatternBuild(pat,
+ XFT_FAMILY, XftTypeString, "mono",
+ (void *) 0);
+],[cf_cv_xft_compat=yes],[cf_cv_xft_compat=no])
+])
+
+if test "$cf_cv_xft_compat" = no
+then
+ # workaround for broken ".pc" files used for Xft.
+ case "$cf_cv_x_freetype_libs" in #(vi
+ *-lfontconfig*) #(vi
+ ;;
+ *)
+ CF_VERBOSE(work around broken package)
+ CF_TRY_PKG_CONFIG(fontconfig,,[CF_ADD_LIB_AFTER(-lXft,-lfontconfig)])
+ ;;
+ esac
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_X_FREETYPE version: 23 updated: 2010/11/08 20:19:21
dnl -------------
dnl Check for X FreeType headers and libraries (XFree86 4.x, etc).
dnl
@@ -3114,12 +3187,11 @@ else
fi
# FIXME: revisit this if needed
-AC_SUBST(XRENDERFONT)
AC_SUBST(HAVE_TYPE_FCCHAR32)
AC_SUBST(HAVE_TYPE_XFTCHARSPEC)
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 15 updated: 2010/06/14 17:42:30
+dnl CF_X_TOOLKIT version: 20 updated: 2010/11/19 05:43:04
dnl ------------
dnl Check for X Toolkit libraries
dnl
@@ -3132,22 +3204,54 @@ cf_have_X_LIBS=no
CF_TRY_PKG_CONFIG(xt,[
- # workaround for broken ".pc" files used for X Toolkit.
- case "x$X_PRE_LIBS" in #(vi
- *-lICE*)
- case "x$LIBS" in #(vi
- *-lICE*) #(vi
- ;;
- *)
- CF_VERBOSE(work around broken package)
- CF_VERBOSE(...before $LIBS)
- LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'`
- CF_VERBOSE(...after $LIBS)
- ;;
- esac
+ case "x$LIBS" in #(vi
+ *-lX11*) #(vi
+ ;;
+ *)
+# we have an "xt" package, but it may omit Xt's dependency on X11
+AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[
+AC_TRY_LINK([
+#include <X11/Xlib.h>
+],[
+ int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
+ int rc2 = XClearWindow((Display*) 0, (Window) 0);
+ int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0);
+ int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0);
+],[cf_cv_xt_x11_compat=yes],[cf_cv_xt_x11_compat=no])])
+ if test "$cf_cv_xt_x11_compat" = no
+ then
+ CF_VERBOSE(work around broken X11 dependency)
+ # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ CF_TRY_PKG_CONFIG(x11,,[CF_ADD_LIB_AFTER(-lXt,-lX11)])
+ fi
;;
esac
+AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[
+AC_TRY_LINK([
+#include <X11/Shell.h>
+],[int num = IceConnectionNumber(0)
+],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])])
+
+ if test "$cf_cv_xt_ice_compat" = no
+ then
+ # workaround for broken ".pc" files used for X Toolkit.
+ case "x$X_PRE_LIBS" in #(vi
+ *-lICE*)
+ case "x$LIBS" in #(vi
+ *-lICE*) #(vi
+ ;;
+ *)
+ CF_VERBOSE(work around broken ICE dependency)
+ CF_TRY_PKG_CONFIG(ice,
+ [CF_TRY_PKG_CONFIG(sm)],
+ [CF_ADD_LIB_AFTER(-lXt,$X_PRE_LIBS)])
+ ;;
+ esac
+ ;;
+ esac
+ fi
+
cf_have_X_LIBS=yes
],[
diff --git a/button.c b/button.c
index 9693186..fee5681 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.390 2010/10/22 00:53:57 tom Exp $ */
+/* $XTermId: button.c,v 1.391 2010/11/11 11:50:13 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -1117,54 +1117,18 @@ HandleKeyboardSelectEnd(Widget w,
}
/*
- * Like "select-end" (optionally copies the selection to the given targets),
- * but also sets the modes so that releasing the mouse button or moving the
- * mouse does not alter the selection.
+ * Copy the selection data to the given target(s).
*/
-static void
-do_select_stop(XtermWidget xw,
- XEvent * event, /* must be XButtonEvent */
- String * params, /* selections */
- Cardinal *num_params,
- Bool use_cursor_loc)
-{
- TScreen *screen = TScreenOf(xw);
-
- screen->selection_time = event->xbutton.time;
- switch (screen->eventMode) {
- case NORMAL:
- (void) SendMousePosition(xw, event);
- break;
- case LEFTEXTENSION:
- case RIGHTEXTENSION:
- EndExtend(xw, event, params, *num_params, use_cursor_loc);
- break;
- }
-}
-
void
-HandleSelectStop(Widget w,
- XEvent * event, /* must be XButtonEvent */
- String * params, /* selections */
- Cardinal *num_params)
+HandleCopySelection(Widget w,
+ XEvent * event,
+ String * params, /* list of targets */
+ Cardinal *num_params)
{
XtermWidget xw;
if ((xw = getXtermWidget(w)) != 0) {
- do_select_stop(xw, event, params, num_params, False);
- }
-}
-
-void
-HandleKeyboardSelectStop(Widget w,
- XEvent * event, /* must be XButtonEvent */
- String * params, /* selections */
- Cardinal *num_params)
-{
- XtermWidget xw;
-
- if ((xw = getXtermWidget(w)) != 0) {
- do_select_stop(xw, event, params, num_params, True);
+ SelectSet(xw, event, params, *num_params);
}
}
diff --git a/charproc.c b/charproc.c
index 919b9e2..098e472 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1087 2010/10/22 23:04:58 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1091 2010/11/11 11:41:26 tom Exp $ */
/*
@@ -277,6 +277,7 @@ static XtActionsRec actionsList[] = {
{ "allow-send-events", HandleAllowSends },
{ "bell", HandleBell },
{ "clear-saved-lines", HandleClearSavedLines },
+ { "copy-selection", HandleCopySelection },
{ "create-menu", HandleCreateMenu },
{ "delete-is-del", HandleDeleteIsDEL },
{ "dired-button", DiredButton },
@@ -300,16 +301,10 @@ static XtActionsRec actionsList[] = {
{ "select-cursor-end", HandleKeyboardSelectEnd },
{ "select-cursor-extend", HandleKeyboardSelectExtend },
{ "select-cursor-start", HandleKeyboardSelectStart },
-#if 0
- { "select-cursor-stop", HandleKeyboardSelectStop },
-#endif
{ "select-end", HandleSelectEnd },
{ "select-extend", HandleSelectExtend },
{ "select-set", HandleSelectSet },
{ "select-start", HandleSelectStart },
-#if 0
- { "select-stop", HandleSelectStop },
-#endif
{ "send-signal", HandleSendSignal },
{ "set-8-bit-control", Handle8BitControl },
{ "set-allow132", HandleAllow132 },
@@ -6458,13 +6453,17 @@ VTInitialize(Widget wrequest,
* can be overridden to make these true resources.
*/
if (i >= MIN_ANSI_COLORS && i < NUM_ANSI_COLORS) {
- TScreenOf(wnew)->Acolors[i].resource
- = ((char *) fake_resources[i - MIN_ANSI_COLORS].default_addr);
+ TScreenOf(wnew)->Acolors[i].resource =
+ x_strtrim(fake_resources[i - MIN_ANSI_COLORS].default_addr);
if (TScreenOf(wnew)->Acolors[i].resource == 0)
TScreenOf(wnew)->Acolors[i].resource = XtDefaultForeground;
} else
#endif /* OPT_COLOR_RES2 */
+ {
TScreenOf(wnew)->Acolors[i] = TScreenOf(request)->Acolors[i];
+ TScreenOf(wnew)->Acolors[i].resource =
+ x_strtrim(TScreenOf(wnew)->Acolors[i].resource);
+ }
#if OPT_COLOR_RES
TRACE(("Acolors[%d] = %s\n", i, TScreenOf(wnew)->Acolors[i].resource));
@@ -8424,7 +8423,7 @@ set_character_class(char *s)
int base; /* 8, 10, 16 (octal, decimal, hex) */
int numbers; /* count of numbers per range */
int digits; /* count of digits in a number */
- static const char *errfmt = "%s: %s in range string \"%s\" (position %d)\n";
+ static const char errfmt[] = "%s: %s in range string \"%s\" (position %d)\n";
if (!s || !s[0])
return -1;
@@ -8641,17 +8640,17 @@ DoSetSelectedFont(Widget w,
memcpy(val, value, (size_t) len);
val[len] = '\0';
used = x_strtrim(val);
- TRACE(("DoSetSelectedFont(%s)\n", val));
+ TRACE(("DoSetSelectedFont(%s)\n", used));
/* Do some sanity checking to avoid sending a long selection
back to the server in an OpenFont that is unlikely to succeed.
XLFD allows up to 255 characters and no control characters;
we are a little more liberal here. */
if (len < 1000
- && !strchr(val, '\n')
- && (test = x_strdup(val)) != 0) {
+ && !strchr(used, '\n')
+ && (test = x_strdup(used)) != 0) {
TScreenOf(xw)->MenuFontName(fontMenu_fontsel) = test;
if (!xtermLoadFont(term,
- xtermFontName(val),
+ xtermFontName(used),
True,
fontMenu_fontsel)) {
failed = True;
@@ -8668,8 +8667,7 @@ DoSetSelectedFont(Widget w,
oldFont);
Bell(xw, XkbBI_MinorError, 0);
}
- if (used != val)
- free(used);
+ free(used);
free(val);
}
}
diff --git a/configure b/configure
index 425c564..f818a1f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20100530.
+# Generated by Autoconf 2.52.20101001.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -834,7 +834,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20100530. Invocation command line was
+generated by GNU Autoconf 2.52.20101001. Invocation command line was
$ $0 $@
@@ -1860,7 +1860,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
-rm -f conftest*
+rm -rf conftest*
if test -n "$ac_declaration"; then
echo '#ifdef __cplusplus' >>confdefs.h
echo $ac_declaration >>confdefs.h
@@ -2100,7 +2100,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_prog_gcc_traditional=no
fi
-rm -f conftest*
+rm -rf conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
@@ -2113,7 +2113,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "$ac_pattern" >/dev/null 2>&1; then
ac_cv_prog_gcc_traditional=yes
fi
-rm -f conftest*
+rm -rf conftest*
fi
fi
@@ -2318,7 +2318,7 @@ else
echo "$as_me:2318: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-rm -f conftest*
+rm -rf conftest*
echo "$as_me:2323: checking for POSIXized ISC" >&5
echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
@@ -2346,8 +2346,8 @@ fi
### checks for compiler characteristics
-echo "$as_me:2349: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
+echo "$as_me:2349: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
if test "${cf_cv_ansi_cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3120,7 +3120,7 @@ if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me-configure}:3123: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3123: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
#line 3126 "configure"
@@ -3203,12 +3203,12 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me-configure}:3206: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3206: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me-configure}:3211: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3211: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
#line 3214 "configure"
@@ -3898,7 +3898,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -3916,7 +3916,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -4203,7 +4203,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_type_uid_t=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
echo "$as_me:4209: result: $ac_cv_type_uid_t" >&5
@@ -5760,7 +5760,7 @@ if test "${with_app_defaults+set}" = set; then
withval="$with_app_defaults"
else
- withval="${appsdir-'\$(exec_prefix)/lib/X11/app-defaults'}"
+ withval="${appsdir:-'\$(exec_prefix)/lib/X11/app-defaults'}"
fi; if test -n "'\$(exec_prefix)/lib/X11/app-defaults'" ; then
if test "x$prefix" != xNONE; then
@@ -5811,7 +5811,7 @@ if test "${with_icondir+set}" = set; then
withval="$with_icondir"
else
- withval="${icondir-'\$(exec_prefix)/share/pixmaps'}"
+ withval="${icondir:-'\$(exec_prefix)/share/pixmaps'}"
fi; if test -n "'\$(exec_prefix)/share/pixmaps'" ; then
if test "x$prefix" != xNONE; then
@@ -5982,7 +5982,7 @@ test -n "$XTERM_PATH" || XTERM_PATH="$XTERM_PATH"
cf_path_prog=""
cf_path_args=""
-IFS="${IFS= }"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- }"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
for cf_temp in $ac_cv_path_XTERM_PATH
do
if test -z "$cf_path_prog" ; then
@@ -6031,7 +6031,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me-configure}:6034: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:6034: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define XTERM_PATH_PATH "$cf_path_prog"
@@ -6300,7 +6300,7 @@ if test "$use_utempter" = yes ; then
disable_setuid=yes
test -n "$verbose" && echo " No --disable-setuid option given, force to yes" 1>&6
-echo "${as_me-configure}:6303: testing No --disable-setuid option given, force to yes ..." 1>&5
+echo "${as_me:-configure}:6303: testing No --disable-setuid option given, force to yes ..." 1>&5
fi
fi
@@ -8352,17 +8352,17 @@ cf_have_X_LIBS=no
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
test -n "$verbose" && echo " found package xt" 1>&6
-echo "${as_me-configure}:8355: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:8355: testing found package xt ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`"
test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
-echo "${as_me-configure}:8361: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8361: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
-echo "${as_me-configure}:8365: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8365: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -8444,30 +8444,447 @@ fi
LIBS="$cf_pkgconfig_libs $LIBS"
- # workaround for broken ".pc" files used for X Toolkit.
- case "x$X_PRE_LIBS" in #(vi
- *-lICE*)
- case "x$LIBS" in #(vi
- *-lICE*) #(vi
+ case "x$LIBS" in #(vi
+ *-lX11*) #(vi
+ ;;
+ *)
+# we have an "xt" package, but it may omit Xt's dependency on X11
+echo "$as_me:8452: checking for usable X dependency" >&5
+echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+if test "${cf_cv_xt_x11_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 8459 "configure"
+#include "confdefs.h"
+
+#include <X11/Xlib.h>
+
+int
+main ()
+{
+
+ int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
+ int rc2 = XClearWindow((Display*) 0, (Window) 0);
+ int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0);
+ int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8478: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:8481: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:8484: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:8487: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xt_x11_compat=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xt_x11_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8497: result: $cf_cv_xt_x11_compat" >&5
+echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ if test "$cf_cv_xt_x11_compat" = no
+ then
+ test -n "$verbose" && echo " work around broken X11 dependency" 1>&6
+
+echo "${as_me:-configure}:8503: testing work around broken X11 dependency ..." 1>&5
+
+ # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+echo "${as_me:-configure}:8510: testing found package x11 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`"
+ test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:8516: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:8520: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
;;
- *)
- test -n "$verbose" && echo " work around broken package" 1>&6
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-echo "${as_me-configure}:8456: testing work around broken package ..." 1>&5
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
- test -n "$verbose" && echo " ...before $LIBS" 1>&6
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
-echo "${as_me-configure}:8460: testing ...before $LIBS ..." 1>&5
+if test -n "$cf_new_cflags" ; then
- LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'`
- test -n "$verbose" && echo " ...after $LIBS" 1>&6
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
-echo "${as_me-configure}:8465: testing ...after $LIBS ..." 1>&5
+if test -n "$cf_new_cppflags" ; then
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ LIBS="$cf_pkgconfig_libs $LIBS"
+ :
+else
+
+test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:8606: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/ / /g'`
+test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+echo "${as_me:-configure}:8611: testing ...after $LIBS ..." 1>&5
+
+fi
+
+ fi
+ ;;
+ esac
+
+echo "$as_me:8619: checking for usable X Toolkit package" >&5
+echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+if test "${cf_cv_xt_ice_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 8626 "configure"
+#include "confdefs.h"
+
+#include <X11/Shell.h>
+
+int
+main ()
+{
+int num = IceConnectionNumber(0)
+
Reply to: