xterm: Changes to 'upstream-unstable'
INSTALL | 5
MANIFEST | 2
charproc.c | 5
ctlseqs.ms | 13
ctlseqs.txt | 7
misc.c | 3
package/debian/changelog | 6
package/freebsd/Makefile | 2
package/xterm.spec | 4
resize.man | 6
termcap | 6
util.c | 27
version.h | 6
xterm.appdata.xml | 56 -
xterm.log.html | 46 +
xterm.man | 1757 ++++++++++++++++++++++++-----------------------
16 files changed, 1046 insertions(+), 905 deletions(-)
New commits:
commit 83ac4e4934e33e7b08a78d272454b2e6238bb8f9
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Sep 26 17:45:03 2016 +0200
Imported Upstream version 326
diff --git a/INSTALL b/INSTALL
index e2f03b4..4d961da 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.159 2016/05/28 18:39:26 tom Exp $
+-- $XTermId: INSTALL,v 1.160 2016/09/09 22:56:18 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2015,2016 by Thomas E. Dickey
--
@@ -458,7 +458,8 @@ The options (in alphabetic order):
Compile-in code that allows logging.
Logging was disabled in X11R5 xterm because of security problems.
- They were addressed in X11R6, but the feature was not reinstated.
+ They were addressed in X11R6, but the feature was not reinstated
+ because of concerns (long past) about xterm running as root-setuid.
--enable-meta-sends-esc set default metaSendsEscape resource (default: no)
diff --git a/MANIFEST b/MANIFEST
index 98e5f3b..9f99009 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-325, version xterm-325
+MANIFEST for xterm-326, version xterm-326
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/charproc.c b/charproc.c
index f177f89..bc103db 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1420 2016/05/30 19:31:33 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1422 2016/09/23 20:13:11 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -236,6 +236,7 @@ static String _Font_Selected_ = "yes"; /* string is arbitrary */
static const char *defaultTranslations;
/* *INDENT-OFF* */
static XtActionsRec actionsList[] = {
+ { "allow-bold-fonts", HandleAllowBoldFonts },
{ "allow-send-events", HandleAllowSends },
{ "bell", HandleBell },
{ "clear-saved-lines", HandleClearSavedLines },
@@ -1144,7 +1145,7 @@ resetCharsets(TScreen *screen)
#if OPT_VT52_MODE
if (screen->vtXX_level == 0)
- screen->gsets[1] = '0'; /* Graphics */
+ screen->gsets[1] = nrc_DEC_Spec_Graphic; /* Graphics */
#endif
}
diff --git a/ctlseqs.ms b/ctlseqs.ms
index a0bc032..cedc426 100644
--- a/ctlseqs.ms
+++ b/ctlseqs.ms
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.330 2016/02/22 00:44:10 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.331 2016/09/08 09:16:28 tom Exp $
.\"
.\"
.\" Copyright 1996-2015,2016 by Thomas E. Dickey
@@ -69,8 +69,8 @@
.\"
.ds XT XTerm
.ds xt xterm
-.ds LF Patch #323
-.ds RF 2016/02/21
+.ds LF Patch #326
+.ds RF 2016/09/08
.\"
.if n .pl 9999v \" no page breaks in nroff
.ND
@@ -498,10 +498,13 @@ Default response is an empty string, but may be overridden
by a resource \fBanswerbackString\fP.
.
.IP \\*(Ff
-Form Feed or New Page (NP). Ctrl-L is treated the same as LF.
+Form Feed or New Page (NP).
+(\*(Ff is Ctrl-L).
+\*(Ff is treated the same as \*(Lf.
.
.IP \\*(Lf
-Line Feed or New Line (NL). (LF is Ctrl-J).
+Line Feed or New Line (NL).
+(\*(Lf is Ctrl-J).
.
.IP \\*(Si
Shift In (Ctrl-O) \(-> Switch to Standard Character Set. This invokes the
diff --git a/ctlseqs.txt b/ctlseqs.txt
index 3dca1b7..428f164 100644
--- a/ctlseqs.txt
+++ b/ctlseqs.txt
@@ -21,7 +21,7 @@
Thomas Dickey
XFree86 Project (1996-2006)
invisible-island.net (2006-2016)
- updated for XTerm Patch #323 (2016/02/21)
+ updated for XTerm Patch #326 (2016/09/08)
@@ -158,8 +158,9 @@ BS Backspace (Ctrl-H).
CR Carriage Return (Ctrl-M).
ENQ Return Terminal Status (Ctrl-E). Default response is an empty
string, but may be overridden by a resource answerbackString.
-FF Form Feed or New Page (NP). Ctrl-L is treated the same as LF.
-LF Line Feed or New Line (NL). (LF is Ctrl-J).
+FF Form Feed or New Page (NP). (FF is Ctrl-L). FF is treated
+ the same as LF .
+LF Line Feed or New Line (NL). (LF is Ctrl-J).
SI Shift In (Ctrl-O) -> Switch to Standard Character Set. This
invokes the G0 character set (the default).
SO Shift Out (Ctrl-N) -> Switch to Alternate Character Set. This
diff --git a/misc.c b/misc.c
index b49582f..81105a3 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.741 2016/06/01 09:21:56 tom Exp $ */
+/* $XTermId: misc.c,v 1.742 2016/09/08 23:39:58 Joe.Peterson Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -657,6 +657,7 @@ xevents(void)
case ButtonRelease:
/* also these... */
case Expose:
+ case GraphicsExpose:
case NoExpose:
case PropertyNotify:
case ClientMessage:
diff --git a/package/debian/changelog b/package/debian/changelog
index 2b22f6d..df450a5 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (326) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 07 Sep 2016 21:12:23 -0400
+
xterm-dev (325) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index b7089c8..5e1b471 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 325
+PORTVERSION= 326
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index f675a82..0b35106 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.91 2016/05/12 23:25:56 tom Exp $
+# $XTermId: xterm.spec,v 1.92 2016/07/18 02:21:41 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: 325
+Version: 326
Release: 1
License: X11
Group: User Interface/X
diff --git a/resize.man b/resize.man
index 9e26d90..af31dd2 100644
--- a/resize.man
+++ b/resize.man
@@ -1,6 +1,6 @@
-.\" $XTermId: resize.man,v 1.30 2013/01/06 16:13:44 tom Exp $
+.\" $XTermId: resize.man,v 1.32 2016/09/24 11:14:15 tom Exp $
.\"
-.\" Copyright 1998-2012,2013 by Thomas E. Dickey
+.\" Copyright 1998-2013,2016 by Thomas E. Dickey
.\"
.\" All Rights Reserved
.\"
@@ -202,7 +202,7 @@ sets these variables on systems using terminfo.
Many applications (including the curses library)
use those variables when set to override their screensize.
.SH "SEE ALSO"
-use_env(3)
+use_env(3x)
.br
csh(1), stty(1), tset(1)
.br
diff --git a/termcap b/termcap
index 6f9f7fa..8459162 100644
--- a/termcap
+++ b/termcap
@@ -1,4 +1,4 @@
-# $XTermId: termcap,v 1.82 2016/05/30 21:41:18 tom Exp $
+# $XTermId: termcap,v 1.83 2016/07/09 18:40:00 tom Exp $
#
# These are termcap entries that correspond to xterm's terminfo file.
# The file is formatted using ncurses' "tic -CNx", but is not mechanically
@@ -50,7 +50,7 @@
# the resolved length of each entry in a comment at the end - T.Dickey
#
xf|xterm-new|modern xterm:\
- :XT::*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+ :XT:*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:kH=\EOF:\
:kI=\E[2~:kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:\
@@ -82,7 +82,7 @@ xb|xterm-basic|modern xterm common:\
# + uses DEC-style control sequences for the application keypad.
#
vt|xterm-vt220|xterm emulating vt220:\
- :XT::*6=\E[4~:@7=\E[4~:K2=\EOu:Km=\E[M:kB=\E[Z:kH=\E[4~:\
+ :XT:*6=\E[4~:@7=\E[4~:K2=\EOu:Km=\E[M:kB=\E[Z:kH=\E[4~:\
:kh=\E[1~:tc=xterm-basic:
v1|xterm-24|xterms|vs100|24x80 xterm:\
diff --git a/util.c b/util.c
index 97205ff..887148d 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.688 2016/06/03 08:58:37 tom Exp $ */
+/* $XTermId: util.c,v 1.691 2016/09/24 13:39:04 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -3309,6 +3309,10 @@ fixupItalics(XtermWidget xw,
}
#endif
+#define SetMissing() \
+ TRACE(("%s@%d: missing %d\n", __FILE__, __LINE__, missing)); \
+ missing = 1
+
/*
* Draws text with the specified combination of bold/underline. The return
* value is the updated x position.
@@ -3538,7 +3542,7 @@ drawXtermText(XtermWidget xw,
*/
if (screen->force_box_chars
|| xtermXftMissing(xw, currFont, dec2ucs(ch))) {
- missing = 1;
+ SetMissing();
} else {
ch = dec2ucs(ch);
replace = True;
@@ -3555,7 +3559,7 @@ drawXtermText(XtermWidget xw,
if (screen->force_box_chars
|| xtermXftMissing(xw, currFont, ch)) {
ch = part;
- missing = True;
+ SetMissing();
}
} else if (xtermXftMissing(xw, currFont, ch)) {
XftFont *test = pickXftFont(needed, font0, wfont0);
@@ -3567,6 +3571,8 @@ drawXtermText(XtermWidget xw,
filler = needed - 1;
ch = part;
replace = True;
+ } else {
+ SetMissing();
}
}
});
@@ -3582,7 +3588,7 @@ drawXtermText(XtermWidget xw,
* box-characters.
*/
if (xtermXftMissing(xw, currFont, ch)) {
- missing = 1;
+ SetMissing();
}
}
#endif
@@ -3756,10 +3762,11 @@ drawXtermText(XtermWidget xw,
&& (!screen->fnt_boxes
|| (FontIsIncomplete(curFont) && !screen->assume_all_chars)
|| screen->force_box_chars)) {
- /* Fill in missing box-characters.
- Find regions without missing characters, and draw
- them calling ourselves recursively. Draw missing
- characters via xtermDrawBoxChar(). */
+ /*
+ * Fill in missing box-characters. Find regions without missing
+ * characters, and draw them calling ourselves recursively. Draw
+ * missing characters via xtermDrawBoxChar().
+ */
int last, first = 0;
Bool drewBoxes = False;
@@ -3827,6 +3834,8 @@ drawXtermText(XtermWidget xw,
#if OPT_WIDE_CHARS
if (ch_width <= 0 && ch < 32)
ch_width = 1; /* special case for line-drawing */
+ else if (ch_width < 0)
+ ch_width = 1; /* special case for combining char */
if (!ucs_workaround(xw, ch,
attr_flags,
draw_flags,
@@ -4839,7 +4848,7 @@ extendedBoolean(const char *value, const FlagList * table, Cardinal limit)
|| (x_strcasecmp(value, "off") == 0)) {
result = False;
} else if ((check = strtol(value, &next, 0)) >= 0 && *next == '\0') {
- if (check >= (long) limit)
+ if (check >= (long) (limit + 2)) /* 2 is past False=0, True=1 */
check = True;
result = (int) check;
} else {
diff --git a/version.h b/version.h
index 2b8dfb0..321a450 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.427 2016/06/05 22:28:35 tom Exp $ */
+/* $XTermId: version.h,v 1.429 2016/09/25 21:28:55 tom Exp $ */
/*
* Copyright 1998-2015,2016 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 325
-#define XTERM_DATE 2016-06-05
+#define XTERM_PATCH 326
+#define XTERM_DATE 2016-09-25
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.appdata.xml b/xterm.appdata.xml
index 46a22f2..ebe4976 100644
--- a/xterm.appdata.xml
+++ b/xterm.appdata.xml
@@ -1,33 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014,2016 Thomas Dickey <dickey@invisible-island.net> -->
-<application>
- <id type="desktop">xterm.desktop</id>
- <metadata_license>CC-BY-3.0</metadata_license>
- <project_license>X11</project_license>
- <name>XTerm</name>
- <summary>Terminal emulator for the X Window System</summary>
- <description>
- <p>
+<component type="desktop">
+ <id>xterm.desktop</id>
+ <metadata_license>CC-BY-3.0</metadata_license>
+ <project_license>X11</project_license>
+ <name>XTerm</name>
+ <summary>Terminal emulator for the X Window System</summary>
+ <description>
+ <p>
XTerm is the standard terminal emulator for the X Window System.
It provides DEC VT102/VT220 and selected features from higher-level
terminals such as VT320/VT420/VT520 (VTxxx). It also provides Tektronix
4014 emulation for programs that cannot use the window system directly.
</p>
- <p>
+ <p>
You would use xterm to get a shell prompt, to run command-line programs.
</p>
- </description>
- <screenshots>
- <screenshot type="default" width="813" height="539">http://invisible-island.net/xterm/images/merged-xterm-menus.png</screenshot>
- </screenshots>
- <keywords>
- <keyword>3D</keyword>
- <keyword>shell</keyword>
- <keyword>prompt</keyword>
- <keyword>command</keyword>
- <keyword>commandline</keyword>
- <keyword>cmd</keyword>
- </keywords>
- <url type="homepage">http://invisible-island.net/xterm/</url>
- <updatecontact>dickey@invisible-island.net</updatecontact>
-</application>
+ </description>
+ <screenshots>
+ <screenshot type="default" height="539" width="813">
+ <image>http://invisible-island.net/xterm/images/merged-xterm-menus.png</image>
+ <caption>xterm with its popup menus superimposed</caption>
+ </screenshot>
+ </screenshots>
+ <keywords>
+ <keyword>shell</keyword>
+ <keyword>prompt</keyword>
+ <keyword>command</keyword>
+ <keyword>commandline</keyword>
+ <keyword>cmd</keyword>
+ <keyword>terminal</keyword>
+ </keywords>
+ <url type="homepage">http://invisible-island.net/xterm/</url>
+ <update_contact>dickey@invisible-island.net</update_contact>
+ <developer_name>Thomas E. Dickey</developer_name>
+ <url type="bugtracker">mailto:dickey@invisible-island.net</url>
+ <url type="donation"/>
+ <url type="help">http://invisible-island.net/xterm/xterm.faq.html</url>
+ <url type="translate"/>
+</component>
diff --git a/xterm.log.html b/xterm.log.html
index d0494d6..604eeca 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1669 2016/06/05 22:28:12 tom Exp $
+ $XTermId: xterm.log.html,v 1.1684 2016/09/25 21:31:02 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_326">Patch #326 - 2016/09/25</a></li>
+
<li><a href="#xterm_325">Patch #325 - 2016/06/05</a></li>
<li><a href="#xterm_324">Patch #324 - 2016/03/10</a></li>
@@ -935,6 +937,48 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_326" id="xterm_326">Patch #326 -
+ 2016/09/25</a></h1>
+
+ <ul>
+ <li>updated appdata file (report by Richard Hughes).</li>
+
+ <li>improve discussion of the different terminal emulations
+ provided by xterm in the manual page.</li>
+
+ <li>add examples of setting the icon title with/without the
+ window title in the manual (Debian #833984).</li>
+
+ <li>correct a limit-check when using a numeric value for
+ extended Booleans e.g., <code>*fullscreen:3</code> rather than
+ a name such as <code>*fullscreen:never</code>.</li>
+
+ <li>add action <code>allow-bold-fonts</code></li>
+
+ <li>improved formatting fixes for manual page, using script to
+ find mismatches in spelling of resources, actions and menu
+ entries.</li>
+
+ <li>improve documentation of logging resources.</li>
+
+ <li>fix a special case of flickering cursor by adding
+ <code>GraphicsExpose</code> to the list of event types that
+ should not trigger making the mouse cursor visible (patch by
+ Joe Peterson).</li>
+
+ <li>correct initialization of line-drawing in VT52-mode,
+ overlooked in changes for <a href="#xterm_297">patch #297</a>
+ (report/patch by Ben Wiley Sittler).</li>
+
+ <li>minor clarification of form-feed versus line-feed in
+ <code>ctlseqs.ms</code> (suggested by David Kemper).</li>
+
+ <li>amend fix for Debian #738794 to restore a check for missing
+ characters which are <em>not</em> combining characters. Also
+ fill in a corresponding special case for TrueType fonts (Debian
+ #827905).</li>
+ </ul>
+
<h1><a name="xterm_325" id="xterm_325">Patch #325 -
2016/06/05</a></h1>
diff --git a/xterm.man b/xterm.man
index aea52cd..7b299a1 100644
--- a/xterm.man
+++ b/xterm.man
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.637 2016/06/05 20:51:19 tom Exp $
+.\" $XTermId: xterm.man,v 1.689 2016/09/25 17:25:26 tom Exp $
.\"
.\" Copyright 1996-2015,2016 by Thomas E. Dickey
.\"
@@ -73,7 +73,7 @@
..
.de NE
.fi
-.ft P
+.ft R
.in -4
..
.\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -86,13 +86,18 @@
.TH XTERM 1 "__app_date__" "__app_version__" "X Window System"
.SH NAME
xterm \- terminal emulator for X
+.if n .hy 0
+.if n .nh
+.if n .na
.SH SYNOPSIS
.B \*n
[\-\fItoolkitoption\fP ...] [\-\fIoption\fP ...] [\fIshell\fP]
.SH DESCRIPTION
+.hy 0
+.nh
The \fI\*n\fP program is a terminal emulator for the X Window System.
It provides DEC VT102/VT220 and selected features from higher-level
-terminals such as VT320/VT420/VT520 (VTxxx).
+terminals such as VT320/VT420/VT520 (VT\fIxxx\fP).
It also provides Tektronix 4014 emulation
for programs that cannot use the window system directly.
If the underlying operating system supports
@@ -101,7 +106,7 @@ derived from 4.3BSD), \fI\*n\fP will use the facilities to notify programs
running in the window whenever it is resized.
.
.PP
-The VTxxx and Tektronix 4014 terminals each have their own window so that you
+The VT\fIxxx\fP and Tektronix 4014 terminals each have their own window so that you
can edit text in one and look at graphics in the other at the same time.
To maintain the correct aspect ratio (height/width), Tektronix graphics will
be restricted to the largest box with a 4014's aspect ratio that will fit in
@@ -114,15 +119,25 @@ considered the \*(``active\*('' window for receiving keyboard input and terminal
output.
This is the window that contains the text cursor.
The active window can be chosen through escape sequences,
-the \*(``VT Options\*('' menu in the VTxxx window, and the \*(``Tek Options\*(''
-menu in the 4014 window.
+the \fBVT Options\fP menu in the VT\fIxxx\fP window,
+and the \fBTek Options\fP menu in the 4014 window.
.
.SH EMULATIONS
+\fI\*N\fP provides usable emulations of related DEC terminals:
+.bP
+The VT52 emulation is complete.
+.bP
The VT102 emulation is fairly complete, but does not support
autorepeat.
Double-size characters are displayed properly if your font server supports
scalable fonts.
+.bP
The VT220 emulation does not support soft fonts, it is otherwise complete.
+.bP
+The VT420 emulation (the default) supports controls for manipulating rectangles
+of characters as well as left/right margins.
+\fI\*N\fP does not support some other features which
+are not suitable for emulation, e.g., two-sessions.
.PP
Terminal database (\fIterminfo\fP (5) or \fItermcap\fP (5))
entries that work with \fI\*n\fP include
@@ -142,8 +157,39 @@ an optional platform-specific entry (\*(``__default_termname__\*(''),
\fI\*N\fP automatically searches the
terminal database in this order for these entries and then
sets the \*(``TERM\*('' and the \*(``TERMCAP\*('' environment variables.
-You may also use \*(``vt220\*('', but must set the terminal emulation level
+The alternatives after \*(``xterm\*('' are very old,
+from the late 1980s.
+.PP
+VT100 and VT102 emulations are commonly equated,
+though they actually differ.
+The VT102 provided controls for inserting and deleting lines.
+.PP
+Similarly,
+\*(``ansi\*('' and
+\*(``vt100\*('' are often equated.
+These are not really the same.
+For instance, they use different controls for scrolling
+(but \fI\*n\fP supports both).
+These features differ in an \*(``ansi\*('' terminal description
+from \fI\*n\fP:
+.TP 8
+.B acsc
+.br
+Pseudo-graphics (line-drawing) uses a different mapping.
+.TP 8
+.B xenl
+.br
+\fI\*N\fP wraps text at the right margin using
+the VT100 \*(``newline glitch\*('' behavior.
+.PP
+Because of the wrapping behavior, you would occasionally have to
+repaint the screen when using a text editor with the \*(``ansi\*('' description.
+.PP
+You may also use descriptions corresponding to the various
+supported emulations such as \*(``vt220\*('' or \*(``vt420\*('',
+but should set the terminal emulation level
with the \fBdecTerminalID\fP resource.
+.PP
On most systems, \fI\*n\fP will use the terminfo database.
Some older systems use termcap.
(The \*(``TERMCAP\*('' environment variable is not set if \fI\*n\fP is linked
@@ -154,11 +200,8 @@ by the termcap emulation of terminfo libraries).
Many of the special
.I \*n
features may be modified under program control
-through a set of escape sequences different from the standard VT102 escape
-sequences.
-(See the
-.I "Xterm Control Sequences"
-document.)
+through a set of escape sequences different from the standard VT\fIxxx\fP escape
+sequences (see \fIXterm Control Sequences\fP).
.
.PP
The Tektronix 4014 emulation is also fairly good.
@@ -168,11 +211,13 @@ There is no write-through or defocused mode support.
The Tektronix text and graphics commands are recorded internally by
.I \*n
and may be written to a file by sending the COPY escape sequence (or through
-the
-.B Tektronix
-menu; see below).
+the \fBTektronix\fP menu; see below).
The name of the file will be
-\*(``\fBCOPY\fIyyyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fR\*('', where
+.NS
+\*(``COPY\fIyyyy\fR\-\fIMM\fR\-\fIdd\fR.\fIhh\fR:\fImm\fR:\fIss\fR\*(''
+.NE
+.PP
+where
.IR yyyy ,
.IR MM ,
.IR dd ,
@@ -201,7 +246,7 @@ If the window is the focus window, then the text cursor is
highlighted no matter where the pointer is.
.
.PP
-In VT102 mode, there are escape sequences to activate and deactivate
+In VT\fIxxx\fP mode, there are escape sequences to activate and deactivate
an alternate screen buffer, which is the same size as the display area
of the window.
When activated, the current screen is saved and replaced with the alternate
@@ -216,9 +261,9 @@ A popup menu entry makes it simple to switch between the normal and
alternate screens for cut and paste.
.
.PP
-In either VT102 or Tektronix mode, there are escape sequences to change the
+In either VT\fIxxx\fP or Tektronix mode, there are escape sequences to change the
name of the windows.
-Additionally, in VT102 mode,
+Additionally, in VT\fIxxx\fP mode,
\fI\*n\fP implements the window-manipulation control
sequences from \fIdtterm\fP, such as resizing the window, setting its location
on the screen.
@@ -257,7 +302,7 @@ since some features historically have been one or the other.
\fI\*N\fP generates a concise help message (multiple options per line)
when an unknown option is used, e.g.,
.NS
-\fB\*n \-z\fP
+\*n \-z
.NE
.IP
If the logic for a particular option such as logging is not compiled
@@ -315,7 +360,7 @@ to allow the command-line options to affect the relevant widget values.
In a few cases,
the X Toolkit combines its standard options in ways which do not work
well with \fI\*n\fP.
-This happens with the color (\fB\-fg\fP, \fB\-B\fP) and reverse (\fB\-rv\fP)
+This happens with the color (\fB\-fg\fP, \fB\-bg\fP) and reverse (\fB\-rv\fP)
options.
\fI\*N\fP makes a special case of these and
adjusts its sense of \*(``reverse\*(''
@@ -410,7 +455,7 @@ and is equivalent to setting the \fIvt100\fP resource
.BI \-b " number"
This option specifies the size of the inner border (the distance between
the outer edge of the characters and the window border) in pixels.
-That is the \fIvt100\fP \fIinternalBorder\fP resource.
+That is the \fIvt100\fP \fBinternalBorder\fP resource.
The
default is \*(``2\*(''.
.TP 8
@@ -424,11 +469,11 @@ This overrides the \fBcursorBlink\fR resource.
.TP 8
.BI \-bcf " milliseconds"
set the amount of time text cursor is off when blinking via the
-\fIcursorOffTime\fP resource.
+\fBcursorOffTime\fP resource.
.TP 8
.BI \-bcn " milliseconds"
set the amount of time text cursor is on when blinking via the
-\fIcursorOnTime\fP resource.
+\fBcursorOnTime\fP resource.
.TP 8
.B "\-bdc"
Set the \fIvt100\fP resource \fBcolorBDMode\fR to \*(``false\*('',
@@ -447,9 +492,7 @@ Set the \fIvt100\fP resource \fBcutToBeginningOfLine\fP to \*(``true\*(''.
.TP 8
.B "\-cc \fIcharacterclassrange\fP:\fIvalue\fP[,...]"
This sets classes indicated by the given ranges for using in selecting by
-words.
-See the section specifying character classes
-and discussion of the \fIcharClass\fP resource.
+words (see \fBCHARACTER CLASSES\fP and the \fBcharClass\fP resource).
.TP 8
.B "\-cjk_width"
Set the \fBcjkWidth\fP resource to \*(``true\*(''.
@@ -474,7 +517,7 @@ can be set to another class such as \*(``U__default_class__\*('' to override sel
.TP 8
.B "\-cm"
This option disables recognition of ANSI color-change escape sequences.
-It sets the \fIcolorMode\fP resource to \*(``false\*(''.
+It sets the \fBcolorMode\fP resource to \*(``false\*(''.
.TP 8
.B "+cm"
This option enables recognition of ANSI color-change escape sequences.
@@ -483,17 +526,17 @@ This is the same as the \fIvt100\fP resource \fBcolorMode\fP.
.B "\-cn"
This option indicates that newlines should not be cut in line-mode
selections.
-It sets the \fIcutNewline\fP resource to \*(``false\*(''.
+It sets the \fBcutNewline\fP resource to \*(``false\*(''.
.TP 8
.B +cn
This option indicates that newlines should be cut in line-mode selections.
-It sets the \fIcutNewline\fP resource to \*(``true\*(''.
+It sets the \fBcutNewline\fP resource to \*(``true\*(''.
.TP 8
.BI \-cr " color"
This option specifies the color to use for text cursor.
The default is to
use the same foreground color that is used for text.
-It sets the \fIcursorColor\fP resource according to the parameter.
+It sets the \fBcursorColor\fP resource according to the parameter.
.TP 8
.B \-cu
This option indicates that \fI\*n\fP should work around a bug in the
@@ -520,19 +563,20 @@ the pointer cursor foreground and background colors,
the Tektronix emulator foreground and background colors,
its text cursor color
and highlight color.
-The option sets the \fIdynamicColors\fP option to \*(``false\*(''.
+The option sets the \fBdynamicColors\fP option to \*(``false\*(''.
.TP 8
.B "+dc"
This option enables the escape sequence to change dynamic colors.
-The option sets the \fIdynamicColors\fP option to \*(``true\*(''.
+The option sets the \fBdynamicColors\fP option to \*(``true\*(''.
.TP 8
-.BI \-e " program \fP[ \fIarguments \fP.\|.\|. ]\fI"
+.BI \-e "\fI program \fP[ \fIarguments \fP.\|.\|. ]\fI"
This option specifies the program (and its command line arguments) to be
run in the \fI\*n\fP window.
It also sets the window title and icon
name to be the basename of the program being executed if neither \fI\-T\fP
nor \fI\-n\fP are given on the command line.
-\fBThis must be the last option on the command line.\fP
+.IP
+\fBNOTE:\fP This must be the \fBlast option\fP on the command line.
.TP 8
.BI \-en " encoding"
This option determines the encoding on which \fI\*n\fP runs.
@@ -718,7 +762,7 @@ Its use is
strongly recommended since it makes \fI\*n\fP much faster when scanning
through large amounts of text.
The VT100 escape sequences for enabling and
-disabling smooth scroll as well as the \*(``VT Options\*(''
+disabling smooth scroll as well as the \fBVT Options\fP
menu can be used to turn this
feature on or off.
.TP 8
@@ -750,30 +794,55 @@ causes the corresponding resource to be ignored.
.IP
The value \*(``default\*('',
suppresses the associated resources
-.BR hpFunctionKeys ,
-.BR scoFunctionKeys ,
-.BR sunFunctionKeys ,
-.BR tcapFunctionKeys ,
-.BR oldXtermFKeys
+.IP
+\fBhpFunctionKeys\fP,
+.br
+\fBscoFunctionKeys\fP,
+.br
+\fBsunFunctionKeys\fP,
+.br
+\fBtcapFunctionKeys\fP,
+.br
+\fBoldXtermFKeys\fP
and
-.BR sunKeyboard ,
+.br
+\fBsunKeyboard\fP,
+.IP
using the Sun/PC keyboard layout.
.TP 8
.B \-l
-Turn logging on.
-Normally logging is not supported, due to security concerns.
+Turn logging on, unless disabled by the \fBlogInhibit\fP resource.
+.IP
Some versions of \fI\*n\fP may have logging enabled.
-The logfile is written to the directory from which \fI\*n\fP is
-invoked.
+However, normally logging is not supported,
+due to security concerns in the early 1990s.
+That was a problem in X11R4 \fBxterm\fP (1989) which was addressed by
+a patch to X11R5 late in 1993.
+X11R6 included these fixes.
+The older version (when running with \fIroot\fP privilege) would create
+the log-file using \fIroot\fP privilege.
+The reason why \fI\*n\fP ran with \fIroot\fP privileges
+was to open pseudo-terminals.
+Those privileges are now needed only on very old systems:
+Unix98 pseudo-terminals made the BSD scheme unnecessary.
+.IP
+Unless overridden by the \fB\-lf\fP option or the \fBlogFile\fP resource:
+.RS
+.bP
+The logfile is written to the directory from which \fI\*n\fP is invoked.
+.bP
The filename is generated, of the form
-.sp
- XtermLog.\fIXXXXXX\fR
-.sp
+.NS
+XtermLog.\fIXXXXXX\fR
+.NE
+.IP
or
-.sp
- Xterm.log.\fIhostname.yyyy.mm.dd.hh.mm.ss.XXXXXX\fR
-.sp
+.NS
+Xterm.log.\fIhostname.yyyy.mm.dd.hh.mm.ss.XXXXXX\fR
+.NE
+.IP
depending on how \fI\*n\fP was built.
+.RE
.TP 8
.B +l
Turn logging off.
@@ -807,6 +876,7 @@ This is the default, unless you have set the rightScrollBar resource.
.TP 8
.BI \-lf " filename"
Specify the log-filename.
+This sets the \fBlogFile\fP resource.
See the \fB\-l\fP option.
.TP 8
.B \-ls
@@ -882,7 +952,7 @@ Reset the \fBmkWidth\fP resource.
This option specifies the color to be used for the pointer cursor.
The default
is to use the foreground color.
-This sets the \fIpointerColor\fP resource.
+This sets the \fBpointerColor\fP resource.
.TP 8
.BI \-nb " number"
This option specifies the number of characters from the right end of a line
@@ -896,8 +966,8 @@ This option disables the display of underlining.
This option enables the display of underlining.
.TP 8
.B \-pc
-This option enables the PC-style use of bold colors (see boldColors
-resource).
+This option enables the PC-style use of bold colors
+(see \fBboldColors\fP resource).
.TP 8
.B +pc
This option disables the PC-style use of bold colors.
@@ -937,7 +1007,7 @@ column of the previous line.
This is very useful for editing long shell
command lines and is encouraged.
This option can be turned on and off from
-the \*(``VT Options\*('' menu.
+the \fBVT Options\fP menu.
.TP 8
.B +rw
This option indicates that reverse-wraparound should not be allowed.
@@ -968,8 +1038,7 @@ Always send title and icon name change requests.
This option indicates that some number of lines that are scrolled off the top
of the window should be saved and that a scrollbar should be displayed so that
those lines can be viewed.
-This option may be turned on and off from the
-\*(``VT Options\*('' menu.
+This option may be turned on and off from the \fBVT Options\fP menu.
.TP 8
.B +sb
This option indicates that a scrollbar should not be displayed.
@@ -999,7 +1068,7 @@ See the discussion of the \fBscaleHeight\fP resource.
.B \-si
This option indicates that output to a window should not automatically
reposition the screen to the bottom of the scrolling region.
-This option can be turned on and off from the \*(``VT Options\*('' menu.
+This option can be turned on and off from the \fBVT Options\fP menu.
.TP 8
.B +si
This option indicates that output to a window should cause it to
@@ -1041,7 +1110,7 @@ keypad and function keys.
.TP 8
.B \-t
This option indicates that \fI\*n\fP should start in Tektronix mode, rather
-than in VT102 mode.
+than in VT\fIxxx\fP mode.
Switching between the two windows is done using the
\*(``Options\*('' menus.
.IP
@@ -1065,14 +1134,14 @@ automatically searches the terminal database in this order for these entries and
sets the \*(``TERM\*('' and the \*(``TERMCAP\*('' environment variables.
.TP 8
.B +t
-This option indicates that \fI\*n\fP should start in VT102 mode.
+This option indicates that \fI\*n\fP should start in VT\fIxxx\fP mode.
.TP 8
.B \-tb
This option, corresponding to the \fBtoolBar\fR resource,
indicates that \fI\*n\fR should display a toolbar (or menubar)
at the top of its window.
The buttons in the toolbar correspond to
-the popup menus, e.g., control/left/mouse for \*(``Main Options\*(''.
+the popup menus, e.g., control/left/mouse for \fBMain Options\fP.
.TP 8
.B +tb
This option indicates that \fI\*n\fR should
@@ -1086,7 +1155,7 @@ used to determine the type of response to a DA control sequence.
Valid values include vt52, vt100, vt101, vt102, vt220, and vt240
(the \*(``vt\*('' is optional).
The default is \*(``vt__default_termid__\*(''.
-The term_id argument specifies the terminal ID to use.
+The \fIterm_id\fP argument specifies the terminal ID to use.
(This is the same as the \fBdecTerminalID\fP resource).
.TP 8
.BI \-tm " string"
@@ -1250,11 +1319,11 @@ Toolkit provides standard options that accomplish the same task.
.TP 8
.B "%\fIgeom\fP"
This option specifies the preferred size and position of the Tektronix window.
-It is shorthand for specifying the \*(``\fI*tekGeometry\fP\*('' resource.
+It is shorthand for specifying the \*(``\fBtekGeometry\fP\*('' resource.
.TP 8
.B "#\fIgeom\fP"
This option specifies the preferred position of the icon window.
-It is shorthand for specifying the \*(``\fI*iconGeometry\fP\*('' resource.
+It is shorthand for specifying the \*(``\fBiconGeometry\fP\*('' resource.
.TP 8
.BI \-T " string"
This option specifies the title for \fI\*n\fP's windows.
@@ -1262,8 +1331,8 @@ It is equivalent to \fB\-title\fP.
.TP 8
.BI \-n " string"
This option specifies the icon name for \fI\*n\fP's windows.
-It is shorthand for specifying the \*(``\fI*iconName\fP\*('' resource.
-Note that this is not the same as the toolkit option \fB\-name\fP (see below).
+It is shorthand for specifying the \*(``\fBiconName\fP\*('' resource.
+Note that this is not the same as the toolkit option \fB\-name\fP.
The default icon name is the application name.
.IP
If no suitable icon is found, \fI\*n\fP provides a compiled-in pixmap.
@@ -1305,7 +1374,7 @@ See the \fB\-b\fP option, which controls the inner border of the \fI\*n\fP
window.
.TP 8
.B \-display \fIdisplay\fP
-This option specifies the X server to contact; see \fIX(__miscmansuffix__)\fP.
+This option specifies the X server to contact; see X(__miscmansuffix__).
.TP 8
.B \-fg \fIcolor\fP
This option specifies the color to use for displaying text.
@@ -1322,14 +1391,15 @@ The resource value default is \fIfixed\fP.
This is the same as \fB\-fn\fP.
.TP 8
.B \-geometry \fIgeometry\fP
Reply to: