xterm: Changes to 'debian-unstable'
256colres.pl | 35 ++
88colres.pl | 36 ++
KOI8RXTerm.ad | 36 ++
MANIFEST | 3
Makefile.in | 56 ++-
Tekparse.def | 35 ++
Tekproc.c | 13
UXTerm.ad | 35 ++
VTPrsTbl.c | 357 +++++++++++++++++++++-
VTparse.def | 37 ++
VTparse.h | 47 +-
XTerm-col.ad | 33 ++
XTerm.ad | 33 ++
aclocal.m4 | 43 +-
button.c | 98 +++---
cachedGCs.c | 32 +-
charproc.c | 781 +++++++++++++++++++++++++++++--------------------
configure.in | 51 +--
ctlseqs.ms | 109 ++++++
ctlseqs.txt | 90 +++++
cursor.c | 14
debian/changelog | 9
debian/copyright | 98 ++++--
doublechr.c | 12
fontutils.c | 56 ++-
gen-pc-fkeys.pl | 34 ++
input.c | 22 -
koi8rxterm | 35 ++
linedata.c | 6
main.c | 336 ++++++++++-----------
main.h | 6
menu.c | 316 +++++++++----------
menu.h | 104 +++---
minstall.sh | 33 ++
misc.c | 553 ++++++++++++++++++++++++----------
mkdirs.sh | 51 ---
os2main.c | 346 ++++++++++-----------
plink.sh | 34 ++
print.c | 129 ++++++--
proto.h | 35 ++
ptydata.c | 4
ptyx.h | 58 +++
run-tic.sh | 33 ++
screen.c | 58 +--
sinstall.sh | 33 ++
tabs.c | 8
testxmc.c | 8
trace.c | 115 +++++--
trace.h | 64 ++--
util.c | 131 ++++----
uxterm | 33 ++
uxterm.desktop | 33 ++
version.h | 37 ++
vms.c | 8
vttests/16colors.sh | 33 +-
vttests/256colors.pl | 34 ++
vttests/256colors2.pl | 37 ++
vttests/88colors.pl | 33 ++
vttests/88colors2.pl | 36 ++
vttests/8colors.sh | 33 +-
vttests/acolors.sh | 33 +-
vttests/doublechars.sh | 33 +-
vttests/dynamic.sh | 33 +-
vttests/dynamic2.sh | 33 +-
vttests/fonts.sh | 33 +-
vttests/paste64.pl | 34 +-
vttests/resize.pl | 33 +-
vttests/resize.sh | 33 +-
vttests/tcapquery.pl | 33 +-
vttests/title.sh | 33 +-
xstrings.c | 104 +++++-
xstrings.h | 15
xterm.desktop | 33 ++
xterm.h | 51 ++-
xterm.log.html | 137 +++++++-
xterm.man | 59 +++
xtermcap.c | 32 --
xtermcap.h | 4
78 files changed, 4145 insertions(+), 1639 deletions(-)
New commits:
commit 0a5465be5e2179bf79149504c6713de2605983d6
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 29 12:11:02 2009 +0000
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 15414cc..07be7ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (253-1) UNRELEASED; urgency=low
* New upstream release
+ parenthesize expression in MoreRows macro, fixing a limit check added in
patch #251 (closes: #560039)
+ * Update debian/copyright.
-- Julien Cristau <jcristau@debian.org> Tue, 29 Dec 2009 11:37:02 +0000
diff --git a/debian/copyright b/debian/copyright
index 9428c89..88e3717 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,31 +4,8 @@ This package was debianized by first time by David Martinez Moreno
Upstream sources: http://invisible-island.net/xterm/xterm.html
-Copyright 1996-2009 by Thomas E. Dickey
-Copyright 1998 by Jason Bacon <acadix@execpc.com>
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Copyright 1996-2009 by Thomas E. Dickey
-Copyright 2001-2004 Branden Robinson
-Copyright 2001 by Juliusz Chroboczek
+Copyright 1997-2009 by Thomas E. Dickey
+Copyright 1999-2000 by Steve Wall
All Rights Reserved
@@ -57,6 +34,49 @@ sale, use or other dealings in this Software without prior written
authorization.
+Copyright 1998 by Jason Bacon <acadix@execpc.com>
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (C) 2001 by Juliusz Chroboczek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
Copyright 1984-1994 X Consortium
Permission is hereby granted, free of charge, to any person obtaining
@@ -127,3 +147,31 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
+
+Copyright 2001, 2004 Branden Robinson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+Markus Kuhn -- 2007-05-25
+
+Permission to use, copy, modify, and distribute this software
+for any purpose and without fee is hereby granted. The author
+disclaims all warranties with regard to this software.
+
commit cf4b4cf740ec66f79af661755e45a0f679ab508c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 29 11:41:10 2009 +0000
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 20c530c..15414cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (253-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + parenthesize expression in MoreRows macro, fixing a limit check added in
+ patch #251 (closes: #560039)
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 29 Dec 2009 11:37:02 +0000
+
xterm (251-1) unstable; urgency=low
* New upstream release.
commit 0ab96ae05264dc23c68bb9c89ef436c7b876ae13
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 29 11:36:10 2009 +0000
Import xterm 253
diff --git a/Tekproc.c b/Tekproc.c
index 117982b..52dc9f2 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.174 2009/11/28 14:20:28 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.175 2009/12/09 23:25:34 Jochen.Voss Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -1400,7 +1400,7 @@ TekRealize(Widget gw,
unsigned long TEKgcFontMask;
TRACE(("TekRealize\n"));
- memset(tekscr, 0, sizeof(tekscr));
+ memset(tekscr, 0, sizeof(*tekscr));
#ifndef NO_ACTIVE_ICON
tekscr->whichTwin = &tekscr->fullTwin;
diff --git a/button.c b/button.c
index 5adcbaf..73b4908 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.361 2009/12/07 01:19:51 tom Exp $ */
+/* $XTermId: button.c,v 1.362 2009/12/09 10:19:43 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -2969,7 +2969,7 @@ do_select_regex(TScreen * screen, CELL * startc, CELL * endc)
ld.name = GET_LINEDATA(screen, --screen->name.row)
#define MoreRows(name) \
- screen->name.row < screen->max_row
+ (screen->name.row < screen->max_row)
#define isPrevWrapped(name) \
(screen->name.row > 0 \
diff --git a/charproc.c b/charproc.c
index 5cd075d..d4f491e 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1019 2009/12/07 01:43:09 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1020 2009/12/10 09:24:04 tom Exp $ */
/*
@@ -6630,12 +6630,6 @@ VTDestroy(Widget w GCC_UNUSED)
}
#endif
-#if OPT_COLOR_RES
- /* free local copies of resource strings */
- for (n = 0; n < NCOLORS; ++n) {
- FREE_LEAK(screen->Tcolors[n].resource);
- }
-#endif
#if OPT_SELECT_REGEX
for (n = 0; n < NSELECTUNITS; ++n) {
FREE_LEAK(screen->selectExpr[n]);
diff --git a/fontutils.c b/fontutils.c
index b3ca94b..1ff3216 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.325 2009/12/02 10:17:52 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.327 2009/12/10 09:35:41 tom Exp $ */
/************************************************************
@@ -1917,7 +1917,7 @@ xtermComputeFontInfo(XtermWidget xw,
face_name = getFaceName(xw, xw->misc.face_wide_name);
TRACE(("xtermComputeFontInfo wide(face %s, char_width %d)\n",
- face_name,
+ NonNull(face_name),
char_width));
#define WideXftPattern \
@@ -1925,7 +1925,7 @@ xtermComputeFontInfo(XtermWidget xw,
XFT_SIZE, XftTypeDouble, face_size, \
XFT_SPACING, XftTypeInteger, XFT_MONO
- if ((pat = XftNameParse(face_name)) != 0) {
+ if (face_name && (pat = XftNameParse(face_name)) != 0) {
#define OPEN_XFT(tag) xtermOpenXft(xw, face_name, pat, tag)
XftPatternBuild(pat,
WideXftPattern,
diff --git a/print.c b/print.c
index b80aaa9..08f883d 100644
--- a/print.c
+++ b/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.114 2009/12/01 01:42:44 tom Exp $ */
+/* $XTermId: print.c,v 1.115 2009/12/10 09:44:39 tom Exp $ */
/************************************************************
@@ -659,14 +659,14 @@ getPrinterFlags(XtermWidget xw, String * params, Cardinal *param_count)
TScreen *screen = TScreenOf(xw);
PrinterFlags *result = &(screen->printer_flags);
- TRACE(("getPrinterFlags %d params\n", *param_count));
+ TRACE(("getPrinterFlags %d params\n", param_count ? *param_count : 0));
result->printer_extent = screen->printer_extent;
result->printer_formfeed = screen->printer_formfeed;
result->printer_newline = screen->printer_newline;
result->print_attributes = screen->print_attributes;
- if (*param_count != 0) {
+ if (param_count != 0 && *param_count != 0) {
Cardinal j;
unsigned k;
for (j = 0; j < *param_count; ++j) {
diff --git a/screen.c b/screen.c
index dc57914..899dc4a 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.408 2009/11/28 12:38:26 tom Exp $ */
+/* $XTermId: screen.c,v 1.409 2009/12/09 23:31:18 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -683,7 +683,7 @@ ClearCells(XtermWidget xw, int flags, unsigned len, int row, int col)
if_OPT_WIDE_CHARS(screen, {
size_t off;
for_each_combData(off, ld) {
- memset(ld->combData[off] + col, 0, len * sizeof(IChar));
+ memset(ld->combData[off] + col, 0, len * sizeof(CharData));
}
});
}
@@ -846,7 +846,7 @@ ScrnWriteText(XtermWidget xw,
for_each_combData(off, ld) {
memset(ld->combData[off] + screen->cur_col,
0,
- real_width * sizeof(IChar));
+ real_width * sizeof(CharData));
}
});
if_OPT_ISO_COLORS(screen, {
@@ -902,7 +902,7 @@ ScrnClearLines(XtermWidget xw, ScrnBuf sb, int where, unsigned n, unsigned size)
SetLineDblCS(work, 0);
#endif
- memset(work->charData, 0, size * sizeof(IChar));
+ memset(work->charData, 0, size * sizeof(CharData));
if (TERM_COLOR_FLAGS(xw)) {
memset(work->attribs, (int) flags, size);
#if OPT_ISO_COLORS
@@ -924,7 +924,7 @@ ScrnClearLines(XtermWidget xw, ScrnBuf sb, int where, unsigned n, unsigned size)
size_t off;
for (off = 0; off < work->combSize; ++off) {
- memset(work->combData[off], 0, size * sizeof(IChar));
+ memset(work->combData[off], 0, size * sizeof(CharData));
}
}
#endif
@@ -2233,7 +2233,7 @@ ScrnFillRectangle(XtermWidget xw,
if_OPT_WIDE_CHARS(screen, {
size_t off;
for_each_combData(off, ld) {
- memset(ld->combData[off] + left, 0, size * sizeof(IChar));
+ memset(ld->combData[off] + left, 0, size * sizeof(CharData));
}
})
}
diff --git a/trace.c b/trace.c
index b5a23a1..d01667c 100644
--- a/trace.c
+++ b/trace.c
@@ -1,4 +1,4 @@
-/* $XTermId: trace.c,v 1.109 2009/12/06 15:18:12 tom Exp $ */
+/* $XTermId: trace.c,v 1.110 2009/12/10 09:36:28 tom Exp $ */
/*
*
@@ -577,7 +577,7 @@ TraceTranslations(const char *name, Widget w)
TRACE(("... xlations %#08lx\n", (long) xlations));
TRACE(("... xcelerat %#08lx\n", (long) xcelerat));
result = _XtPrintXlations(w, xlations, xcelerat, True);
- TRACE(("%s\n", result != 0 ? result : "(null)"));
+ TRACE(("%s\n", NonNull(result)));
if (result)
XFree((char *) result);
} else {
diff --git a/version.h b/version.h
index 415ce77..29bad78 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.309 2009/11/16 11:57:05 tom Exp $
+ * $XTermId: version.h,v 1.310 2009/12/09 10:23:39 tom Exp $
* ----------------------------------------------------------------------------
* this file is part of xterm
*
@@ -39,7 +39,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 252
+#define XTERM_PATCH 253
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 9956b1c..4c73e1b 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.876 2009/12/08 00:36:32 tom Exp $
+ $XTermId: xterm.log.html,v 1.882 2009/12/10 10:38:19 tom Exp $
-->
<HTML>
<HEAD>
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_253">Patch #253 - 2009/12/10</A>
<LI><A HREF="#xterm_252">Patch #252 - 2009/12/7</A>
<LI><A HREF="#xterm_251">Patch #251 - 2009/11/11</A>
<LI><A HREF="#xterm_250">Patch #250 - 2009/10/13</A>
@@ -311,6 +312,23 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_253">Patch #253 - 2009/12/10</A></H1>
+<ul>
+ <li>add a null-pointer check in <code>getPrinterFlags()</code>
+ per changes in <a href="#xterm_252">patch #252</a>.
+
+ <li>add a null-pointer check, needed in UTF-8 mode for Xft fonts after
+ changes in <a href="#xterm_252">patch #252</a> (patch by Alan
+ Coopersmith).
+
+ <li>correct size when clearing struct for tek4014 (patch by Jochen
+ Voss).
+
+ <li>parenthesize expression in <code>MoreRows</code> macro, fixing
+ a limit check added in <a href="#xterm_251">patch #251</a>
+ (Debian #560039).
+</ul>
+
<H1><A NAME="xterm_252">Patch #252 - 2009/12/7</A></H1>
<ul>
<li>modify title-querying logic to support retrieval of titles encoded
@@ -375,7 +393,7 @@ is the latest version of this file.
<li>correct <code>checkVeryBoldAttr</code> to omit comparison of
foreground color to special color values used for
- <code>color<XX></code> resources (report by Jan Engelhardt).
+ <code>color<XX></code> resources (report by Jan Engelhardt).
<li>make <code>colorBDMode</code> and <code>colorULMode</code>
resources work with TrueType configuration (report by Jan
commit 4aa568df71c3c9b2b36f9e9a5705ec7b6a7e1338
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 29 11:34:10 2009 +0000
Import xterm 252
diff --git a/256colres.pl b/256colres.pl
index a943af5..cf9673c 100755
--- a/256colres.pl
+++ b/256colres.pl
@@ -1,7 +1,36 @@
#! /usr/bin/perl
-# Author: Thomas E. Dickey
-# $XTermId: 256colres.pl,v 1.15 2007/06/08 23:58:37 tom Exp $
-# $XFree86: xc/programs/xterm/256colres.pl,v 1.8 2002/10/05 17:57:11 dickey Exp $
+# $XTermId: 256colres.pl,v 1.16 2007/06/08 23:58:37 tom Exp $
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 1999-2002,2007 by Thomas E. Dickey
+#
+# All Rights Reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
# Construct a header file defining default resources for the 256-color model
# of xterm. This is modeled after the 256colors2.pl script.
diff --git a/88colres.pl b/88colres.pl
index 3fc4cd8..59ba412 100755
--- a/88colres.pl
+++ b/88colres.pl
@@ -1,7 +1,37 @@
#!/usr/bin/perl
-# Author: Steve Wall
-# $XTermId: 88colres.pl,v 1.16 2007/06/08 23:57:23 tom Exp $
-# $XFree86: xc/programs/xterm/88colres.pl,v 1.7 2005/09/18 23:48:11 dickey Exp $
+# $XTermId: 88colres.pl,v 1.17 2007/06/08 23:57:23 tom Exp $
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 1999-2005,2007 by Thomas E. Dickey
+# Copyright 1999-2000 by Steve Wall
+#
+# All Rights Reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
# Made from 256colres.pl
# Construct a header file defining default resources for the
diff --git a/KOI8RXTerm.ad b/KOI8RXTerm.ad
index aa21f26..296bf51 100644
--- a/KOI8RXTerm.ad
+++ b/KOI8RXTerm.ad
@@ -1,7 +1,37 @@
-! $XTermId: KOI8RXTerm.ad,v 1.2 2007/12/30 15:49:14 tom Exp $
-
+! $XTermId: KOI8RXTerm.ad,v 1.3 2007/12/30 15:49:14 tom Exp $
+! -----------------------------------------------------------------------------
+! this file is part of xterm
+!
+! Copyright 2007 by Thomas E. Dickey
+!
+! All Rights Reserved
+!
+! Permission is hereby granted, free of charge, to any person obtaining a
+! copy of this software and associated documentation files (the
+! "Software"), to deal in the Software without restriction, including
+! without limitation the rights to use, copy, modify, merge, publish,
+! distribute, sublicense, and/or sell copies of the Software, and to
+! permit persons to whom the Software is furnished to do so, subject to
+! the following conditions:
+!
+! The above copyright notice and this permission notice shall be included
+! in all copies or substantial portions of the Software.
+!
+! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+!
+! Except as contained in this notice, the name(s) of the above copyright
+! holders shall not be used in advertising or otherwise to promote the
+! sale, use or other dealings in this Software without prior written
+! authorization.
+! -----------------------------------------------------------------------------
! This is based on the UXTerm app-defaults file.
-
+! -----------------------------------------------------------------------------
! Use
! xterm -class KOI8RXTerm
! to set resources for KOI8-R mode with corresponding fonts.
diff --git a/MANIFEST b/MANIFEST
index 7db856e..1c41e9b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-250, version xterm-250
+MANIFEST for xterm-252, version xterm-252
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -62,7 +62,6 @@ menu.c popup/pulldown menus for 'xterm'
menu.h interface of menu.c
minstall.sh script for installing manpages
misc.c miscellaneous utility functions for 'xterm'
-mkdirs.sh configure script: make directories for install process
os2main.c main program for OS/2 EMX port of 'xterm'
plink.sh script to prune unneeded libraries from link
precompose.c table of precompose sequences
diff --git a/Makefile.in b/Makefile.in
index 9bf2014..72f1a74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,25 +1,35 @@
-## $XTermId: Makefile.in,v 1.161 2009/11/05 23:06:36 tom Exp $
-##
-## Copyright 2002-2008,2009 by Thomas E. Dickey
-##
-## All Rights Reserved
-##
-## Permission to use, copy, modify, and distribute this software and its
-## documentation for any purpose and without fee is hereby granted,
-## provided that the above copyright notice appear in all copies and that
-## both that copyright notice and this permission notice appear in
-## supporting documentation, and that the name of the above listed
-## copyright holder(s) not be used in advertising or publicity pertaining
-## to distribution of the software without specific, written prior
-## permission.
-##
-## THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-## TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-## AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-## LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-## ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-## OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+## $XTermId: Makefile.in,v 1.163 2009/12/05 15:49:56 tom Exp $
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 1997-2008,2009 by Thomas E. Dickey
+#
+# All Rights Reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
SHELL = /bin/sh
@@ -354,7 +364,7 @@ TAGS :
etags $(SRCS) $(HDRS)
$(TERMINFO_DIR) $(INSTALL_DIRS) :
- $(SHELL) ${srcdir}/mkdirs.sh $@
+ mkdir -p $@
ALWAYS :
diff --git a/Tekparse.def b/Tekparse.def
index 9945eed..d4a0b8e 100644
--- a/Tekparse.def
+++ b/Tekparse.def
@@ -1,4 +1,37 @@
-# $XTermId: Tekparse.def,v 1.3 2006/02/12 22:43:56 tom Exp $
+# $XTermId: Tekparse.def,v 1.4 2006/02/12 22:43:56 tom Exp $
+#
+# vile:confmode rs=lf
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 2002,2006 by Thomas E. Dickey
+#
+# All Rights Reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
#
# List of symbols that need to be defined for Tekparse.h. If you need to
# change any of the CASE_ macros, make the change here and rerun the command
diff --git a/Tekproc.c b/Tekproc.c
index cb3f6b2..117982b 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.173 2009/10/12 00:31:59 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.174 2009/11/28 14:20:28 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -457,7 +457,7 @@ Tekparse(TekWidget tw)
TRACE(("case: special return to vt102 mode\n"));
Tparsestate = curstate;
TekRecord->ptr[-1] = ANSI_NAK; /* remove from recording */
- FlushLog(&(term->screen));
+ FlushLog(TScreenOf(term));
return;
case CASE_SPT_STATE:
@@ -1309,7 +1309,7 @@ TekRun(void)
TEK4014_ACTIVE(term) = False;
} else {
TEK4014_ACTIVE(term) = False;
- if (VWindow(&(term->screen)) == 0) {
+ if (VWindow(TScreenOf(term)) == 0) {
Exit(ERROR_TINIT);
}
}
@@ -1356,6 +1356,9 @@ TekInitialize(Widget request GCC_UNUSED,
Cardinal *num_args GCC_UNUSED)
{
Widget tekparent = SHELL_OF(wnew);
+#ifndef NO_ACTIVE_ICON
+ TekScreen *screen = TekScreenOf((TekWidget) wnew);
+#endif
TRACE(("TekInitialize\n"));
@@ -1372,7 +1375,7 @@ TekInitialize(Widget request GCC_UNUSED,
HandleBellPropertyChange, (Opaque) 0);
#ifndef NO_ACTIVE_ICON
- ((TekWidget) wnew)->screen.whichTwin = &((TekWidget) wnew)->screen.fullTwin;
+ screen->whichTwin = &(screen->fullTwin);
#endif /* NO_ACTIVE_ICON */
}
diff --git a/UXTerm.ad b/UXTerm.ad
index a8840d7..74597ae 100644
--- a/UXTerm.ad
+++ b/UXTerm.ad
@@ -1,6 +1,35 @@
-! $XTermId: UXTerm.ad,v 1.11 2006/02/13 01:14:58 tom Exp $
-! $XFree86: xc/programs/xterm/UXTerm.ad,v 1.5 2006/02/13 01:14:58 dickey Exp $
-
+! $XTermId: UXTerm.ad,v 1.12 2006/02/13 01:14:58 tom Exp $
+! -----------------------------------------------------------------------------
+! this file is part of xterm
+!
+! Copyright 2000-2005,2006 by Thomas E. Dickey
+!
+! All Rights Reserved
+!
+! Permission is hereby granted, free of charge, to any person obtaining a
+! copy of this software and associated documentation files (the
+! "Software"), to deal in the Software without restriction, including
+! without limitation the rights to use, copy, modify, merge, publish,
+! distribute, sublicense, and/or sell copies of the Software, and to
+! permit persons to whom the Software is furnished to do so, subject to
+! the following conditions:
+!
+! The above copyright notice and this permission notice shall be included
+! in all copies or substantial portions of the Software.
+!
+! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+! IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+! CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+! TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+! SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+!
+! Except as contained in this notice, the name(s) of the above copyright
+! holders shall not be used in advertising or otherwise to promote the
+! sale, use or other dealings in this Software without prior written
+! authorization.
+! -----------------------------------------------------------------------------
! Use
! xterm -class UXTerm
! to set resources for UTF-8 mode with corresponding fonts.
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index 370ae0e..cea6296 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,8 +1,8 @@
-/* $XTermId: VTPrsTbl.c,v 1.50 2008/05/26 22:38:23 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.54 2009/12/06 16:34:05 tom Exp $ */
/*
*
- * Copyright 1999-2006,2008 by Thomas E. Dickey
+ * Copyright 1999-2008,2009 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -55,6 +55,11 @@
#include <VTparse.h>
+#if !OPT_BLINK_CURS
+#undef CASE_CSI_SPACE_STATE
+#define CASE_CSI_SPACE_STATE CASE_CSI_IGNORE
+#endif
+
#if !OPT_DEC_LOCATOR
#undef CASE_CSI_TICK_STATE
#define CASE_CSI_TICK_STATE CASE_CSI_IGNORE
@@ -444,7 +449,7 @@ CASE_IGNORE,
CASE_IGNORE,
CASE_IGNORE,
/* SP ! " # */
-CASE_CSI_IGNORE,
+CASE_CSI_SPACE_STATE,
CASE_CSI_EX_STATE,
CASE_CSI_QUOTE_STATE,
CASE_CSI_IGNORE,
@@ -604,7 +609,7 @@ CASE_OSC,
CASE_PM,
CASE_APC,
/* nobreakspace exclamdown cent sterling */
-CASE_CSI_IGNORE,
+CASE_CSI_SPACE_STATE,
CASE_CSI_EX_STATE,
CASE_CSI_QUOTE_STATE,
CASE_CSI_IGNORE,
@@ -768,7 +773,7 @@ CASE_IGNORE,
CASE_IGNORE,
CASE_IGNORE,
/* SP ! " # */
-CASE_CSI_IGNORE,
+CASE_CSI_SPACE_STATE,
CASE_CSI_EX_STATE,
CASE_CSI_QUOTE_STATE,
CASE_CSI_IGNORE,
@@ -928,7 +933,7 @@ CASE_OSC,
CASE_PM,
CASE_APC,
/* nobreakspace exclamdown cent sterling */
-CASE_CSI_IGNORE,
+CASE_CSI_SPACE_STATE,
CASE_CSI_EX_STATE,
CASE_CSI_QUOTE_STATE,
CASE_CSI_IGNORE,
@@ -1697,6 +1702,332 @@ CASE_GROUND_STATE,
CASE_IGNORE,
};
+#if OPT_BLINK_CURS
+Const PARSE_T csi_sp_table[] = /* CSI ... SP */
+{
+/* NUL SOH STX ETX */
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+/* EOT ENQ ACK BEL */
+CASE_IGNORE,
+CASE_ENQ,
+CASE_IGNORE,
+CASE_BELL,
+/* BS HT NL VT */
+CASE_BS,
+CASE_TAB,
+CASE_VMOT,
+CASE_VMOT,
+/* NP CR SO SI */
+CASE_VMOT,
+CASE_CR,
+CASE_SO,
+CASE_SI,
+/* DLE DC1 DC2 DC3 */
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+/* DC4 NAK SYN ETB */
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+/* CAN EM SUB ESC */
+CASE_GROUND_STATE,
+CASE_IGNORE,
+CASE_GROUND_STATE,
+CASE_ESC,
+/* FS GS RS US */
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+CASE_IGNORE,
+/* SP ! " # */
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+/* $ % & ' */
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+/* ( ) * + */
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
+CASE_CSI_IGNORE,
Reply to: