xterm: Changes to 'upstream-unstable'
KOI8RXTerm.ad | 6 ++--
Makefile.in | 85 +++++++++++++++++++++++++++++++++++++++++----------------
UXTerm.ad | 6 ++--
minstall.sh | 18 ++++++------
misc.c | 4 +-
sinstall.sh | 6 ++--
uxterm.desktop | 4 +-
version.h | 4 +-
xterm.desktop | 4 +-
xterm.log.html | 34 ++++++++++++++++++++++
xterm.man | 4 --
11 files changed, 122 insertions(+), 53 deletions(-)
New commits:
commit a471970d5942b416c57ae26b79bf14875872a874
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 7 11:34:16 2010 +0100
Import xterm 256
diff --git a/KOI8RXTerm.ad b/KOI8RXTerm.ad
index 296bf51..acc82d2 100644
--- a/KOI8RXTerm.ad
+++ b/KOI8RXTerm.ad
@@ -1,8 +1,8 @@
-! $XTermId: KOI8RXTerm.ad,v 1.3 2007/12/30 15:49:14 tom Exp $
+! $XTermId: KOI8RXTerm.ad,v 1.4 2010/03/04 01:17:49 tom Exp $
! -----------------------------------------------------------------------------
! this file is part of xterm
!
-! Copyright 2007 by Thomas E. Dickey
+! Copyright 2007,2010 by Thomas E. Dickey
!
! All Rights Reserved
!
@@ -36,7 +36,7 @@
! xterm -class KOI8RXTerm
! to set resources for KOI8-R mode with corresponding fonts.
-#include "XTerm-color"
+#include "XTerm"
*fontMenu.Label: KOI8-R Fonts
*VT100*allowC1Printable: true
diff --git a/Makefile.in b/Makefile.in
index 46c3f54..07b1f74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,11 @@
-## $XTermId: Makefile.in,v 1.165 2010/01/04 21:40:47 tom Exp $
+## $XTermId: Makefile.in,v 1.170 2010/03/04 02:03:33 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
# Copyright 1997-2009,2010 by Thomas E. Dickey
-#
+#
# All Rights Reserved
-#
+#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
@@ -13,10 +13,10 @@
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
-#
+#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -24,7 +24,7 @@
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
+#
# Except as contained in this notice, the name(s) of the above copyright
# holders shall not be used in advertising or otherwise to promote the
# sale, use or other dealings in this Software without prior written
@@ -226,21 +226,22 @@ install-full :: $(MANDIR)
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
+APP_NAMES = XTerm UXTerm KOI8RXTerm
+
@no_appsdir@install \
@no_appsdir@install-app \
@no_appsdir@install-full :: $(APPSDIR)
-@no_appsdir@ @echo installing $(APPSDIR)/$(CLASS)
-@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm.ad >XTerm.tmp
-@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)
-@no_appsdir@ @echo installing $(APPSDIR)/$(CLASS)-color
-@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm-col.ad >XTerm.tmp
-@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color
-@no_appsdir@ @echo installing $(APPSDIR)/UXTerm
-@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp
-@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm
-@no_appsdir@ @echo installing $(APPSDIR)/KOI8RXTerm
-@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/KOI8RXTerm.ad >XTerm.tmp
-@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/KOI8RXTerm
+@no_appsdir@ @-$(SHELL) -c 'for s in $(APP_NAMES); \
+@no_appsdir@ do \
+@no_appsdir@ echo "** $$s"; \
+@no_appsdir@ d=`echo $$s | sed -e s/XTerm/$(CLASS)/`; \
+@no_appsdir@ echo installing $(APPSDIR)/$$d; \
+@no_appsdir@ sed -e s/XTerm/$(CLASS)/ $(srcdir)/$$s.ad >XTerm.tmp; \
+@no_appsdir@ $(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$$d; \
+@no_appsdir@ echo installing $(APPSDIR)/$$d-color; \
+@no_appsdir@ sed -e s/XTerm/$$d/ $(srcdir)/XTerm-col.ad >XTerm.tmp; \
+@no_appsdir@ $(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$$d-color; \
+@no_appsdir@ done'
@no_appsdir@ @rm -f XTerm.tmp
@no_icondir@ @echo "... installed app-defaults"
@@ -297,9 +298,15 @@ uninstall-full ::
@no_appsdir@uninstall \
@no_appsdir@uninstall-app \
@no_appsdir@uninstall-full ::
-@no_appsdir@ -$(RM) $(APPSDIR)/$(CLASS)
-@no_appsdir@ -$(RM) $(APPSDIR)/$(CLASS)-color
-@no_appsdir@ -$(RM) $(APPSDIR)/UXTerm
+@no_appsdir@ @-$(SHELL) -c 'for s in $(APP_NAMES); \
+@no_appsdir@ do \
+@no_appsdir@ echo "** $$s"; \
+@no_appsdir@ d=`echo $$s | sed -e s/XTerm/$(CLASS)/`; \
+@no_appsdir@ echo uninstalling $(APPSDIR)/$$d; \
+@no_appsdir@ $(RM) $(APPSDIR)/$$d; \
+@no_appsdir@ echo uninstalling $(APPSDIR)/$$d-color; \
+@no_appsdir@ $(RM) $(APPSDIR)/$$d-color; \
+@no_appsdir@ done'
@no_icondir@uninstall \
@no_icondir@uninstall-icon \
@@ -325,8 +332,10 @@ clean : mostlyclean
distclean : clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
-$(RM) *.ps *.pdf *.png
- -$(RM) xterm.html xterm.$(manext) xterm.txt
- -$(RM) resize.html resize.$(manext) resize.txt
+ -$(SHELL) -c 'for p in xterm resize uxterm koi8rxterm; \
+ do \
+ $(RM) $$p.html $$p.$(manext) $$p.txt; \
+ done'
-$(RM) ctlseqs.html ctlseqs.$(manext)
realclean : distclean
@@ -338,21 +347,51 @@ maintainer-clean : realclean
terminfo.out : terminfo ; tic -a -I -1 terminfo >$@
termcap.out : termcap ; tic -a -C -U termcap >$@
################################################################################
+docs :: ctlseqs.html \
+ ctlseqs.pdf \
+ ctlseqs.ps \
+ ctlseqs.txt
ctlseqs.html : ctlseqs.ms
ctlseqs.pdf : ctlseqs.ps
ctlseqs.ps : ctlseqs.ms
ctlseqs.txt : ctlseqs.ms
################################################################################
+docs :: resize.html \
+ resize.pdf \
+ resize.ps \
+ resize.txt
resize.html : resize.$(manext)
resize.pdf : resize.ps
resize.ps : resize.$(manext)
resize.txt : resize.$(manext)
################################################################################
+docs :: xterm.html \
+ xterm.pdf \
+ xterm.ps \
+ xterm.txt
xterm.html : xterm.$(manext)
xterm.pdf : xterm.ps
xterm.ps : xterm.$(manext)
xterm.txt : xterm.$(manext)
################################################################################
+docs :: uxterm.html \
+ uxterm.pdf \
+ uxterm.ps \
+ uxterm.txt
+uxterm.html : uxterm.$(manext)
+uxterm.pdf : uxterm.ps
+uxterm.ps : uxterm.$(manext)
+uxterm.txt : uxterm.$(manext)
+################################################################################
+docs :: koi8rxterm.html \
+ koi8rxterm.pdf \
+ koi8rxterm.ps \
+ koi8rxterm.txt
+koi8rxterm.html : koi8rxterm.$(manext)
+koi8rxterm.pdf : koi8rxterm.ps
+koi8rxterm.ps : koi8rxterm.$(manext)
+koi8rxterm.txt : koi8rxterm.$(manext)
+################################################################################
lint :
$(LINT) $(CPPFLAGS) $(SRCS1)
$(LINT) $(CPPFLAGS) $(SRCS2)
diff --git a/UXTerm.ad b/UXTerm.ad
index 74597ae..a2cca85 100644
--- a/UXTerm.ad
+++ b/UXTerm.ad
@@ -1,8 +1,8 @@
-! $XTermId: UXTerm.ad,v 1.12 2006/02/13 01:14:58 tom Exp $
+! $XTermId: UXTerm.ad,v 1.13 2010/03/04 01:17:07 tom Exp $
! -----------------------------------------------------------------------------
! this file is part of xterm
!
-! Copyright 2000-2005,2006 by Thomas E. Dickey
+! Copyright 2000-2006,2010 by Thomas E. Dickey
!
! All Rights Reserved
!
@@ -35,7 +35,7 @@
! to set resources for UTF-8 mode with corresponding fonts.
! See the uxterm script for an example.
-#include "XTerm-color"
+#include "XTerm"
*fontMenu.Label: Unicode Fonts
*VT100.utf8: 1
diff --git a/minstall.sh b/minstall.sh
index 61bf778..8c94219 100755
--- a/minstall.sh
+++ b/minstall.sh
@@ -1,12 +1,12 @@
#!/bin/sh
-# $XTermId: minstall.sh,v 1.19 2010/01/20 10:55:42 tom Exp $
+# $XTermId: minstall.sh,v 1.20 2010/03/03 23:44:49 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
# Copyright 2001-2009,2010 by Thomas E. Dickey
-#
+#
# All Rights Reserved
-#
+#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
@@ -14,10 +14,10 @@
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
-#
+#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -25,7 +25,7 @@
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
+#
# Except as contained in this notice, the name(s) of the above copyright
# holders shall not be used in advertising or otherwise to promote the
# sale, use or other dealings in this Software without prior written
@@ -74,9 +74,9 @@ MY_MANSECT=$suffix
# are only a few common choices. Note that they may not necessarily appear
# in the same directories. Prefer utmpx/wtmpx to utmp/wtmp, since that's
# the way the configure script is designed.
-UTMP_NAME=utmp22
+UTMP_NAME=utmp
UTMP_PATH=/etc
-for name in /etc /var/adm /var/log
+for name in /etc /var/adm /var/run /var/log
do
if test -f $name/utmpx ; then
UTMP_NAME=utmpx
@@ -91,7 +91,7 @@ UTMP_PATH=$UTMP_PATH/$UTMP_NAME
WTMP_NAME=wtmp
WTMP_PATH=/etc
-for name in /etc /var/adm /var/log
+for name in /etc /var/adm /var/run /var/log
do
if test -f $name/wtmpx ; then
WTMP_NAME=wtmpx
diff --git a/misc.c b/misc.c
index 20a66e4..b384a21 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.482 2010/01/21 09:34:58 tom Exp $ */
+/* $XTermId: misc.c,v 1.483 2010/03/03 22:32:26 Chris.Adams Exp $ */
/*
*
@@ -800,7 +800,7 @@ AtomBell(XtermWidget xw, int which)
for (n = 0; n < XtNumber(table); ++n) {
if (table[n].value == which) {
- result = XInternAtom(XtDisplay(xw), table[n].name, True);
+ result = XInternAtom(XtDisplay(xw), table[n].name, False);
break;
}
}
diff --git a/sinstall.sh b/sinstall.sh
index 50a0312..fa85ec7 100755
--- a/sinstall.sh
+++ b/sinstall.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-# $XTermId: sinstall.sh,v 1.17 2008/03/02 23:35:02 tom Exp $
+# $XTermId: sinstall.sh,v 1.18 2010/03/06 16:19:13 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
-# Copyright 1999-2006,2008 by Thomas E. Dickey
+# Copyright 1999-2008,2010 by Thomas E. Dickey
#
# All Rights Reserved
#
@@ -159,7 +159,7 @@ elif test -f "$REF_PROG" ; then
PROG_USR=
;;
esac
- PROG_MODE=`echo ".$cf_mode" | sed -e 's/^..//' -e 's/rw./7/g' -e 's/r-./5/g' -e 's/---/0/g' -e 's/--[sxt]/1/g' -e 's/+//g'`
+ PROG_MODE=`echo ".$cf_mode" | sed -e 's/^..//' -e 's/rw./7/g' -e 's/r-./5/g' -e 's/---/0/g' -e 's/--[sxt]/1/g' -e 's/[^0-7]//g'`
fi
# passed-in options override the reference
diff --git a/uxterm.desktop b/uxterm.desktop
index ddb1f1b..f2b50db 100644
--- a/uxterm.desktop
+++ b/uxterm.desktop
@@ -1,4 +1,4 @@
-# $XTermId: uxterm.desktop,v 1.7 2007/12/30 15:09:12 tom Exp $
+# $XTermId: uxterm.desktop,v 1.8 2010/03/05 09:51:58 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -38,4 +38,4 @@ Terminal=false
Type=Application
Encoding=UTF-8
Icon=xterm-color_48x48
-Categories=System;
+Categories=System;TerminalEmulator;
diff --git a/version.h b/version.h
index fd71bad..914a7f8 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.313 2010/01/20 01:39:08 tom Exp $
+ * $XTermId: version.h,v 1.314 2010/03/03 22:23:14 tom Exp $
* ----------------------------------------------------------------------------
* this file is part of xterm
*
@@ -39,7 +39,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 255
+#define XTERM_PATCH 256
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.desktop b/xterm.desktop
index a32fc85..483ac68 100644
--- a/xterm.desktop
+++ b/xterm.desktop
@@ -1,4 +1,4 @@
-# $XTermId: xterm.desktop,v 1.8 2007/12/30 15:09:12 tom Exp $
+# $XTermId: xterm.desktop,v 1.9 2010/03/06 16:17:35 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -38,4 +38,4 @@ Terminal=false
Type=Application
Encoding=UTF-8
Icon=xterm-color_48x48
-Categories=System;
+Categories=System;TerminalEmulator;
diff --git a/xterm.log.html b/xterm.log.html
index 055cce4..c45eb7d 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.906 2010/01/22 01:00:37 tom Exp $
+ $XTermId: xterm.log.html,v 1.913 2010/03/07 00:55:04 tom Exp $
-->
<HTML>
<HEAD>
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_256">Patch #256 - 2010/3/6</A>
<LI><A HREF="#xterm_255">Patch #255 - 2010/1/21</A>
<LI><A HREF="#xterm_254">Patch #254 - 2010/1/6</A>
<LI><A HREF="#xterm_253">Patch #253 - 2009/12/10</A>
@@ -314,6 +315,37 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_256">Patch #256 - 2010/3/6</A></H1>
+<ul>
+ <li>add TerminalEmulator to desktop category files.
+
+ <li>modify <code>sinstall.sh</code> to ignore the "." appended to
+ permissions by selinux.
+
+ <li>change app-defaults organization, installing UXTerm-color
+ and KOI8XTerm-color for consistent behavior regarding
+ <code>customization: color</code> (prompted by discussion
+ in Ubuntu #421261).
+
+ <li>fix typo in <code>minstall.sh</code> from
+ <a href="#xterm_255">patch #255</a> changes,
+ and add case for
+ <code>/var/run</code> needed for full path of utmp
+ (report by Julien Cristau).
+
+ <li>minor fix to xterm manpage, remove a comment stating that margin
+ bell can be changed via the VT Options menu. That was replaced in
+ <a href="#xterm_225">patch #225</a>
+
+ <li>add a "docs" rule to makefile.
+
+ <li>fix initialization of Atom used for <code>XkbBell</code> feature
+ from <a href="#xterm_243">patch 243</a> changes.
+ Unlike the other calls to <code>XInternAtom()</code>,
+ in this case the flag telling X to create the Atom was unset
+ (patch by Chris Adams).
+</ul>
+
<H1><A NAME="xterm_255">Patch #255 - 2010/1/21</A></H1>
<ul>
<li>rename <code>install.sh</code> to <code>install-sh</code> in case
diff --git a/xterm.man b/xterm.man
index 015d1e7..c1a37c0 100644
--- a/xterm.man
+++ b/xterm.man
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.451 2010/01/20 10:55:58 tom Exp $
+.\" $XTermId: xterm.man,v 1.452 2010/03/03 22:30:35 tom Exp $
.\"
.\" Copyright 1996-2009,2010 by Thomas E. Dickey
.\"
@@ -725,8 +725,6 @@ shell (i.e., it will be a normal \*(``subshell\*('').
.B -mb
This option indicates that \fIxterm\fP should ring a margin bell when
the user types near the right end of a line.
-This option can be turned on
-and off from the \*(``VT Options\*('' menu.
.TP 8
.B +mb
This option indicates that margin bell should not be rung.
Reply to: