xterm: Changes to 'debian-experimental'
INSTALL | 23
Imakefile | 32
MANIFEST | 5
Makefile.in | 111
aclocal.m4 | 168 +
button.c | 131 -
charproc.c | 71
configure | 3769 ++++++++++++++++++---------------
configure.in | 21
ctlseqs.ms | 135 -
ctlseqs.txt | 366 +--
debian/changelog | 9
debian/local/xterm.faq.html | 333 ++
debian/patches/100_manpage_whatis.diff | 13
debian/patches/series | 1
debian/rules | 1
fontutils.c | 43
input.c | 38
koi8rxterm.man | 37
linedata.c | 6
main.c | 173 -
menu.c | 7
minstall.in | 28
misc.c | 309 +-
os2main.c | 2230 -------------------
package/debian/changelog | 19
package/debian/rules | 1
package/freebsd/Makefile | 2
package/xterm.spec | 5
precompose.c | 7
print.c | 21
proto.h | 62
ptydata.c | 12
ptyx.h | 21
resize.c | 281 +-
resize.man | 167 +
screen.c | 27
scrollbar.c | 6
trace.c | 28
trace.h | 14
util.c | 31
uxterm.man | 35
version.c | 74
version.h | 18
wcwidth.c | 148 -
xstrings.c | 117 -
xstrings.h | 3
xterm.h | 38
xterm.log.html | 159 +
xterm.man | 6
xterm_io.h | 88
xtermcfg.hin | 5
52 files changed, 4275 insertions(+), 5180 deletions(-)
New commits:
commit d5e0fd2c41ec6be8ae192937a5588770b249e5eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 16:09:17 2013 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 92a4e35..760855f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (290-1) UNRELEASED; urgency=low
+xterm (290-1) experimental; urgency=low
* New upstream release
* Drop 100_manpage_whatis.diff, no longer necessary.
* Drop explicit --with-desktop-category, no longer necessary.
* Update copy of XTerm FAQ to revision 1.221 (dated 2013/01/26).
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 16:06:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 16:09:09 +0100
xterm (287-1) experimental; urgency=low
commit b20b88d1b35a8885958358d612de85d78ead2cf6
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 16:08:26 2013 +0100
Update copy of XTerm FAQ to revision 1.221 (dated 2013/01/26).
diff --git a/debian/changelog b/debian/changelog
index efc5b3c..92a4e35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (290-1) UNRELEASED; urgency=low
* New upstream release
* Drop 100_manpage_whatis.diff, no longer necessary.
* Drop explicit --with-desktop-category, no longer necessary.
+ * Update copy of XTerm FAQ to revision 1.221 (dated 2013/01/26).
-- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 16:06:02 +0100
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index a66ef2c..3f99d17 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
*****************************************************************************
- * Copyright 1997-2011,2012 by Thomas E. Dickey *
+ * Copyright 1997-2012,2013 by Thomas E. Dickey *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -20,7 +20,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
*****************************************************************************
- $XTermId: xterm.faq.html,v 1.199 2012/11/11 14:46:46 tom Exp $
+ $XTermId: xterm.faq.html,v 1.221 2013/01/26 15:21:27 tom Exp $
-->
<html>
@@ -41,7 +41,7 @@
<a href=
"http://invisible-island.net/";>http://invisible-island.net/</a><a href="http://invisible-island.net/xterm/";>xterm/</a><br>
- Copyright © 1997-2011,2012 by Thomas E. Dickey
+ Copyright © 1997-2012,2013 by Thomas E. Dickey
<hr>
<a href=
"http://invisible-island.net/xterm/xterm.faq.html";>Here</a> is
@@ -131,14 +131,22 @@
the specific program as well as other programs that imitate
it.</p>
+ <p>As a stylistic convention, the capitalized form is
+ "<em>XTerm</em>", which corresponds to the X resource class name.
+ Similarly, <em>uxterm</em> becomes "<em>UXTerm</em>".</p>
+
<h2 id="who_did_it-id"><a name="who_did_it" id="who_did_it">Who
wrote <strong>XTerm</strong>?</a></h2>
<p>I've been working on xterm since early 1996 (see my <a href=
- "xterm.log.html">changelog</a> for details).</p>
+ "http://invisible-island.net/xterm/xterm.log.html";>changelog</a>
+ for details).</p>
<p>But the program is much older than that.</p>
+ <h3 id="pre_history-id"><a name="prehistory" id="prehistory">A
+ Prehistory Perspective</a></h3>
+
<p>A lot of people, cited at the bottom of the manual page wrote
the original xterm program, maintained by the X Consortium (later
part of the Open Group – I'm well aware of the distinction,
@@ -224,6 +232,92 @@
still at the Smithsonian Astrophysical Observatory.</p>
</blockquote>
+ <h3 id="my_history-id"><a name="my_history" id="my_history">My
+ Involvement</a></h3>
+
+ <p>My involvement with <strong>xterm</strong> through XFree86
+ began at the <a href="xterm.html#history">end of 1995</a>. This
+ website has been "here" since 2001/6/5, replacing my ClarkNet
+ page. I started the ClarkNet page 1996/12/31, as a followup to
+ the <a href=
+ "http://invisible-island.net/ncurses/ncurses-license.html#patch_961224";>
+ release of ncurses 4.0</a>) which featured xterm as one of the 16
+ programs I was involved with. From the outset, the page provided
+ a link to a snapshot of the current source. Copies of patches
+ which I sent to XFree86 were available on the ftp area.</p>
+
+ <p>XFree86 had its sources in CVS, but (like others in that era),
+ were not directly visible to random developers. That came later.
+ I started by downloading the sources (30Mb of compressed
+ tar-files on a 56Kb phone connection took about 6 hours) and
+ updating them with patches from the XFree86 mailing list.</p>
+
+ <p>Like the other programs that I worked on with others (<a href=
+ "http://invisible-island.net/vile/vile.html";>vile</a>, <a href=
+ "http://invisible-island.net/tin/tin.html";>tin</a>, <a href=
+ "http://invisible-island.net/lynx/lynx.html";>lynx</a>), I set up
+ an RCS archive to track my changes locally before sending patches
+ to the development list. As the XFree86 developers issued new
+ patches, I would re-synchronize my archive. Later, XFree86
+ provided CVS (initially readonly). I was granted commit
+ privileges on this <a href=
+ "http://invisible-island.net/ansification/ansify-xfs-cve.html#xfree86_work";>
+ in November 2000</a>.</p>
+
+ <p>Throughout this period, my work on <strong>xterm</strong> was
+ released as part of XFree86. It was rare for a separate package
+ to be provided. That was due to the potential conflict between
+ the install procedures. Users of the downloads from my web/ftp
+ site were predominantly individual developers.</p>
+
+ <p>There were exceptions. Christian Weisgerber proposed a package
+ for FreeBSD ports later in 1999 (<a href=
+ "http://www.mavetju.org/mail/view_message.php?list=freebsd-ports&id=578273";>ports/15545:
+ new port: x11/xterm</a>, followup in <a href=
+ "http://marc.info/?t=102422536300028&r=l&=2";>March
+ 2000</a>). However, that was an exception. None of the Linux
+ distributions provided a separate package before 2003 (when Mike
+ Harris created a package of <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_177";>patch
+ #177</a> for Red Hat). Again that is more of an exception than a
+ rule:</p>
+
+ <ul>
+ <li>SuSE's package began October 23, 2004 with <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_196";>patch
+ #196</a>.</li>
+
+ <li>Mandriva's package began October 22, 2005 with <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_205";>patch
+ #205</a>.</li>
+
+ <li>The Debian package for xterm began in January 6, 2006 with
+ <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_204";>patch
+ #204</a>.</li>
+ </ul>
+
+ <p>Given that context (sources distributed via XFree86 CVS,
+ releases via XFree86), the statement made by an Xorg hacker
+ <a href=
+ "http://lists.freedesktop.org/archives/xorg/2005-January/005847.html";>
+ early in 2005</a> asserting that "It has not been maintained by
+ anyone within the XFree86 or X.org trees for many years" was at
+ best misleading.</p>
+
+ <p>After the "<a href="#xterm-xorg">fork</a>" (sic) of Xorg
+ in 2004, I continued to commit changes for xterm in <a href=
+ "http://cvsweb.xfree86.org/cvsweb/xc/programs/xterm/";>XFree86
+ CVS</a> until <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_216";>patch
+ #216</a> in mid-2006. I stopped at that point because it was not
+ possible to incorporate changes into xterm which were not sent to
+ me first. I still send patch announcements to both the XFree86
+ and Xorg mailing lists, of course.</p>
+
+ <h3 id="forward_history-id"><a name="forward_history" id=
+ "forward_history">Focus of this FAQ</a></h3>
+
<p>This FAQ is oriented toward the version of xterm originally
distributed with XFree86 (more commonly known as modern, or "new
xterm", with a corresponding terminal description "xterm-new"),
@@ -286,7 +380,8 @@
implement in shell scripts than <code>ESC \</code>.</li>
</ul>
- <p>I revised that area <a href="xterm.log.html#xterm_24">starting
+ <p>I revised that area <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_24";>starting
in 1996</a>,</p>
<ul>
@@ -405,6 +500,8 @@
<li><a href="#bug_rxvt">rxvt</a></li>
+ <li><a href="#bug_st">st</a></li>
+
<li><a href="#bug_xfce_term">xfce-term</a></li>
<li><a href="#bug_xgterm">xgterm</a></li>
@@ -2119,15 +2216,17 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
</blockquote>
<p>Here's another source of information: <a href=
- "http://web.archive.org/web/*/http%3A//cns.georgetown.edu/~ric/howto/Xterm-Title/";>
- Xterm-Title HowTo</a></p>
+ "http://tldp.org/HOWTO/Xterm-Title.html";>Xterm-Title
+ HowTo</a></p>
<h3 id="how2_blink-id"><a name="how2_blink" id="how2_blink">How
do I make the cursor blink?</a></h3>
<p>Standard xterm does not implement a blinking cursor. Some of
the variations do: dtterm, GNOME Terminal, and modern xterm (from
- mid 1999, <a href="xterm.log.html#xterm_107">patch 107</a>).</p>
+ mid 1999, <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_107";>patch
+ 107</a>).</p>
<h2 id="frequent_problems-id"><a name="frequent_problems" id=
"frequent_problems">Frequent problems</a></h2>
@@ -2212,7 +2311,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
</li>
<li>
- <a href="problems_colors">Colors and other graphic
+ <a href="#problems_colors">Colors and other graphic
rendition</a>
<ul>
@@ -2514,10 +2613,12 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
the font.</p>
<p>Modern xterm can form its own line-drawing characters (see
- <a href="xterm.log.html#xterm_90">patch 90</a>, for example). It
- does not draw all of the graphic characters, only those that may
- be done with straight lines. But those are the most used, making
- most of the fixed-pitch fonts useful for xterm.</p>
+ <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_90";>patch
+ 90</a>, for example). It does not draw all of the graphic
+ characters, only those that may be done with straight lines. But
+ those are the most used, making most of the fixed-pitch fonts
+ useful for xterm.</p>
<p>You may also have a problem with the terminfo description. As
distributed, the X11R6 terminfo for xterm does not have the
@@ -2577,10 +2678,11 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
erasing a bold character from the screen, xterm does not erase
the extra pixel. This is corrected in modern xterm, subject to
the available fonts (from late 1998, <a href=
- "xterm.log.html#xterm_85">patch 85</a>). For each font, it asks
- the font server for a corresponding bold font. Your font server
- may not have the bold font (or it may incorrectly report that it
- does). But it usually works.</p>
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_85";>patch
+ 85</a>). For each font, it asks the font server for a
+ corresponding bold font. Your font server may not have the bold
+ font (or it may incorrectly report that it does). But it usually
+ works.</p>
<h4 id="no_russian-id"><a name="no_russian" id="no_russian">My
terminal doesn't display Cyrillic characters</a></h4>
@@ -2589,9 +2691,10 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
128-159. For a VT220 (or any terminal that follows ISO 6429),
those are treated as control characters. Still, some people want
to use KOI8-R, etc. I modified xterm in <a href=
- "xterm.log.html#xterm_175">patch 175</a> to add an option
- (<code>-k8</code>) and corresponding resource settings to allow
- them to customize their environment. Here is a <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_175";>patch
+ 175</a> to add an option (<code>-k8</code>) and corresponding
+ resource settings to allow them to customize their environment.
+ Here is a <a href=
"ftp://invisible-island.net/xterm/koi8-term";>sample script</a>
and <a href="ftp://invisible-island.net/xterm/KOI8Term";>resource
file</a> which I use for testing this configuration.</p>
@@ -2756,7 +2859,8 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
(and an escape sequence from VT320) that changes this key between
the two styles (backspace or delete).</p>
- <p>With modern xterm <a href="xterm.log.html#xterm_95">patch
+ <p>With modern xterm <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_95";>patch
95</a> (also in the stable version as "88c"), you may have an
xterm which can automatically initialize the backarrow key to
backspace or delete depending on the pseudo terminal's sense, or
@@ -2805,10 +2909,12 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
character. So low-level applications which check stty will not
work. I found that unsetting $TERMCAP before running would work,
but this was not a good solution. Someone pointed out (see
- <a href="xterm.log.html#xterm_129">patch 129</a>), that the
- problem really was because termcap <code>kD</code> should delete
- the character at the current position. So it cannot be the same
- as <code>stty erase</code>.</p>
+ <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_129";>patch
+ 129</a>), that the problem really was because termcap
+ <code>kD</code> should delete the character at the current
+ position. So it cannot be the same as <code>stty
+ erase</code>.</p>
<p>As a matter of fact, <code>stty erase</code> has to be a
single character, so <escape>[3~ would not work anyway.</p>
@@ -3102,7 +3208,8 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
easy reconfiguration to make a VT220 emulator), I added
popup-menu items to switch between the modes. With minor
refinements, this was the approach for about two years,
- culminating with the <a href="xterm.log.html#xterm_88">"stable"
+ culminating with the <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_88";>"stable"
patch #88</a>, which is essentially the version distributed with
XFree86 3.3.x.</p>
@@ -3320,8 +3427,8 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<a href="../ncurses/ncurses.faq.html#bash_meta_mode">Alt-keys do
not work in bash</a>.
- <h3 id="problems_colors-id"><a href="problems_colors">Colors and
- other graphic rendition</a></h3>
+ <h3 id="problems_colors-id"><a name="problems_colors" id=
+ "problems_colors">Colors and other graphic rendition</a></h3>
<h4 id="no_color-id"><a name="no_color" id="no_color">My terminal
doesn't recognize color</a></h4>
@@ -3435,7 +3542,8 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
"vim_16colors">My colors changed in vim</a></h4>
<p>Some <code>vim</code> users may notice their colors change
- after updating to <a href="xterm.log.html#xterm_238">patch
+ after updating to <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_238";>patch
238</a>. Before, some text would display in a dark color using a
bold font. Now, it displays in a bright color and normal
font.</p>
@@ -3448,10 +3556,11 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
termcap does not match.</p>
<p>Vim also asks how many colors the terminal supports. Since
- <a href="xterm.log.html#xterm_148">patch 148</a>, xterm has
- responded with the number of distinct colors that it can display.
- By default, that is 16 (8 ANSI colors with bright counterparts
- for displaying PC-style "bold" text).</p>
+ <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_148";>patch
+ 148</a>, xterm has responded with the number of distinct colors
+ that it can display. By default, that is 16 (8 ANSI colors with
+ bright counterparts for displaying PC-style "bold" text).</p>
<p>The interpretation of this depends on the application:
termcaps do not tell how to display more than 8 colors. But vim
@@ -3914,12 +4023,13 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<p>The 1049 code is a refinement of 1047 and 1048, clearing the
alternate screen before switching to it rather than after
switching back to the normal screen. Since <a href=
- "xterm.log.html#xterm_90">patch #90 in 1998</a> xterm allows you
- (with a popup menu entry designed to exploit this behavior) to
- switch the display back to the alternate screen to select text
- from it, to paste into the normal screen. You can also set or
- clear the <code>titeInhibit</code> resource using another popup
- menu entry (<code>Enable Alternate Screen Switching</code>).</p>
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_90";>patch
+ #90 in 1998</a> xterm allows you (with a popup menu entry
+ designed to exploit this behavior) to switch the display back to
+ the alternate screen to select text from it, to paste into the
+ normal screen. You can also set or clear the
+ <code>titeInhibit</code> resource using another popup menu entry
+ (<code>Enable Alternate Screen Switching</code>).</p>
<p>Most other terminal emulators implement only half of the
feature. They recognize the control sequence, but do not provide
@@ -3950,10 +4060,10 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
save the cursor position again, so the position which is restored
when finally exiting your program is the last one saved, not the
first. Modern xterm (from late 1998, <a href=
- "xterm.log.html#xterm_90">patch 90</a>) changes the behavior of
- the cursor save/restore operations so they apply only to the
- current screen. That makes it less likely to misplace your
- cursor.</p>
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_90";>patch
+ 90</a>) changes the behavior of the cursor save/restore
+ operations so they apply only to the current screen. That makes
+ it less likely to misplace your cursor.</p>
<h4 id="narrowproto-id"><a name="narrowproto" id=
"narrowproto">Why doesn't the scrollbar work?</a></h4>
@@ -4035,7 +4145,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<ul>
<li><a href=
- "https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/199285";>Ubuntu
+ "https://bugs.launchpad.net/ubuntu/+source/xterm/+bug/199285";>Ubuntu
#199285 - xterm crashes when compiz is on</a></li>
<li><a href=
@@ -4043,8 +4153,8 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
#467399 - compiz fails to take control of windows</a></li>
<li><a href=
- "https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/378668";>Ubuntu
- #378668 - Cursor in terminal behaves badly with special
+ "https://bugs.launchpad.net/ubuntu/+source/xfce4-terminal/+bug/378668";>
+ Ubuntu #378668 - Cursor in terminal behaves badly with special
characters present</a></li>
<li><a href=
@@ -4074,7 +4184,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
#701160 - /usr/bin/xterm is not functional in natty</a></li>
<li><a href=
- "https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/700477";>Ubuntu
+ "https://bugs.launchpad.net/ubuntu/+source/xterm/+bug/700477";>Ubuntu
#700477 - Font corruption in xterm under Lucid</a></li>
<li><a href=
@@ -4087,12 +4197,12 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
#711894 - iconic option does not work with compiz</a></li>
<li><a href=
- "https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/778439";>Ubuntu
+ "https://bugs.launchpad.net/ubuntu/+source/xterm/+bug/778439";>Ubuntu
#778439 - Typing "exit" in xterm kills X session</a></li>
<li><a href=
- "https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/831336";>Ubuntu
- #831336 - running 'xterm' crashes X server</a></li>
+ "https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/831336";>
+ Ubuntu #831336 - running 'xterm' crashes X server</a></li>
<li><a href=
"https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/841103";>Ubuntu
@@ -4361,14 +4471,15 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
unreadable.</p>
<p>This problem is alleviated with <a href=
- "xterm.log.html#xterm_129">patch 129</a>, which modified
- xterm to delay the most color allocation until the colors are
- first needed. If a color is never needed (xterm allocates 20
- colors in this manner), that reduces the number of slots in
- the color map that are needed. Even with this improvement,
- xterm must still allocate 4 colors during initialization to
- determine how to display the cursor. If none of those colors
- can be allocated, xterm reverts to monochrome.</p>
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_129";>patch
+ 129</a>, which modified xterm to delay the most color
+ allocation until the colors are first needed. If a color is
+ never needed (xterm allocates 20 colors in this manner), that
+ reduces the number of slots in the color map that are needed.
+ Even with this improvement, xterm must still allocate 4
+ colors during initialization to determine how to display the
+ cursor. If none of those colors can be allocated, xterm
+ reverts to monochrome.</p>
</dd>
</dl>
@@ -4425,7 +4536,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
use events.</li>
</ul>(These bugs are also present in the X11R5 version).
- <p>Update 2004/04/08:<br>
+ <p id="xterm-xorg">Update 2004/04/08:<br>
Complicating this discussion is the "X.Org" xterm (from 2004).
That is the XFree86 xterm from XFree86 CVS with all visible
"xfree86" strings changed to "X.Org" or "xorg", depending on the
@@ -4441,7 +4552,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="bug_color_xterm-id"><a name="bug_color_xterm" id=
"bug_color_xterm">COLOR_XTERM</a> <a href=
- "ftp://www.x.org/contrib/applications/color_xterm-beta1.tar.gz";>download</a></h3>
+ "ftp://ftp.x.org/contrib/applications/color_xterm-beta1.tar.gz";>download</a></h3>
<p>This is based on the X Consortium X11R5 source, with the same
bugs.</p>
@@ -4461,7 +4572,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="bug_ansi_xterm-id"><a name="bug_ansi_xterm" id=
"bug_ansi_xterm">ANSI_XTERM</a> <a href=
- "ftp://www.x.org/contrib/applications/xterm-R6-sb_right-ansi-3d.tar.gz";>
+ "ftp://ftp.x.org/contrib/applications/xterm-R6-sb_right-ansi-3d.tar.gz";>
download</a></h3>
<p>This is based on the X Consortium source, with the same
@@ -4503,7 +4614,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="bug_emu-id"><a name="bug_emu" id="bug_emu">EMU 1.3</a>
<a href=
- "ftp://www.x.org/contrib/applications/emu-1.31.tar.gz";>download</a></h3>
+ "ftp://ftp.x.org/contrib/applications/emu-1.31.tar.gz";>download</a></h3>
<p>This is not based on the X Consortium source. The authors
state that it implements VT220 emulation. It is in need of
@@ -4764,7 +4875,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="bug_hanterm-id"><a name="bug_hanterm" id=
"bug_hanterm">HANTERM</a> <a href=
- "http://www.bg.debian.org/Packages/frozen/x11/hanterm.html";>download</a></h3>
+ "http://www.debian.org/Packages/frozen/x11/hanterm.html";>download</a></h3>
<p>HanTerm stands for "Hangul term" (Korean). This is based on
the XFree86 source.</p>
@@ -4839,7 +4950,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="bug_kterm-id"><a name="bug_kterm" id=
"bug_kterm">KTERM</a> <a href=
- "ftp://www.x.org/contrib/applications/kterm-6.2.0.tar.gz";>download</a></h3>
+ "ftp://ftp.x.org/contrib/applications/kterm-6.2.0.tar.gz";>download</a></h3>
<p>KTerm stands for "Kanji term" (Japanese). This is based on the
X Consortium source, with the same bugs (though the list of
@@ -5320,6 +5431,23 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
rather than a bitmap font. xterm uses the <code>faceName</code>
resource for these values.</p>
+ <h3 id="bug_st">st <a href="http://st.suckless.org";>link</a></h3>
+
+ <p>Rxvt revisited, this program depends only on the X11 library.
+ As of January 2013, it is in heavy development, and (according to
+ comments on its developer's list) growing steadily as the
+ developers implement useful features adapted from xterm.</p>
+
+ <p>For instance, the size counting libraries for st 0.3 on my
+ Debian testing machine is on a par with rxvt (and half that of
+ xterm, which uses the X Toolkit library).</p>
+
+ <p>By the way, the page quotes the README file from xterm's
+ sources, omitting my editorial comment at the top noting that the
+ paraphrase of the opening from Dante's <em>Inferno</em> dated
+ from 1991, and pointing to this FAQ to provide better
+ context.</p>
+
<h3 id="bug_xgterm-id"><a name="bug_xgterm" id=
"bug_xgterm">XGTERM</a> <a href=
"ftp://iraf.noao.edu/iraf/x11iraf/";>link</a></h3>
@@ -5477,7 +5605,28 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<p>There appears to be no comprehensive source of information on
xterm better than the documentation which comes with the source
- code <a href="xterm.log.html">change log</a>).</p>
+ code</p>
+
+ <ul>
+ <li><a href=
+ "http://invisible-island.net/xterm/xterm.log.html";>XTermchange
+ log</a></li>
+
+ <li><a href="#xterm_man">The XTerm Manual</a></li>
+
+ <li><a href="#ctlseqs_ms">XTerm Control Sequences</a></li>
+
+ <li><a href="#resize_man">resize</a> – set TERMCAP and
+ terminal settings to current xterm window size</li>
+
+ <li><a href="#uxterm_man">uxterm</a> – a UTF-8 wrapper
+ for XTerm</li>
+
+ <li><a href="#luit_prog">luit</a> – Locale and ISO 2022
+ support for Unicode terminals</li>
+
+ <li><a href="#other_sites">Other Sites</a></li>
+ </ul>
<h3 id="other_sites-id"><a name="other_sites" id=
"other_sites">Other Sites</a></h3>
@@ -5486,7 +5635,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<li>I have found Richard Shuford's archive to be invaluable for
notes on the DEC VT220 and related terminals. This was a
<a href=
- "http://www.cs.utk.edu/~shuford/terminal_index.html";>webpage</a>
+ "http://web.eecs.utk.edu/~shuford/terminal_index.html";>webpage</a>
but was last seen via <a href=
"ftp://cs.utk.edu/pub/shuford/";>ftp</a>. (I have a snapshot
from the ftp site).</li>
@@ -5539,22 +5688,56 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2)
<h3 id="resize_man-id"><a name="resize_man" id=
"resize_man">resize – set TERMCAP and terminal settings to
- current xterm window size</a></h3><em>resize</em> is useful by
- itself, but is maintained for historical reasons as part of
- xterm. <a href=
+ current xterm window size</a></h3>
+
+ <p><em>resize</em> is useful by itself, but is maintained for
+ historical reasons as part of xterm. <a href=
"http://invisible-island.net/xterm/manpage/resize.html";>html</a>,
<a href=
"http://invisible-island.net/xterm/manpage/resize.pdf";>pdf</a>
and <a href=
- "http://invisible-island.net/xterm/manpage/resize.txt";>text</a>.
+ "http://invisible-island.net/xterm/manpage/resize.txt";>text</a>.</p>
+
+ <h3 id="uxterm_man-id"><a name="uxterm_man" id=
+ "uxterm_man">uxterm – a UTF-8 wrapper for xterm</a></h3>
+
+ <p>XTerm does not automatically <em>set</em> your locale. It can
+ be told to <em>use</em> your locale settings. This is a shell
+ script which sets xterm's resources to use UTF-8 encoding, and
+ use UTF-8 fonts. There is a similar <em>lxterm</em> script, but
+ it relies upon non-portable applications, unlike uxterm.</p>
+
+ <p>Here are copies of uxterm's documentation: <a href=
+ "http://invisible-island.net/xterm/manpage/uxterm.html";>html</a>,
+ <a href=
+ "http://invisible-island.net/xterm/manpage/uxterm.pdf";>pdf</a>
+ and <a href=
+ "http://invisible-island.net/xterm/manpage/uxterm.txt";>text</a>.</p>
+
+ <p>Incidentally, there was a different program named "uxterm"
+ before the shell script was added to xterm in <a href=
+ "http://invisible-island.net/xterm/xterm.log.html#xterm_137";>mid-2000</a>.
+ <a href="http://czyborra.com/unicode/terminals.html";>Roman
+ Czyborra commented</a> in 1998 that it was based on the original
+ X11 xterm source (very likely, since "strings" run on the
+ executable shows the xterm actions, resources and even the
+ Tek4014 support). There are few references to it to provide
+ details: the first appearance was in <a href=
+ "http://www.unicode.org/mail-arch/unicode-ml/Archives-Old/UML001/0042.html";>
+ 1994</a>, and the last was Czyborra's page in 1998. For the
+ curious, there is a copy on <a href=
+ "http://www.ibiblio.org/pub/packages/ccic/software/x-win/uxterm/uxterm.README";>
+ ibiblio.org</a> (no Linux executables, no source, however).</p>
<h3 id="luit_prog-id"><a name="luit_prog" id="luit_prog">luit
– Locale and ISO 2022 support for Unicode
- terminals</a></h3><a href="../luit/luit.html">luit</a> also is
- maintained as part of xterm, since its upstream maintainer is
- inactive, and the ostensible maintainers have more than once
- delivered unusable versions, causing many bug reports to be
- issued against xterm.
+ terminals</a></h3>
+
+ <p><a href="../luit/luit.html">luit</a> also is maintained as
+ part of xterm, since its upstream maintainer is inactive, and the
+ ostensible maintainers have more than once delivered unusable
+ versions, causing many bug reports to be issued against
+ xterm.</p>
<h2 id="future_work-id"><a name="future_work" id=
"future_work">Ongoing/future work</a></h2>
commit 274dad80da8e7e92d124b7342d654c204b3b5ea4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 16:06:17 2013 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 2ac9298..efc5b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (288-1) UNRELEASED; urgency=low
+xterm (290-1) UNRELEASED; urgency=low
* New upstream release
* Drop 100_manpage_whatis.diff, no longer necessary.
* Drop explicit --with-desktop-category, no longer necessary.
- -- Julien Cristau <jcristau@debian.org> Sat, 12 Jan 2013 22:46:35 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2013 16:06:02 +0100
xterm (287-1) experimental; urgency=low
commit 71aad68bd8b0dcd1296628aa7eaa8c3309b0dddf
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 15:53:58 2013 +0100
Imported Upstream version 290
diff --git a/MANIFEST b/MANIFEST
index 081a37c..4491fae 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-289, version xterm-289
+MANIFEST for xterm-290, version xterm-290
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/package/debian/changelog b/package/debian/changelog
index d651847..ce2a233 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (290) unstable; urgency=low
+
+ * Fix incomplete revert of #282 change.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 12 Feb 2013 19:48:21 -0500
+
xterm-dev (289) unstable; urgency=low
* Miscellaneous fixes.
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 81a1711..a09398b 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 289
+PORTVERSION= 290
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 174716b..8a845c0 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,7 +1,7 @@
-# $XTermId: xterm.spec,v 1.43 2013/02/03 18:59:49 tom Exp $
+# $XTermId: xterm.spec,v 1.44 2013/02/13 00:46:35 tom Exp $
Summary: X terminal emulator (development version)
Name: xterm-dev
-Version: 289
+Version: 290
Release: 1
License: X11
Group: User Interface/X
diff --git a/ptyx.h b/ptyx.h
index d904b39..55cd8dd 100644
--- a/ptyx.h
+++ b/ptyx.h
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.761 2013/02/04 01:35:47 Peder.Stray Exp $ */
+/* $XTermId: ptyx.h,v 1.762 2013/02/13 00:42:21 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1897,7 +1897,6 @@ typedef struct {
* Working variables for getLineData().
*/
size_t lineExtra; /* extra space for combining chars */
- Dimension widestLine; /* length of longest LineData */
/*
* Pointer to the current visible buffer.
*/
diff --git a/screen.c b/screen.c
index 1f6b27b..d3d7822 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.474 2013/02/03 23:19:45 tom Exp $ */
+/* $XTermId: screen.c,v 1.475 2013/02/13 00:42:30 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -447,10 +447,6 @@ Reallocate(XtermWidget xw,
return 0;
}
- if (screen->widestLine < ncol)
- screen->widestLine = (Dimension) ncol;
- ncol = screen->widestLine;
-
oldBufData = *sbufaddr;
TRACE(("Reallocate %dx%d -> %dx%d\n", oldrow, MaxCols(screen), nrow, ncol));
@@ -550,10 +546,6 @@ ReallocateBufOffsets(XtermWidget xw,
assert(nrow != 0);
assert(ncol != 0);
- if (screen->widestLine < ncol)
- screen->widestLine = (Dimension) ncol;
- ncol = screen->widestLine;
-
oldBufData = *sbufaddr;
oldBufHead = *sbuf;
diff --git a/version.h b/version.h
index 3fd95c8..bf717b6 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.358 2013/02/08 09:17:27 tom Exp $ */
+/* $XTermId: version.h,v 1.359 2013/02/13 00:44:06 tom Exp $ */
/*
* Copyright 1998-2012,2013 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* 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 289
-#define XTERM_DATE 2013-02-08
+#define XTERM_PATCH 290
+#define XTERM_DATE 2013-02-12
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index f65916f..46b3387 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.1315 2013/02/08 09:16:13 tom Exp $
+ $XTermId: xterm.log.html,v 1.1317 2013/02/13 01:58:03 tom Exp $
-->
<html>
@@ -70,6 +70,8 @@
the latest version of this file.</p>
<ul>
+ <li><a href="#xterm_290">Patch #290 - 2013/02/12</a></li>
+
<li><a href="#xterm_289">Patch #289 - 2013/02/08</a></li>
<li><a href="#xterm_288">Patch #288 - 2013/01/09</a></li>
@@ -861,11 +863,21 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_290" id="xterm_290">Patch #290 -
+ 2013/02/12</a></h1>
+
+ <ul>
+ <li>revert of <a href="#xterm_282">patch #282</a> change was
+ incomplete (report by Jim Reisert).</li>
+
+ <li>fix typo in manpage (report by Vincent Lefevre).</li>
+ </ul>
+
<h1><a name="xterm_289" id="xterm_289">Patch #289 -
2013/02/08</a></h1>
<ul>
- <li>revert the <a href="#xterm_282">patch #282</a> which
+ <li>revert the <a href="#xterm_282">patch #282</a> change which
restored "lost" text after shrinking/growing the screen size.
If the screen was updated between the two resizing operations,
unexpected text might be shown at the end (report/testcase by
diff --git a/xterm.man b/xterm.man
index 91bbac4..5964fff 100644
--- a/xterm.man
+++ b/xterm.man
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.555 2012/12/31 23:36:19 tom Exp $
+.\" $XTermId: xterm.man,v 1.556 2013/02/13 00:47:18 tom Exp $
.\"
.\" Copyright 1996-2011,2012 by Thomas E. Dickey
.\"
@@ -3785,7 +3785,7 @@ Set window/icon labels using hexadecimal
Query window/icon labels using hexadecimal
.TP 5
2
-Set window/icon labels using UTF-8 (overrides \fButf8Titles\fP resource).
+Set window/icon labels using UTF-8 (overrides \fButf8Title\fP resource).
.TP 5
3
Query window/icon labels using UTF-8
commit 33ec1eeb9c037fa55f4c7988e84a9a9beb2581fa
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 15:53:41 2013 +0100
Imported Upstream version 289
diff --git a/INSTALL b/INSTALL
index ccd228a..13a18f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.141 2013/01/06 16:28:21 tom Exp $
+-- $XTermId: INSTALL,v 1.142 2013/02/03 19:36:47 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2012,2013 by Thomas E. Dickey
--
@@ -215,7 +215,7 @@ The options (in alphabetic order):
type. If you do not need input method (and are troubled by the
warning messages), it is safe to disable this option.
- --disable-leaks test: set to test memory leaks
+ --disable-leaks test: free permanent memory, analyze leaks
Compile-in code which frees memory which might confuse a leak-testing
tool. Normally these chunks of memory are retained as long as xterm
@@ -565,6 +565,14 @@ The options (in alphabetic order):
Use --without-app-defaults or --with-app-defaults=no to disable the
feature.
+ --with-dmalloc test: use Gray Watson's dmalloc library
+
+ Check for and link with dmalloc.
+
+ --with-dbmalloc test: use Conor Cahill's dbmalloc library
+
+ Check for and link with dbmalloc.
+
--with-desktop-category=XXX one or more desktop catgories or auto
This is a list of names. The configure script maps blanks and commas
to semicolons (";") which are used by the desktop utils as a separator.
@@ -706,6 +714,11 @@ The options (in alphabetic order):
If xterm is not installed setuid'd to root, this option is not needed,
since it cannot change the tty device's ownership.
+ --with-valgrind test: use valgrind
+
+ Activate the --disable-leaks option, and ensure that "-g" is added to
+ CFLAGS.
+
--with-xpm=DIR use Xpm library for colored icon, may specify path
Use Xpm library to show colored icon in window decoration, e.g.,
diff --git a/MANIFEST b/MANIFEST
index 090dcd8..081a37c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-288, version xterm-288
+MANIFEST for xterm-289, version xterm-289
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -85,6 +85,7 @@ util.c miscellaneous utility functions for 'xterm'
uxterm wrapper script to make unicode-xterm
uxterm.desktop sample desktop file for uxterm
uxterm.man manpage for uxterm, from Debian
+version.c xterm package version, used also in resize
version.h version of xterm
vms.c VMS version of xterm's spawn(), etc.
vms.h system headers and definitions for vms.c
diff --git a/aclocal.m4 b/aclocal.m4
index 3dfb08a..e3e176b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.359 2013/01/03 01:37:48 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.360 2013/02/03 19:30:21 tom Exp $
dnl
Reply to: