Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked
in at 2015-04-22 01:16:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2015-03-30
19:10:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2015-04-22
01:16:20.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Apr 19 09:03:43 UTC 2015 - mplus...@suse.com
+
+- Update to version 318
+ * rename new(er) configure option --enable-initial-erase to
+ --enable-pty-erase, since that conflicted with an existing
+ option (report by Jens Schweikhardt).
+ * fix cut/paste error in --with-builtin-xpms configure option
+ (reports by Jens Schweikhardt, Ross Combs).
+ * fix minor formatting issue in xterm manual (report by Jens
+ Schweikhardt).
+ * eliminate unnecessary "#(vi" markers in autoconf macros by
+ using "(" to begin case-statement cases (suggested by Jens
+ Schweikhardt).
+ * minor fixes to improve const usage (Ross Combs).
+- Add pkgconfig and groff as dependency as configure is looking
+ for them
+
+-------------------------------------------------------------------
Old:
----
xterm-317.tgz
xterm-317.tgz.asc
New:
----
xterm-318.tgz
xterm-318.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.RKlDBS/_old 2015-04-22 01:16:21.000000000 +0200
+++ /var/tmp/diff_new_pack.RKlDBS/_new 2015-04-22 01:16:21.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xterm
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define vttest_version 20120506
%define splitbin 0%{?suse_version} >= 1300
Name: xterm
-Version: 317
+Version: 318
Release: 0
Summary: The basic X terminal program
License: MIT
@@ -58,6 +58,8 @@
Provides: XFree86:%{_prefix}/X11R6/bin/xterm
Provides: xorg-x11:%{_prefix}/X11R6/bin/xterm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: groff
+BuildRequires: pkgconfig
%if 0%{?suse_version} > 1220
BuildRequires: fontpackages-devel
%endif
++++++ xterm-317.tgz -> xterm-318.tgz ++++++
++++ 5544 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/INSTALL new/xterm-318/INSTALL
--- old/xterm-317/INSTALL 2015-02-11 11:17:08.000000000 +0100
+++ new/xterm-318/INSTALL 2015-04-12 22:44:43.000000000 +0200
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.156 2015/02/11 10:17:08 tom Exp $
+-- $XTermId: INSTALL,v 1.157 2015/04/12 20:44:43 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2014,2015 by Thomas E. Dickey
--
@@ -444,10 +444,6 @@
Compile-in code to support HP-style function keys.
- --enable-initial-erase set default ptyInitialErase resource (default: false)
-
- This sets the default resource value, which is shown in the manpage.
-
--enable-load-vt-fonts enable load-vt-fonts() action
Compile-in code that allows user to define load different VT-font
@@ -493,6 +489,10 @@
configure --disable-imake --disable-narrowproto
+ --enable-pty-erase set default ptyInitialErase resource (default: false)
+
+ This sets the default resource value, which is shown in the manpage.
+
--enable-readline-mouse enable support for mouse in readline applications
Compile-in code to support experimental bracketed paste mode, i.e.,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/MANIFEST new/xterm-318/MANIFEST
--- old/xterm-317/MANIFEST 2015-03-21 00:54:43.000000000 +0100
+++ new/xterm-318/MANIFEST 2015-04-06 12:31:31.000000000 +0200
@@ -1,4 +1,4 @@
-MANIFEST for xterm-317, version xterm-317
+MANIFEST for xterm-318, version xterm-318
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/button.c new/xterm-318/button.c
--- old/xterm-317/button.c 2014-12-28 23:15:03.000000000 +0100
+++ new/xterm-318/button.c 2015-04-10 12:16:19.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.491 2014/12/28 22:15:03 tom Exp $ */
+/* $XTermId: button.c,v 1.492 2015/04/10 10:16:19 tom Exp $ */
/*
- * Copyright 1999-2013,2014 by Thomas E. Dickey
+ * Copyright 1999-2014,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -3853,8 +3853,9 @@
char *the_data = (char *) screen->selection_data;
char *the_next;
- TRACE(("converting %ld:'%s'\n", screen->selection_length,
- visibleChars(screen->selection_data, screen->selection_length)));
+ TRACE(("converting %ld:'%s'\n",
+ (long) screen->selection_length,
+ visibleChars(screen->selection_data, (unsigned)
screen->selection_length)));
/*
* For most selections, we can convert in one pass. It is possible
* that some applications contain embedded nulls, e.g., using xterm's
@@ -4165,7 +4166,7 @@
TRACE(("_OwnSelection count %d, length %ld value %s\n", count,
screen->selection_length,
- visibleChars(screen->selection_data, screen->selection_length)));
+ visibleChars(screen->selection_data, (unsigned)
screen->selection_length)));
selections = MapSelections(xw, selections, count);
if (count > screen->sel_atoms_size) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/charproc.c new/xterm-318/charproc.c
--- old/xterm-317/charproc.c 2015-03-02 12:46:32.000000000 +0100
+++ new/xterm-318/charproc.c 2015-04-12 18:57:00.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1407 2015/03/02 11:46:32 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1409 2015/04/12 16:57:00 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -7422,7 +7422,7 @@
lookupSelectUnit(XtermWidget xw, Cardinal item, String value)
{
/* *INDENT-OFF* */
- static struct {
+ static const struct {
const char * name;
SelectUnit code;
} table[] = {
@@ -10886,6 +10886,26 @@
#undef FMT
}
+void
+getKeymapResources(Widget w,
+ const char *mapName,
+ const char *mapClass,
+ const char *type,
+ void *result,
+ size_t size)
+{
+ XtResource key_resources[1];
+ key_resources[0].resource_name = XtNtranslations;
+ key_resources[0].resource_class = XtCTranslations;
+ key_resources[0].resource_type = (char *) type;
+ key_resources[0].resource_size = (Cardinal) size;
+ key_resources[0].resource_offset = 0;
+ key_resources[0].default_type = key_resources[0].resource_type;
+ key_resources[0].default_addr = 0;
+ XtGetSubresources(w, (XtPointer) result, mapName, mapClass,
+ key_resources, (Cardinal) 1, NULL, (Cardinal) 0);
+}
+
/* ARGSUSED */
static void
HandleKeymapChange(Widget w,
@@ -10894,48 +10914,56 @@
Cardinal *param_count)
{
static XtTranslations keymap, original;
- static XtResource key_resources[] =
- {
- {XtNtranslations, XtCTranslations, XtRTranslationTable,
- sizeof(XtTranslations), 0, XtRTranslationTable, (XtPointer) NULL}
- };
char mapName[1000];
char mapClass[1000];
char *pmapName;
char *pmapClass;
size_t len;
+ TRACE(("HandleKeymapChange(%#lx, %s)\n",
+ w,
+ (*param_count
+ ? params[0]
+ : "missing")));
+
if (*param_count != 1)
return;
- if (original == NULL)
+ if (original == NULL) {
+ TRACE(("...saving original keymap-translations\n"));
original = w->core.tm.translations;
+ }
if (strcmp(params[0], "None") == 0) {
+ TRACE(("...restoring original keymap-translations\n"));
XtOverrideTranslations(w, original);
- return;
- }
+ } else {
- len = strlen(params[0]) + 7;
+ len = strlen(params[0]) + 7;
- pmapName = (char *) MyStackAlloc(len, mapName);
- pmapClass = (char *) MyStackAlloc(len, mapClass);
- if (pmapName == NULL
- || pmapClass == NULL) {
- SysError(ERROR_KMMALLOC1);
- } else {
+ pmapName = (char *) MyStackAlloc(len, mapName);
+ pmapClass = (char *) MyStackAlloc(len, mapClass);
+ if (pmapName == NULL
+ || pmapClass == NULL) {
+ SysError(ERROR_KMMALLOC1);
+ } else {
- (void) sprintf(pmapName, "%sKeymap", params[0]);
- (void) strcpy(pmapClass, pmapName);
- if (islower(CharOf(pmapClass[0])))
- pmapClass[0] = x_toupper(pmapClass[0]);
- XtGetSubresources(w, (XtPointer) &keymap, pmapName, pmapClass,
- key_resources, (Cardinal) 1, NULL, (Cardinal) 0);
- if (keymap != NULL)
- XtOverrideTranslations(w, keymap);
+ (void) sprintf(pmapName, "%sKeymap", params[0]);
+ (void) strcpy(pmapClass, pmapName);
+ if (islower(CharOf(pmapClass[0])))
+ pmapClass[0] = x_toupper(pmapClass[0]);
+ getKeymapResources(w, pmapName, pmapClass, XtRTranslationTable,
+ &keymap, sizeof(keymap));
+ if (keymap != NULL) {
+ TRACE(("...applying keymap \"%s\"\n", pmapName));
+ XtOverrideTranslations(w, keymap);
+ } else {
+ TRACE(("...found no match for keymap \"%s\"\n", pmapName));
+ }
- MyStackFree(pmapName, mapName);
- MyStackFree(pmapClass, mapClass);
+ MyStackFree(pmapName, mapName);
+ MyStackFree(pmapClass, mapClass);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/configure.in new/xterm-318/configure.in
--- old/xterm-317/configure.in 2015-03-05 21:54:36.000000000 +0100
+++ new/xterm-318/configure.in 2015-04-12 22:41:52.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.332 2015/03/05 20:54:36 tom Exp $
+dnl $XTermId: configure.in,v 1.335 2015/04/12 20:41:52 tom Exp $
dnl
dnl
-----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -44,11 +44,11 @@
dnl Only add to this case statement when a system has a compiler that is not
dnl detected by AC_PROG_CC.
case "$host_os" in
-openedition) : ${CFLAGS="-O2 -Wc,dll -Wl,EDIT=NO"}
+(openedition) : ${CFLAGS="-O2 -Wc,dll -Wl,EDIT=NO"}
: ${CPPFLAGS="-D_ALL_SOURCE"}
: ${LIBS="/usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x
/usr/lib/X11.x"}
: ${CC=c89};;
-darwin*)
+(darwin*)
: ${LDFLAGS}="${LDFLAGS} -Wl,-bind_at_load";;
esac
@@ -285,7 +285,7 @@
# imake-file.
if test "x$cf_cv_lib_tgetent" != xno || test "x$cf_cv_lib_part_tgetent" != xno
; then
case "$IMAKE_CFLAGS" in
- *-DUSE_TERMINFO\ -DHAVE_TIGETSTR*)
+ (*-DUSE_TERMINFO\ -DHAVE_TIGETSTR*)
CF_UNDO_CFLAGS(IMAKE_CFLAGS,terminfo,[-DUSE_TERMINFO[[
]]*-DHAVE_TIGETSTR[[ ]]*])
CF_UNDO_CFLAGS(CPPFLAGS,terminfo,[-DUSE_TERMINFO[[
]]*-DHAVE_TIGETSTR[[ ]]*])
;;
@@ -301,7 +301,7 @@
[default_termid=vt420])
AC_MSG_RESULT($default_termid)
case $default_termid in
-vt*) default_termid=`echo $default_termid | sed -e 's/^..//'`
+(vt*) default_termid=`echo $default_termid | sed -e 's/^..//'`
;;
esac
AC_DEFINE_UNQUOTED(DFT_DECID,"$default_termid",[default terminal-id])
@@ -339,8 +339,8 @@
CF_XBOOL_RESULT(DEFDELETE_DEL,delete_is_del,[Define to 1 if default
backspace/DEL setting is DEL])
AC_MSG_CHECKING(for default pty initial erase setting)
-AC_ARG_ENABLE(initial-erase,
- [ --enable-initial-erase set default ptyInitialErase resource
(default: maybe)],
+AC_ARG_ENABLE(pty-erase,
+ [ --enable-pty-erase set default ptyInitialErase resource
(default: maybe)],
[initial_erase=$enableval],
[initial_erase=False])
CF_XBOOL_RESULT(DEF_INITIAL_ERASE,initial_erase,[Define to 1 if default pty
initial erase setting is TRUE])
@@ -465,10 +465,10 @@
AC_MSG_CHECKING(if you want to ignore Linux's broken palette-strings)
-case $host_os in #(vi
-linux*)
- assume_broken_osc=yes ;; #(vi
-*)
+case $host_os in
+(linux*)
+ assume_broken_osc=yes ;;
+(*)
assume_broken_osc=no ;;
esac
@@ -493,7 +493,7 @@
test "$enable_broken_st" = no && AC_DEFINE(OPT_BROKEN_ST,0,[Define to 0 to
disallow broken string-terminators])
AC_MSG_CHECKING(if you want to compile-in icon data)
-CF_ARG_ENABLE(broken-st,
+CF_ARG_ENABLE(builtin-xpms,
[ --enable-builtin-xpms compile-in icon data],
[enable_builtin_xpms=no],
[enable_builtin_xpms=yes])
@@ -584,9 +584,9 @@
AC_MSG_RESULT($enable_double_bfr)
if test "$enable_double_bfr" = yes ; then
case "x$LIBS" in
- *Xext*)
+ (*Xext*)
;;
- *)
+ (*)
CF_X_EXT
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/ctlseqs.ms new/xterm-318/ctlseqs.ms
--- old/xterm-317/ctlseqs.ms 2015-02-28 02:43:29.000000000 +0100
+++ new/xterm-318/ctlseqs.ms 2015-04-12 22:55:48.000000000 +0200
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.319 2015/02/28 01:43:29 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.320 2015/04/12 20:55:48 tom Exp $
.\"
.\"
.\" Copyright 1996-2014,2015 by Thomas E. Dickey
@@ -69,8 +69,8 @@
.\"
.ds XT XTerm
.ds xt xterm
-.ds LF Patch #315
-.ds RF 2015/02/27
+.ds LF Patch #318
+.ds RF 2015/04/12
.\"
.if n .pl 9999v \" no page breaks in nroff
.ND
@@ -641,7 +641,7 @@
\*(c"\*q \(-> DECSCA
\*(c"\*p \(-> DECSCL
\*r \(-> DECSTBM
- \*s \(-> DECSLRM
+ \*(cs \(-> DECSLRM
\*m \(-> SGR
\*(Sp\*q \(-> DECSCUSR
.br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/ctlseqs.txt new/xterm-318/ctlseqs.txt
--- old/xterm-317/ctlseqs.txt 2015-02-28 02:45:34.000000000 +0100
+++ new/xterm-318/ctlseqs.txt 2015-04-12 23:08:33.000000000 +0200
@@ -21,7 +21,7 @@
Thomas Dickey
XFree86 Project (1996-2006)
invisible-island.net (2006-2015)
- updated for XTerm Patch #315 (2015/02/27)
+ updated for XTerm Patch #318 (2015/04/12)
@@ -210,7 +210,7 @@
" q -> DECSCA
" p -> DECSCL
r -> DECSTBM
- -> DECSLRM
+ s -> DECSLRM
m -> SGR
SP q -> DECSCUSR
xterm responds with DCS 1 $ r Pt ST for valid requests,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/input.c new/xterm-318/input.c
--- old/xterm-317/input.c 2015-02-16 01:10:30.000000000 +0100
+++ new/xterm-318/input.c 2015-04-10 12:50:21.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: input.c,v 1.352 2015/02/16 00:10:30 tom Exp $ */
+/* $XTermId: input.c,v 1.354 2015/04/10 10:50:21 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -130,13 +130,13 @@
} KEY_DATA;
static
-const char *kypd_num = "
XXXXXXXX\tXXX\rXXXxxxxXXXXXXXXXXXXXXXXXXXXX*+,-./0123456789XXX=";
-/* 0123456789 abc
def0123456789abcdef0123456789abcdef0123456789abcd */
+const char kypd_num[] = "
XXXXXXXX\tXXX\rXXXxxxxXXXXXXXXXXXXXXXXXXXXX*+,-./0123456789XXX=";
+/* 0123456789 abc
def0123456789abcdef0123456789abcdef0123456789abcd */
static
-const char *kypd_apl = "
ABCDEFGHIJKLMNOPQRSTUVWXYZ??????abcdefghijklmnopqrstuvwxyzXXX";
-/*
0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd */
+const char kypd_apl[] = "
ABCDEFGHIJKLMNOPQRSTUVWXYZ??????abcdefghijklmnopqrstuvwxyzXXX";
+/*
0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd */
static
-const char *curfinal = "HDACB FE";
+const char curfinal[] = "HDACB FE";
static int decfuncvalue(KEY_DATA *);
static void sunfuncvalue(ANSI *, KEY_DATA *);
@@ -1726,7 +1726,7 @@
Boolean escape = False;
Boolean quoted = False;
- static const char *table[] =
+ static const char *const table[] =
{
"insert",
"insert-seven-bit",
@@ -1854,26 +1854,14 @@
static Bool
TranslationsUseKeyword(Widget w, char **cache, const char *keyword, Bool
onlyInsert)
{
- static String data;
- static XtResource key_resources[] =
- {
- {XtNtranslations, XtCTranslations, XtRString,
- sizeof(data), 0, XtRString, (XtPointer) NULL}
- };
Bool result = False;
char *copy;
char *test;
if ((test = stripTranslations(keyword, onlyInsert)) != 0) {
if (*cache == 0) {
- XtGetSubresources(w,
- (XtPointer) &data,
- "vt100",
- "VT100",
- key_resources,
- XtNumber(key_resources),
- NULL,
- (Cardinal) 0);
+ String data = 0;
+ getKeymapResources(w, "vt100", "VT100", XtRString, &data,
sizeof(data));
if (data != 0 && (copy = stripTranslations(data, onlyInsert)) != 0)
{
*cache = copy;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/main.c new/xterm-318/main.c
--- old/xterm-317/main.c 2014-12-29 01:17:32.000000000 +0100
+++ new/xterm-318/main.c 2015-04-10 02:33:25.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: main.c,v 1.767 2014/12/29 00:17:32 tom Exp $ */
+/* $XTermId: main.c,v 1.769 2015/04/10 00:33:25 tom Exp $ */
/*
- * Copyright 2002-2013,2014 by Thomas E. Dickey
+ * Copyright 2002-2014,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -1296,7 +1296,7 @@
{ NULL, NULL }};
/* *INDENT-ON* */
-static const char *message[] =
+static const char *const message[] =
{
"Fonts should be fixed width and, if both normal and bold are specified,
should",
"have the same size. If only a normal font is specified, it will be used
for",
@@ -1615,7 +1615,7 @@
{
OptionHelp *opt;
OptionHelp *list = sortedOpts(xtermOptions, optionDescList,
XtNumber(optionDescList));
- const char **cpp;
+ const char *const *cpp;
printf("%s usage:\n %s [-options ...] [-e command args]\n\n",
xtermVersion(), ProgramName);
@@ -1952,7 +1952,7 @@
{
#if OPT_MAXIMIZE
#define DATA(name) { #name, es##name }
- static FlagList tblFullscreen[] =
+ static const FlagList tblFullscreen[] =
{
DATA(Always),
DATA(Never)
@@ -2881,7 +2881,7 @@
*/
#if OPT_TEK4014
-static const char *tekterm[] =
+static const char *const tekterm[] =
{
"tek4014",
"tek4015", /* 4014 with APL character set support */
@@ -2900,7 +2900,7 @@
* The VT420 has up to 48 lines on the screen.
*/
-static const char *vtterm[] =
+static const char *const vtterm[] =
{
#ifdef USE_X11TERM
"x11term", /* for people who want special term name */
@@ -3320,7 +3320,7 @@
#if USE_NO_DEV_TTY
int no_dev_tty = False;
#endif
- const char **envnew; /* new environment */
+ const char *const *envnew; /* new environment */
char buf[64];
char *TermName = NULL;
#ifdef TTYSIZE_STRUCT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/menu.c new/xterm-318/menu.c
--- old/xterm-317/menu.c 2015-03-02 03:00:32.000000000 +0100
+++ new/xterm-318/menu.c 2015-04-10 03:11:52.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: menu.c,v 1.329 2015/03/02 02:00:32 tom Exp $ */
+/* $XTermId: menu.c,v 1.331 2015/04/10 01:11:52 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -465,7 +465,7 @@
} MenuHeader;
/* This table is ordered to correspond with MenuIndex */
-static MenuHeader menu_names[] = {
+static const MenuHeader menu_names[] = {
{ "mainMenu", mainMenuEntries, XtNumber(mainMenuEntries) },
{ "vtMenu", vtMenuEntries, XtNumber(vtMenuEntries) },
{ "fontMenu", fontMenuEntries, XtNumber(fontMenuEntries) },
@@ -642,7 +642,7 @@
{XtNcallback, (XtArgVal) cb};
TScreen *screen = TScreenOf(xw);
- MenuHeader *data = &menu_names[num];
+ const MenuHeader *data = &menu_names[num];
MenuList *list = select_menu(w, num);
struct _MenuEntry *entries = data->entry_list;
Cardinal nentries = data->entry_len;
@@ -2118,7 +2118,7 @@
Cardinal *param_count)
{
/* *INDENT-OFF* */
- static struct sigtab {
+ static const struct sigtab {
const char *name;
int sig;
} signals[] = {
@@ -2141,7 +2141,7 @@
/* *INDENT-ON* */
if (*param_count == 1) {
- struct sigtab *st;
+ const struct sigtab *st;
for (st = signals; st->name; st++) {
if (XmuCompareISOLatin1(st->name, params[0]) == 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/misc.c new/xterm-318/misc.c
--- old/xterm-317/misc.c 2015-03-02 14:01:43.000000000 +0100
+++ new/xterm-318/misc.c 2015-04-10 10:27:17.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.724 2015/03/02 13:01:43 tom Exp $ */
+/* $XTermId: misc.c,v 1.726 2015/04/10 08:27:17 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -704,8 +704,8 @@
init_colored_cursor(void)
{
#ifdef HAVE_LIB_XCURSOR
- const char *theme = "index.theme";
- const char *pattern = "xtermXXXXXX";
+ static const char theme[] = "index.theme";
+ static const char pattern[] = "xtermXXXXXX";
const char *tmp_dir;
char *filename;
char *env = getenv("XCURSOR_THEME");
@@ -2008,7 +2008,7 @@
if ((log_default = x_strdup(log_def_name)) == NULL)
return;
#else
- const char *log_def_name = "XtermLog.XXXXXX";
+ static const char log_def_name[] = "XtermLog.XXXXXX";
if ((log_default = x_strdup(log_def_name)) == NULL)
return;
@@ -5100,7 +5100,7 @@
const char *
SysErrorMsg(int code)
{
- static char unknown[] = "unknown error";
+ static const char unknown[] = "unknown error";
char *s = strerror(code);
return s ? s : unknown;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/package/debian/changelog new/xterm-318/package/debian/changelog
--- old/xterm-317/package/debian/changelog 2015-03-21 00:54:44.000000000
+0100
+++ new/xterm-318/package/debian/changelog 2015-04-06 12:31:31.000000000
+0200
@@ -1,3 +1,9 @@
+xterm-dev (318) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 06 Apr 2015 06:31:31
-0400
+
xterm-dev (317) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/package/freebsd/Makefile new/xterm-318/package/freebsd/Makefile
--- old/xterm-317/package/freebsd/Makefile 2015-03-21 00:54:44.000000000
+0100
+++ new/xterm-318/package/freebsd/Makefile 2015-04-06 12:31:31.000000000
+0200
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 317
+PORTVERSION= 318
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/package/xterm.spec new/xterm-318/package/xterm.spec
--- old/xterm-317/package/xterm.spec 2015-03-21 00:54:44.000000000 +0100
+++ new/xterm-318/package/xterm.spec 2015-04-06 12:31:31.000000000 +0200
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.82 2015/03/20 23:54:44 tom Exp $
+# $XTermId: xterm.spec,v 1.83 2015/04/06 10:31:31 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 317
+Version: 318
Release: 1
License: X11
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/resize.c new/xterm-318/resize.c
--- old/xterm-317/resize.c 2014-12-28 23:50:41.000000000 +0100
+++ new/xterm-318/resize.c 2015-04-10 11:00:41.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: resize.c,v 1.133 2014/12/28 22:50:41 tom Exp $ */
+/* $XTermId: resize.c,v 1.135 2015/04/10 09:00:41 tom Exp $ */
/*
- * Copyright 2003-2013,2014 by Thomas E. Dickey
+ * Copyright 2003-2014,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -126,32 +126,31 @@
};
/* *INDENT-ON* */
-static const char *emuname[EMULATIONS] =
+static const char *const emuname[EMULATIONS] =
{
"VT100",
"Sun",
};
static char *myname;
static int shell_type = SHELL_UNKNOWN;
-static const char *getsize[EMULATIONS] =
+static const char *const getsize[EMULATIONS] =
{
ESCAPE("7") ESCAPE("[r") ESCAPE("[999;999H") ESCAPE("[6n"),
ESCAPE("[18t"),
};
#if defined(USE_STRUCT_WINSIZE)
-static const char *getwsize[EMULATIONS] =
+static const char *const getwsize[EMULATIONS] =
{ /* size in pixels */
0,
ESCAPE("[14t"),
};
#endif /* USE_STRUCT_WINSIZE */
-static const char *restore[EMULATIONS] =
+static const char *const restore[EMULATIONS] =
{
ESCAPE("8"),
0,
};
-static const char *setname = "";
-static const char *setsize[EMULATIONS] =
+static const char *const setsize[EMULATIONS] =
{
0,
ESCAPE("[8;%s;%st"),
@@ -165,12 +164,12 @@
static struct sgttyb sgorig;
#endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */
-static const char *size[EMULATIONS] =
+static const char *const size[EMULATIONS] =
{
ESCAPE("[%d;%dR"),
ESCAPE("[8;%d;%dt"),
};
-static char sunname[] = "sunsize";
+static const char sunname[] = "sunsize";
static int tty;
static FILE *ttyfp;
@@ -336,6 +335,7 @@
#ifdef CANT_OPEN_DEV_TTY
extern char *ttyname();
#endif
+ const char *setname = "";
myname = x_basename(argv[0]);
if (strcmp(myname, sunname) == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/util.c new/xterm-318/util.c
--- old/xterm-317/util.c 2015-03-07 16:46:37.000000000 +0100
+++ new/xterm-318/util.c 2015-04-10 10:31:02.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.679 2015/03/07 15:46:37 tom Exp $ */
+/* $XTermId: util.c,v 1.681 2015/04/10 08:31:02 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -113,7 +113,7 @@
int
DamagedCells(TScreen *screen, unsigned n, int *klp, int *krp, int row, int col)
{
- LineData *ld = getLineData(screen, row);
+ CLineData *ld = getLineData(screen, row);
int result = False;
assert(ld);
@@ -898,6 +898,20 @@
}
}
+static char *
+getIconName(void)
+{
+ static char *icon_name;
+ static Arg args[] =
+ {
+ {XtNiconName, (XtArgVal) & icon_name}
+ };
+
+ icon_name = NULL;
+ XtGetValues(toplevel, args, XtNumber(args));
+ return icon_name;
+}
+
static void
setZIconBeep(XtermWidget xw)
{
@@ -906,15 +920,7 @@
/* Flag icon name with "***" on window output when iconified.
*/
if (resource.zIconBeep && mapstate == IsUnmapped &&
!screen->zIconBeep_flagged) {
- static char *icon_name;
- static Arg args[] =
- {
- {XtNiconName, (XtArgVal) & icon_name}
- };
-
- icon_name = NULL;
- XtGetValues(toplevel, args, XtNumber(args));
-
+ char *icon_name = getIconName();
if (icon_name != NULL) {
screen->zIconBeep_flagged = True;
ChangeIconName(xw, icon_name);
@@ -966,17 +972,12 @@
void
resetZIconBeep(XtermWidget xw)
{
- static char *icon_name;
- static Arg args[] =
- {
- {XtNiconName, (XtArgVal) & icon_name}
- };
+ char *icon_name;
TScreen *screen = TScreenOf(xw);
if (screen->zIconBeep_flagged) {
screen->zIconBeep_flagged = False;
- icon_name = NULL;
- XtGetValues(toplevel, args, XtNumber(args));
+ icon_name = getIconName();
if (icon_name != NULL) {
char *buf = CastMallocN(char, strlen(icon_name));
if (buf == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/version.c new/xterm-318/version.c
--- old/xterm-317/version.c 2013-01-01 13:10:44.000000000 +0100
+++ new/xterm-318/version.c 2015-04-10 10:35:33.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: version.c,v 1.1 2013/01/01 12:10:44 tom Exp $ */
+/* $XTermId: version.c,v 1.2 2015/04/10 08:35:33 tom Exp $ */
/*
- * Copyright 2013 by Thomas E. Dickey
+ * Copyright 2013,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -39,21 +39,22 @@
* places. It is derived (when possible) from the __vendorversion__ symbol
* that some newer imake configurations define.
*/
-char *
+const char *
xtermVersion(void)
{
- static char vendor_version[] = __vendorversion__;
- static char *result;
+ static const char vendor_version[] = __vendorversion__;
+ static char *buffer;
+ const char *result;
- if (result == 0) {
- char *vendor = vendor_version;
+ if (buffer == 0) {
+ const char *vendor = vendor_version;
char first[BUFSIZ];
char second[BUFSIZ];
- result = CastMallocN(char, strlen(vendor) + 9);
- if (result == 0)
+ buffer = CastMallocN(char, strlen(vendor) + 9);
+ if (buffer == 0) {
result = vendor;
- else {
+ } else {
/* some vendors leave trash in this string */
for (;;) {
if (!strncmp(vendor, "Version ", (size_t) 8))
@@ -64,11 +65,15 @@
break;
}
if (strlen(vendor) < BUFSIZ &&
- sscanf(vendor, "%[0-9.] %[A-Za-z_0-9.]", first, second) == 2)
- sprintf(result, "%s %s(%d)", second, first, XTERM_PATCH);
- else
- sprintf(result, "%s(%d)", vendor, XTERM_PATCH);
+ sscanf(vendor, "%[0-9.] %[A-Za-z_0-9.]", first, second) == 2) {
+ sprintf(buffer, "%s %s(%d)", second, first, XTERM_PATCH);
+ } else {
+ sprintf(buffer, "%s(%d)", vendor, XTERM_PATCH);
+ }
+ result = buffer;
}
+ } else {
+ result = buffer;
}
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/version.h new/xterm-318/version.h
--- old/xterm-317/version.h 2015-03-27 09:35:36.000000000 +0100
+++ new/xterm-318/version.h 2015-04-13 03:12:09.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.410 2015/03/27 08:35:36 tom Exp $ */
+/* $XTermId: version.h,v 1.413 2015/04/13 01:12:09 tom Exp $ */
/*
* Copyright 1998-2014,2015 by Thomas E. Dickey
@@ -38,13 +38,13 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 317
-#define XTERM_DATE 2015-03-27
+#define XTERM_PATCH 318
+#define XTERM_DATE 2015-04-12
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
#endif
-extern char *xtermVersion(void);
+extern const char *xtermVersion(void);
#endif /* included_version_h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/xstrings.c new/xterm-318/xstrings.c
--- old/xterm-317/xstrings.c 2014-05-03 14:46:53.000000000 +0200
+++ new/xterm-318/xstrings.c 2015-04-10 02:23:33.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: xstrings.c,v 1.60 2014/05/03 12:46:53 tom Exp $ */
+/* $XTermId: xstrings.c,v 1.61 2015/04/10 00:23:33 Ross.Combs Exp $ */
/*
- * Copyright 2000-2013,2014 by Thomas E. Dickey
+ * Copyright 2000-2014,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -485,7 +485,7 @@
if (result == '\0') {
unsigned n;
- const char *s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ static const char s[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
for (n = 0; n < sizeof(table); ++n) {
table[n] = (char) n;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/xterm.h new/xterm-318/xterm.h
--- old/xterm-317/xterm.h 2015-03-02 02:25:59.000000000 +0100
+++ new/xterm-318/xterm.h 2015-04-10 12:49:11.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.756 2015/03/02 01:25:59 tom Exp $ */
+/* $XTermId: xterm.h,v 1.757 2015/04/10 10:49:11 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -891,6 +891,7 @@
extern void VTReset (XtermWidget /* xw */, int /* full */, int /* saved */)
GCC_NORETURN;
extern void VTRun (XtermWidget /* xw */);
extern void dotext (XtermWidget /* xw */, int /* charset */, IChar * /* buf
*/, Cardinal /* len */);
+extern void getKeymapResources(Widget /* w */, const char * /*mapName */,
const char * /* mapClass */, const char * /* type */, void * /* result */,
size_t /* size */);
extern void lookupSelectUnit(XtermWidget /* xw */, Cardinal /* item */, String
/* value */);
extern void releaseCursorGCs(XtermWidget /*xw*/);
extern void releaseWindowGCs(XtermWidget /*xw*/, VTwin * /*win*/);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/xterm.log.html new/xterm-318/xterm.log.html
--- old/xterm-317/xterm.log.html 2015-03-27 09:35:56.000000000 +0100
+++ new/xterm-318/xterm.log.html 2015-04-13 03:11:51.000000000 +0200
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1597 2015/03/27 08:35:56 tom Exp $
+ $XTermId: xterm.log.html,v 1.1604 2015/04/13 01:11:51 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_318">Patch #318 - 2015/04/12</a></li>
+
<li><a href="#xterm_317">Patch #317 - 2015/03/27</a></li>
<li><a href="#xterm_316">Patch #316 - 2015/03/07</a></li>
@@ -919,6 +921,30 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_318" id="xterm_318">Patch #318 -
+ 2015/04/12</a></h1>
+
+ <ul>
+ <li>rename new(er) configure option
+ <code>--enable-initial-erase</code> to
+ <code>--enable-pty-erase</code>, since that conflicted with an
+ existing option (report by Jens Schweikhardt).</li>
+
+ <li>fix cut/paste error in <code>--with-builtin-xpms</code>
+ configure option (reports by Jens Schweikhardt, Ross
+ Combs).</li>
+
+ <li>fix minor formatting issue in xterm manual (report by Jens
+ Schweikhardt).</li>
+
+ <li>eliminate unnecessary "#(vi" markers in autoconf macros by
+ using "(" to begin case-statement cases (suggested by Jens
+ Schweikhardt).</li>
+
+ <li>minor fixes to improve <code>const</code> usage (Ross
+ Combs).</li>
+ </ul>
+
<h1><a name="xterm_317" id="xterm_317">Patch #317 -
2015/03/27</a></h1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-317/xterm.man new/xterm-318/xterm.man
--- old/xterm-317/xterm.man 2015-03-27 01:22:23.000000000 +0100
+++ new/xterm-318/xterm.man 2015-04-12 22:21:20.000000000 +0200
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.610 2015/03/27 00:22:23 tom Exp $
+.\" $XTermId: xterm.man,v 1.611 2015/04/12 20:21:20 tom Exp $
.\"
.\" Copyright 1996-2014,2015 by Thomas E. Dickey
.\"
@@ -1506,16 +1506,16 @@
mini.\*n_32x32,
mini.\*n_48x48
.bP
-filled-\*n_16x16
-filled-\*n_32x32
+filled-\*n_16x16,
+filled-\*n_32x32,
filled-\*n_48x48
.bP
-\*n_16x16
-\*n_32x32
+\*n_16x16,
+\*n_32x32,
\*n_48x48
.bP
-\*n-color_16x16
-\*n-color_32x32
+\*n-color_16x16,
+\*n-color_32x32,
\*n-color_48x48
.RE
.IP
