xterm: Changes to 'ubuntu'
INSTALL | 45
Imakefile | 15
MANIFEST | 20
Makefile.in | 82
THANKS | 14
Tekproc.c | 222 -
VTPrsTbl.c | 342 ++
VTparse.def | 7
VTparse.h | 8
XTerm.ad | 19
aclocal.m4 | 513 +++
button.c | 418 +-
cachedGCs.c | 5
charproc.c | 1307 ++++++---
config.guess | 167 -
config.sub | 178 -
configure | 4992 +++++++++++++++++++++++------------
configure.in | 86
ctlseqs.ms | 1353 +++++----
ctlseqs.txt | 1215 ++++----
data.c | 5
data.h | 18
debian/README.source | 2
debian/changelog | 198 +
debian/control | 13
debian/local/xterm.faq.html | 1514 ++++++----
debian/patches/900_debian_xterm.diff | 14
debian/patches/902_windowops.diff | 6
debian/patches/904_fontops.diff | 2
debian/rules | 11
debian/watch | 2
debian/xsfbs/xsfbs.mk | 35
debian/xterm.README.Debian | 6
debian/xterm.dirs | 5
debian/xterm.docs | 2
debian/xterm.install | 1
df-install.in | 95
doublechr.c | 4
error.h | 3
fontutils.c | 249 +
fontutils.h | 10
input.c | 20
linedata.c | 6
main.c | 156 -
main.h | 10
menu.c | 683 +++-
menu.h | 48
misc.c | 616 +++-
os2main.c | 155 -
package/debian/changelog | 35
package/debian/color.sed | 4
package/debian/compat | 1
package/debian/control | 23
package/debian/copyright | 221 +
package/debian/rules | 186 +
package/debian/source/format | 1
package/debian/watch | 4
package/debian/xterm-dev.docs | 8
package/debian/xterm-xres.sed | 8
package/xterm.spec | 171 +
plink.sh | 8
print.c | 340 +-
ptydata.c | 27
ptyx.h | 154 -
screen.c | 297 +-
scrollbar.c | 49
terminfo | 30
trace.c | 50
trace.h | 60
util.c | 99
uxterm.desktop | 4
version.h | 6
vms.c | 7
vms.h | 2
vttests/dynamic.pl | 131
xcharmouse.h | 5
xterm.desktop | 4
xterm.h | 88
xterm.log.html | 461 +++
xterm.man | 1101 +++++--
xterm_io.h | 6
xtermcap.c | 18
xtermcfg.hin | 42
xutf8.c | 24
xutf8.h | 8
85 files changed, 12845 insertions(+), 5735 deletions(-)
New commits:
commit c63128226f453850c88f8c7b2bd009e651925508
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Aug 4 17:11:25 2011 +0300
xterm.overrides: Purge old utempter-reversal cruft.
diff --git a/debian/changelog b/debian/changelog
index 496fb71..9f47d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xterm (271-1ubuntu1) UNRELEASED; urgency=low
* control: Revert the change to Vcs headers.
+ * xterm.overrides: Purge old utempter-reversal cruft.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 04 Aug 2011 17:04:32 +0300
diff --git a/debian/xterm.overrides b/debian/xterm.overrides
deleted file mode 100644
index e978755..0000000
--- a/debian/xterm.overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-xterm: setgid-binary usr/bin/xterm 2755 root/utmp
-
commit 1e99d85dda1fe9e1fc030351aeca1f45719be28f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Aug 4 17:06:55 2011 +0300
control: Revert the change to Vcs headers.
diff --git a/debian/changelog b/debian/changelog
index a0d68da..496fb71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (271-1ubuntu1) UNRELEASED; urgency=low
+
+ * control: Revert the change to Vcs headers.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 04 Aug 2011 17:04:32 +0300
+
xterm (271-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 4f44cfc..e84fcdf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
-XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
-XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
Build-Depends:
libncurses5-dev | libncurses-dev,
commit 7e663e236e62efeeb9f8e739e85d63b233648d99
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Aug 4 16:58:57 2011 +0300
Merge Ubuntu changes
diff --git a/debian/changelog b/debian/changelog
index f21f754..83ab2db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+xterm (270-1ubuntu3) oneiric; urgency=low
+
+ * Also update xterm.dirs and .install.
+
+ -- Loïc Minier <loic.minier@ubuntu.com> Wed, 13 Jul 2011 17:46:51 +0200
+
+xterm (270-1ubuntu2) oneiric; urgency=low
+
+ * Rename Vcs-* to XS-Debian-Vcs-* in control as the ubuntu branch in
+ xterm.git hasn't been used for a year.
+ * Add desktop-file-utils build-dep and add "install-desktop" target to the
+ "make install" run as to install a xterm.desktop file; this is useful to
+ get the xterm icon in Unity's list of running apps when running xterm as
+ it's looked up via the Icon field.
+
+ -- Loïc Minier <loic.minier@ubuntu.com> Wed, 13 Jul 2011 16:15:56 +0200
+
+xterm (270-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled URL
+ highlighting
+ - debian/patches/Add 951_uxterm_utf8_title.diff: Set utf8Titles to true by
+ default when using uxterm, so that it displays utf8 directories in titles
+ properly. May cause issues with apps that use control sequences for
+ updating the xterm titlebar - users should use xterm or set utf8Title
+ to false in this case.
+ - debian/gbp.conf: Use "Ubuntu" in "debian-branch" directly
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 17 Jun 2011 10:40:36 +0200
+
xterm (270-1) unstable; urgency=low
* New upstream release:
@@ -16,6 +47,20 @@ xterm (269-1) unstable; urgency=low
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 17:05:05 +0100
+xterm (268-1ubuntu1) natty; urgency=low
+
+ * Merge from debian unstable (LP: #717301), remaining changes:
+ - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled URL
+ highlighting
+ - debian/patches/Add 951_uxterm_utf8_title.diff: Set utf8Titles to true by
+ default when using uxterm, so that it displays utf8 directories in titles
+ properly. May cause issues with apps that use control sequences for
+ updating the xterm titlebar - users should use xterm or set utf8Title
+ to false in this case.
+ - debian/gbp.conf: Use "Ubuntu" in "debian-branch" directly
+
+ -- Lorenzo De Liso <blackz@ubuntu.com> Sat, 12 Feb 2011 15:58:09 +0100
+
xterm (268-1) unstable; urgency=low
[ Sven Joachim ]
@@ -39,6 +84,31 @@ xterm (268-1) unstable; urgency=low
-- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 18:48:37 +0100
+xterm (267-0ubuntu1) natty; urgency=low
+
+ * New upstream release (LP: #677129):
+ + Minor formatting changes to ctlseqs.ms to simplify a script which
+ extracts the feature information
+ + Add docs-clean makefile rule
+ + Add copy-selection action (request by Timo Juhani Lindfors,
+ Debian #588785)
+ + Trim leading/trailing blanks from string used for "Selection" font-menu
+ data
+ + Trim leading/trailing blanks from color resource values
+ + Configure script improvements:
+ + Add workaround for removal of X11 dependency from Xt's package file
+ (report by Robert Hooker)
+ + Add workaround for removal of fontconfig dependency from Xft's package
+ file (report by Jeremy Huddleston)
+ + Add workaround for removal of Xmu dependency from Xaw's package file
+ (report by Jeremy Huddleston)
+ + Improve workaround in CF_X_TOOLKIT macro, checking for other possible
+ packages where Xt's dependencies may be given
+ + Prefer ${name:=value} to ${name-value}, since recent bash changes
+ break legacy support for that feature
+
+ -- Lorenzo De Liso <blackz@ubuntu.com> Wed, 24 Nov 2010 22:54:46 +0100
+
xterm (266-1) unstable; urgency=low
* New upstream release (Closes: #601103, yay for patience…):
@@ -58,6 +128,32 @@ xterm (264-1) unstable; urgency=low
-- Cyril Brulebois <kibi@debian.org> Thu, 14 Oct 2010 23:53:57 +0200
+xterm (261-1ubuntu3) maverick; urgency=low
+
+ * Remove setgid bit from the xterm binary (LP: #616100)
+
+ -- Mikhail Turov <groldster@gmail.com> Wed, 11 Aug 2010 16:09:30 +0100
+
+xterm (261-1ubuntu2) maverick; urgency=low
+
+ * debian/control: re-add libutempter-dev to Build-Depends,
+ it's in main now (LP: 616100)
+
+ -- Mikhail Turov <groldster@gmail.com> Tue, 10 Aug 2010 23:30:03 +0100
+
+xterm (261-1ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable (LP: #610628). Remaining Ubuntu changes:
+ - Revert the libutempter change because it's in universe. (LP: #539473)
+ - Enabled URL highlighting
+ - Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
+ when using uxterm, so that it displays utf8 directories in titles
+ properly. May cause issues with apps that use control sequences for
+ updating the xterm titlebar - users should use xterm or set utf8Title
+ to false in this case. (LP: #320388, #408496)
+
+ -- Mikhail Turov <groldster@gmail.com> Tue, 27 Jul 2010 23:18:26 +0100
+
xterm (261-1) unstable; urgency=low
* New upstream release
@@ -80,6 +176,19 @@ xterm (260-1) unstable; urgency=low
-- Julien Cristau <jcristau@debian.org> Fri, 25 Jun 2010 19:58:38 +0100
+xterm (259-1ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining Ubuntu changes:
+ - Revert the libutempter change because it's in universe. (LP: #539473)
+ - Enabled URL highlighting
+ - Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
+ when using uxterm, so that it displays utf8 directories in titles
+ properly. May cause issues with apps that use control sequences for
+ updating the xterm titlebar - users should use xterm or set utf8Title
+ to false in this case. (LP: #320388, #408496)
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 22:13:44 -0400
+
xterm (259-1) unstable; urgency=low
* README.Debian: drop obsolete content, including a link to the old Debian X
@@ -720,7 +829,7 @@ xterm (210-1) unstable; urgency=low
* Merge duplicate Provides fields
-- David Nusinow <dnusinow@debian.org> Mon, 13 Mar 2006 22:12:41 -0500
-
+
xterm (208-3.1) unstable; urgency=low
* Emergency NMU to fix queue/accepted breakage: s/Provides/Replaces/
diff --git a/debian/control b/debian/control
index ce258dc..4f44cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.4
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
+XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
+XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
Build-Depends:
libncurses5-dev | libncurses-dev,
@@ -18,6 +18,7 @@ Build-Depends:
quilt,
lynx-cur | lynx,
xorg-docs-core,
+ desktop-file-utils,
# Reasons for Build-Depends:
#
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bf94336..647ad42 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,2 @@
[DEFAULT]
-pristine-tar = True
-debian-branch = debian-unstable
-upstream-branch = upstream-unstable
-debian-tag = xterm-%(version)s
-upstream-tag = xterm-%(version)s
+debian-branch = ubuntu
diff --git a/debian/rules b/debian/rules
index 1726fa4..5c2beea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
--enable-narrowproto \
--enable-exec-xterm \
--enable-dabbrev \
+ --with-utempter \
$(confflags) \
DESKTOP_FLAGS="$(DESKTOP_FLAGS)" \
CFLAGS="$(CFLAGS)" \
@@ -92,7 +93,7 @@ install: build
dh_installdirs
# General installation
cd build && \
- $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBTREEDIR)
+ $(MAKE) install install-desktop mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBTREEDIR)
## Install lxterm command and manual page.
install -m 755 debian/local/lxterm $(DEBTREEDIR)/usr/bin
@@ -105,8 +106,6 @@ install: build
dh_installchangelogs
dh_installmenu
dh_install --sourcedir=debian/tmp --list-missing
- # Lintian overrides.
- cp debian/xterm.overrides $(CURDIR)/debian/xterm/usr/share/lintian/overrides/xterm
# Generate plain text XTerm FAQ from HTML.
debian/local/xterm.faq: debian/local/xterm.faq.html
@@ -122,8 +121,6 @@ binary-arch: install
dh_strip
dh_compress
dh_fixperms
- chown :utmp debian/xterm/usr/bin/xterm
- chmod g+s debian/xterm/usr/bin/xterm
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff --git a/debian/xterm.dirs b/debian/xterm.dirs
new file mode 100644
index 0000000..9ecda26
--- /dev/null
+++ b/debian/xterm.dirs
@@ -0,0 +1 @@
+usr/share/applications
diff --git a/debian/xterm.install b/debian/xterm.install
index e620391..f9b749b 100644
--- a/debian/xterm.install
+++ b/debian/xterm.install
@@ -1,4 +1,5 @@
etc/X11/app-defaults/*
usr/bin/*
+usr/share/applications/*
usr/share/man/man1/*
usr/share/pixmaps
commit 3490f0f112990bfa880f4fe1c334720db8b001d4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 23 13:55:50 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index c984e60..51ff142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (271-1) UNRELEASED; urgency=low
+xterm (271-1) unstable; urgency=low
* New upstream release
- amend change for Debian #110226 so that "-h" or "-v" options cause an
@@ -7,7 +7,7 @@ xterm (271-1) UNRELEASED; urgency=low
- handle special-case of KeyPress translated to popup-menu action
(LP: #756273)
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Jul 2011 13:35:06 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Jul 2011 13:55:37 +0200
xterm (270-1) unstable; urgency=low
commit cfacdcf69267606895809ef1a436fbe57cdef219
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 23 13:55:25 2011 +0200
Refresh patches
diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
index f8f3c9f..f108321 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -52,7 +52,7 @@ Index: xterm/terminfo
===================================================================
--- xterm.orig/terminfo
+++ xterm/terminfo
-@@ -955,6 +955,13 @@ xterm-basic|modern xterm terminal emulat
+@@ -981,6 +981,13 @@ xterm-basic|modern xterm terminal emulat
u8=\E[?1;2c,
u9=\E[c,
vpa=\E[%i%p1%dd,
@@ -66,7 +66,7 @@ Index: xterm/terminfo
#
# The xterm-new description has all of the features, but is not completely
# compatible with vt220. If you are using a Sun or PC keyboard, set the
-@@ -1393,7 +1400,7 @@ xterm-16color|xterm with 16 colors,
+@@ -1419,7 +1426,7 @@ xterm-16color|xterm with 16 colors,
setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm,
setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
@@ -75,7 +75,7 @@ Index: xterm/terminfo
#
# This uses RGB values 0..1000
#
-@@ -1408,7 +1415,7 @@ xterm-256color|xterm with 256 colors,
+@@ -1434,7 +1441,7 @@ xterm-256color|xterm with 256 colors,
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
setb@,
setf@,
@@ -84,7 +84,7 @@ Index: xterm/terminfo
xterm-88color|xterm with 88 colors,
colors#88,
pairs#7744,
-@@ -1935,5 +1942,6 @@ xterm-r5|xterm R5 version,
+@@ -1961,5 +1968,6 @@ xterm-r5|xterm R5 version,
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
@@ -96,7 +96,7 @@ Index: xterm/XTerm.ad
===================================================================
--- xterm.orig/XTerm.ad
+++ xterm/XTerm.ad
-@@ -155,6 +155,10 @@
+@@ -159,6 +159,10 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
diff --git a/debian/patches/902_windowops.diff b/debian/patches/902_windowops.diff
index c2e8a2d..8779c7c 100644
--- a/debian/patches/902_windowops.diff
+++ b/debian/patches/902_windowops.diff
@@ -2,7 +2,7 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -2173,8 +2173,9 @@ This is a comma-separated list of names,
+@@ -2249,8 +2249,9 @@ This is a comma-separated list of names,
from \fIdtterm\fP the operation number).
The default value is
.RS
@@ -11,5 +11,5 @@ Index: xterm/xterm.man
.RE
+(i.e. no operations are allowed).
.IP
- The names are listed below. \fIxterm\fP ignores capitalization, but
- they are shown in mixed-case for clarity. Where a number can be used
+ The names are listed below.
+ \fIxterm\fP ignores capitalization, but
diff --git a/debian/patches/904_fontops.diff b/debian/patches/904_fontops.diff
index 5042269..7f7769a 100644
--- a/debian/patches/904_fontops.diff
+++ b/debian/patches/904_fontops.diff
@@ -2,7 +2,7 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -1523,7 +1523,7 @@ The default is \*(``true.\*(''
+@@ -1590,7 +1590,7 @@ The default is \*(``true.\*(''
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
commit d8c08825d83e07dc45d0994507013fddb1fcadb6
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 23 13:39:33 2011 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 1bd7d55..c984e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xterm (271-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - amend change for Debian #110226 so that "-h" or "-v" options cause an
+ exit, rather than simply printing to stdout while the window is
+ displayed (closes: #629358)
+ - handle special-case of KeyPress translated to popup-menu action
+ (LP: #756273)
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Jul 2011 13:35:06 +0200
+
xterm (270-1) unstable; urgency=low
* New upstream release:
commit 5d85c8906d416e1e4cb556d6313585b16b83b814
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 23 13:34:19 2011 +0200
Imported Upstream version 271
diff --git a/INSTALL b/INSTALL
index 0cdf04a..028375a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.124 2011/04/22 09:30:55 tom Exp $
+-- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2010,2011 by Thomas E. Dickey
--
@@ -499,6 +499,11 @@ The options (in alphabetic order):
Look for, compile and link with the Xaw Plus widget library.
+ --with-app-class=XXX X resource class (default: XTerm)
+
+ Rename the X resource class, e.g., for packaging a development version
+ of xterm with different result names.
+
--with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults)
autoconf scripts assume that all of the files should be installed
diff --git a/Imakefile b/Imakefile
index 5bfaba7..f65c300 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.103 2011/02/19 13:09:15 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.104 2011/07/02 00:48:49 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -143,11 +143,14 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c
OSMINORVERSION = OSMinorVersion
#if defined(NTOArchitecture) || \
- defined(LinuxArchitecture) || \
defined(OpenBSDArchitecture) || \
defined(SGIArchitecture) || \
defined(SunArchitecture)
TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+#elif defined(LinuxArchitecture)
+# if LinuxUsesNcurses
+TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+# endif
#endif
#if !defined(OS2Architecture) && !defined(__GNU__)
diff --git a/MANIFEST b/MANIFEST
index 58226e8..757e8e0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-270, version xterm-270
+MANIFEST for xterm-271, version xterm-271
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -155,6 +155,7 @@ vttests/88colors2.pl sample script showing 88-colors
vttests/8colors.sh test-script to illustrate 8-colors
vttests/acolors.sh demonstrate changing the ANSI colors
vttests/doublechars.sh test script to demonstrate doublesize chars
+vttests/dynamic.pl demo for dynamic colors
vttests/dynamic.sh script to illustrate the dynamic colors control sequence
vttests/dynamic2.sh complete example of dynamic colors
vttests/fonts.sh script to demonstrate font-switching sequences
diff --git a/Makefile.in b/Makefile.in
index 69cc21d..e3b746c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.177 2011/04/22 08:51:33 tom Exp $
+## $XTermId: Makefile.in,v 1.181 2011/07/14 22:13:45 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -89,7 +89,7 @@ ICONDIR = $(DESTDIR)$(icondir)
INSTALL_DIRS = $(BINDIR) $(APPSDIR) $(ICONDIR) $(MANDIR)
-CLASS = XTerm
+CLASS = @APP_CLASS@
EXTRAHDR = @EXTRAHDRS@
EXTRASRC = @EXTRASRCS@
EXTRAOBJ = @EXTRAOBJS@
@@ -192,6 +192,8 @@ install-full :: xterm$x resize$x $(BINDIR)
@NOT_SETUID@ $(INSTALL_PROGRAM) xterm$x $(BINDIR)/$(binary_xterm)
$(INSTALL_PROGRAM) -m 755 resize$x $(BINDIR)/$(binary_resize)
+EDIT_SCRIPT = sed -e s,=xterm,=\$$name, -e s,XTerm,$(CLASS),
+
install \
install-bin \
install-scripts \
@@ -199,23 +201,15 @@ install-full ::
@$(SHELL) -c "name=\"$(binary_xterm)\"; \
dest=\"$(binary_uxterm)\"; \
echo \"... installing $(BINDIR)/\$$dest\"; \
- if test \"\$$name\" != \"xterm\"; then \
- sed -e \"s,=xterm,=\$$name,\" $(srcdir)/uxterm >uxterm.tmp; \
- $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/\$$dest; \
- rm -f uxterm.tmp; \
- else \
- $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/\$$dest; \
- fi"
+ $(EDIT_SCRIPT) $(srcdir)/uxterm >uxterm.tmp; \
+ $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/\$$dest; \
+ rm -f uxterm.tmp"
@$(SHELL) -c "name=\"$(binary_xterm)\"; \
dest=\"$(binary_k8term)\"; \
echo \"... installing $(BINDIR)/\$$dest\"; \
- if test \"\$$name\" != \"xterm\"; then \
- sed -e \"s,=xterm,=\$$name,\" $(srcdir)/koi8rxterm >k8term.tmp; \
- $(INSTALL_SCRIPT) -m 755 k8term.tmp $(BINDIR)/\$$dest; \
- rm -f k8term.tmp; \
- else \
- $(INSTALL_SCRIPT) -m 755 $(srcdir)/koi8rxterm $(BINDIR)/\$$dest; \
- fi"
+ $(EDIT_SCRIPT) $(srcdir)/koi8rxterm >k8term.tmp; \
+ $(INSTALL_SCRIPT) -m 755 k8term.tmp $(BINDIR)/\$$dest; \
+ rm -f k8term.tmp"
@-$(SHELL) -c "name=\"$(binary_xterm)\"; \
if test @XTERM_SYMLINK@ != NONE ; then \
cd $(BINDIR) && ( \
@@ -258,10 +252,10 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm
@no_icondir@install \
@no_icondir@install-icon \
@no_icondir@install-full :: $(ICONDIR)
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_32x32.xpm $(ICONDIR)
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_48x48.xpm $(ICONDIR)
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_32x32.xpm $(ICONDIR)
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_48x48.xpm $(ICONDIR)
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_32x32.xpm $(ICONDIR)/$(actual_xterm)-color_32x32.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm-color_48x48.xpm $(ICONDIR)/$(actual_xterm)-color_48x48.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_32x32.xpm $(ICONDIR)/$(actual_xterm)_32x32.xpm
+@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm_48x48.xpm $(ICONDIR)/$(actual_xterm)_48x48.xpm
@no_icondir@ @echo "... installed icons"
install ::
@@ -321,17 +315,17 @@ uninstall-full ::
@no_icondir@uninstall \
@no_icondir@uninstall-icon \
@no_icondir@uninstall-full ::
-@no_icondir@ -$(RM) $(ICONDIR)/xterm-color_32x32.xpm
-@no_icondir@ -$(RM) $(ICONDIR)/xterm_32x32.xpm
-@no_icondir@ -$(RM) $(ICONDIR)/xterm-color_48x48.xpm
-@no_icondir@ -$(RM) $(ICONDIR)/xterm_48x48.xpm
+@no_icondir@ -$(RM) $(ICONDIR)/$(actual_xterm)-color_32x32.xpm
+@no_icondir@ -$(RM) $(ICONDIR)/$(actual_xterm)_32x32.xpm
+@no_icondir@ -$(RM) $(ICONDIR)/$(actual_xterm)-color_48x48.xpm
+@no_icondir@ -$(RM) $(ICONDIR)/$(actual_xterm)_48x48.xpm
################################################################################
# Desktop-utils does not provide an uninstall, and is not uniformly available.
@desktop_utils@DESKTOP_FLAGS = @DESKTOP_FLAGS@
@desktop_utils@install-desktop \
@desktop_utils@install-full ::
-@desktop_utils@ $(SHELL) df-install $(DESKTOP_FLAGS) $(srcdir)/xterm.desktop
-@desktop_utils@ $(SHELL) df-install $(DESKTOP_FLAGS) $(srcdir)/uxterm.desktop
+@desktop_utils@ $(SHELL) df-install $(actual_xterm) $(DESKTOP_FLAGS) $(srcdir)/xterm.desktop
+@desktop_utils@ $(SHELL) df-install $(actual_xterm) $(DESKTOP_FLAGS) $(srcdir)/uxterm.desktop
################################################################################
mostlyclean :
-$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
@@ -341,7 +335,7 @@ clean : mostlyclean
distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
-@desktop_utils@ -$(RM) df-install
+ -$(RM) df-install
distclean \
docs-clean ::
diff --git a/Tekproc.c b/Tekproc.c
index 57eaa02..f07831e 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.188 2011/02/20 00:55:33 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.189 2011/07/10 22:19:32 tom Exp $ */
/*
* Copyright 2001-2010,2011 by Thomas E. Dickey
@@ -1895,7 +1895,7 @@ TekCopy(TekWidget tw)
TScreen *screen = TScreenOf(xw);
TekLink *Tp;
- char buf[32];
+ char buf[TIMESTAMP_LEN + 10];
char initbuf[5];
int tekcopyfd;
diff --git a/XTerm.ad b/XTerm.ad
index 8d34dd0..b127798 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.96 2011/04/22 22:48:00 tom Exp $
+! $XTermId: XTerm.ad,v 1.97 2011/07/11 10:52:16 tom Exp $
! -----------------------------------------------------------------------------
! this file is part of xterm
!
@@ -48,6 +48,8 @@
*mainMenu*allowsends*Label: Allow SendEvents
*mainMenu*redraw*Label: Redraw Window
*mainMenu*logging*Label: Log to File
+*mainMenu*print-immediate*Label: Print-All Immediately
+*mainMenu*print-on-error*Label: Print-All on Error
*mainMenu*print*Label: Print Window
*mainMenu*print-redir*Label: Redirect to Printer
*mainMenu*8-bit control*Label: 8-Bit Controls
diff --git a/aclocal.m4 b/aclocal.m4
index 110642c..9f3625a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.301 2011/04/22 09:18:49 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.309 2011/07/14 23:36:54 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -58,6 +58,31 @@ AC_DEFUN([AM_LANGINFO_CODESET],
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03
+dnl ------------------
+dnl Conditionally generate script according to whether we're using a given autoconf.
+dnl
+dnl $1 = version to compare against
+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+dnl $3 = code to use if AC_ACVERSION is older than $1.
+define(CF_ACVERSION_CHECK,
+[
+ifdef([m4_version_compare],
+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
+[CF_ACVERSION_COMPARE(
+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50
+dnl --------------------
+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
+dnl MAJOR2, MINOR2, TERNARY2,
+dnl PRINTABLE2, not FOUND, FOUND)
+define(CF_ACVERSION_COMPARE,
+[ifelse(builtin([eval], [$2 < $5]), 1,
+[ifelse([$8], , ,[$8])],
+[ifelse([$9], , ,[$9])])])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
@@ -175,12 +200,33 @@ LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/ / /
CF_VERBOSE(...after $LIBS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
+dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
dnl ----------------
-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
-dnl in the sharutils 4.2 distribution.
+dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
+dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
AC_DEFUN([CF_ANSI_CC_CHECK],
[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+# into CC. This will not help with broken scripts that wrap the compiler with
+# options, but eliminates a more common category of user confusion.
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \ ]]-[[IUD]]*)
+ AC_MSG_RESULT(broken)
+ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'`
+ CC=`echo "$CC" | sed -e 's/[[ ]].*//'`
+ CF_ADD_CFLAGS($cf_flags)
+ ;;
+*)
+ AC_MSG_RESULT(ok)
+ ;;
+esac
+
AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
cf_cv_ansi_cc=no
cf_save_CFLAGS="$CFLAGS"
@@ -528,7 +574,7 @@ int main() {
fi
])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_TGETENT version: 15 updated: 2010/06/04 20:54:56
+dnl CF_FUNC_TGETENT version: 17 updated: 2011/07/14 19:34:47
dnl ---------------
dnl Check for tgetent function in termcap library. If we cannot find this,
dnl we'll use the $LINES and $COLUMNS environment variables to pass screen
@@ -545,7 +591,17 @@ AC_DEFUN([CF_FUNC_TGETENT],
# necessarily in /etc/termcap - unsetenv is not portable, so we cannot simply
# discard $TERMCAP.
cf_TERMVAR=vt100
-test -n "$TERMCAP" && cf_TERMVAR="$TERM"
+if test -n "$TERMCAP"
+then
+ cf_TERMCAP=`echo "$TERMCAP" | tr '\n' ' ' | sed -e 's/^..|//' -e 's/|.*//'`
+ case "$cf_TERMCAP" in #(vi
+ screen*.*) #(vi
+ ;;
+ *)
+ cf_TERMVAR="$cf_TERMCAP"
+ ;;
+ esac
+fi
test -z "$cf_TERMVAR" && cf_TERMVAR=vt100
AC_MSG_CHECKING(if we want full tgetent function)
@@ -602,8 +658,8 @@ LIBS="$cf_save_LIBS"
# (LIBS cannot be set inside AC_CACHE_CHECK; the commands there should
# not have side effects other than setting the cache variable, because
# they are not executed when a cached value exists.)
-if test "$cf_cv_lib_tgetent" != no ; then
- test "$cf_cv_lib_tgetent" != yes && CF_ADD_LIBS($cf_cv_lib_tgetent)
+if test "x$cf_cv_lib_tgetent" != xno ; then
+ test "x$cf_cv_lib_tgetent" != xyes && CF_ADD_LIBS($cf_cv_lib_tgetent)
AC_DEFINE(USE_TERMCAP)
if test "$cf_full_tgetent" = no ; then
AC_TRY_COMPILE([
@@ -1163,7 +1219,7 @@ AC_TRY_COMPILE([
test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
+dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13
dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature.
@@ -1184,7 +1240,7 @@ irix*) #(vi
linux*|gnu*|k*bsd*-gnu) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
-openbsd[[2-9]].*) #(vi
+openbsd[[2-9]].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
freebsd*) #(vi
@@ -1386,7 +1442,7 @@ case ".[$]$1" in #(vi
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 6 updated: 2011/04/17 06:36:21
+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
AC_DEFUN([CF_PKG_CONFIG],
@@ -1403,7 +1459,9 @@ no) #(vi
PKG_CONFIG=none
;;
yes) #(vi
- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
+ CF_ACVERSION_CHECK(2.52,
+ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
+ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
;;
*)
PKG_CONFIG=$withval
@@ -2341,6 +2399,19 @@ if test $cf_cv_type_fd_set = sys/select.h ; then
fi
])
dnl ---------------------------------------------------------------------------
+dnl CF_UNDO_CFLAGS version: 1 updated: 2011/07/02 09:27:51
+dnl --------------
+dnl Remove flags from $CFLAGS or similar shell variable using sed.
+dnl $1 = variable
+dnl $2 = message
+dnl $3 = pattern to remove
+AC_DEFUN([CF_UNDO_CFLAGS],
+[
+ CF_VERBOSE(removing $2 flags from $1)
+ $1=`echo "[$]$1" | sed -e 's/$3//'`
+ CF_VERBOSE(...result [$]$1)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
dnl --------
dnl Make an uppercase version of a variable
@@ -2642,6 +2713,37 @@ AC_DEFUN([CF_VERBOSE],
CF_MSG_LOG([$1])
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WITH_APP_CLASS version: 1 updated: 2011/07/08 04:54:40
+dnl -----------------
+dnl Handle configure option "--with-app-class", setting the $APP_CLASS
+dnl variable, used for X resources.
+dnl
+dnl $1 = default value.
+AC_DEFUN(CF_WITH_APP_CLASS,[
+AC_MSG_CHECKING(for X applications class)
+AC_ARG_WITH(app-class,
+ [ --with-app-class=XXX override X applications class (default $1)],
+ [APP_CLASS=$withval],
+ [APP_CLASS=$1])
+
+case x$APP_CLASS in #(vi
+*[[/@,%]]*) #(vi
+ AC_MSG_WARN(X applications class cannot contain punctuation)
+ APP_CLASS=$1
+ ;;
+x[[A-Z]]*) #(vi
+ ;;
+*)
+ AC_MSG_WARN([X applications class must start with capital, ignoring $APP_CLASS])
+ APP_CLASS=$1
+ ;;
+esac
+
+AC_MSG_RESULT($APP_CLASS)
+
+AC_SUBST(APP_CLASS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_APP_DEFAULTS version: 1 updated: 2011/04/21 18:12:37
dnl --------------------
dnl Handle configure option "--with-app-defaults", setting these shell
@@ -2662,7 +2764,7 @@ test "$appsdir" = no && no_appsdir="#"
AC_SUBST(no_appsdir)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_DESKTOP_CATEGORY version: 1 updated: 2011/04/22 05:17:37
+dnl CF_WITH_DESKTOP_CATEGORY version: 2 updated: 2011/07/02 10:22:07
dnl ------------------------
dnl Taking into account the absence of standardization of desktop categories
dnl take a look to see whether other applications on the current system are
@@ -2724,7 +2826,7 @@ then
read cf_desktop_this
test -z "$cf_desktop_this" && break
case $cf_desktop_this in #(vi
- Qt|GTK|KDE|GNOME) #(vi
+ Qt*|GTK*|KDE*|GNOME*|*XFCE*|*Xfce*) #(vi
;;
$3)
test "x$cf_desktop_last" != "x$cf_desktop_this" && echo $cf_desktop_this >>conftest.2
@@ -2916,7 +3018,7 @@ AC_TRY_LINK([
test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT)
])
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
+dnl CF_XOPEN_SOURCE version: 36 updated: 2011/07/02 15:36:04
dnl ---------------
Reply to: