xterm: Changes to 'upstream-unstable'
INSTALL | 71 MANIFEST |3 Makefile.in |4 NEWS | 149 + VTPrsTbl.c | 12 aclocal.m4 | 107 + button.c | 14 charproc.c | 251 ++- charsets.c | 50 config.guess | 101 - config.sub | 46 configure| 3884 +-- configure.in | 87 - ctlseqs.ms | 109 - ctlseqs.txt | 268 +-- data.c | 11 data.h |4 error.h | 30 fontutils.c | 414 - fontutils.h |3 graphics_regis.c | 27 html.c | 38 linedata.c | 95 - main.c | 328 +-- menu.c | 45 misc.c | 318 ++- package/debian/changelog |6 package/debian/copyright | 24 package/debian/rules |3 package/debian/watch |2 package/freebsd/Makefile |8 package/xterm.spec |9 print.c | 69 ptyx.h | 145 + resize.man |7 screen.c | 22 scrollbar.c | 34 svg.c| 41 termcap | 11 terminfo | 108 + trace.c | 29 trace.h |8 util.c | 99 - version.h|6 vttests/query-status.pl | 18 xcharmouse.h |3 xstrings.c |4 xterm.h | 38 xterm.log.html | 243 ++ xterm.man| 564 -- xtermcfg.hin |5 51 files changed, 4961 insertions(+), 3014 deletions(-) New commits: commit 3349eff7f9c4b029ffd0d46ed750d6391fe20a61 Author: Sven Joachim Date: Sun Dec 31 09:14:42 2017 +0100 Imported Upstream version 331 diff --git a/INSTALL b/INSTALL index 188bac3..0a768b2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.163 2017/05/30 08:32:35 tom Exp $ +-- $XTermId: INSTALL,v 1.176 2017/12/25 12:48:26 tom Exp $ --- -- Copyright 1997-2016,2017 by Thomas E. Dickey -- @@ -49,6 +49,16 @@ the sense of the default behavior. The options (in alphabetic order): + --disable-256-color disable 256-color support + + Do not compile-in code that interprets SGR 38 and 48 for 256-colors. + If this feature is disabled, the 88-color feature will be used. + + --disable-88-color disable 88-color support + + Do not compile-in code that interprets SGR 38 and 48 for 88-colors. + The 256-color option overrides this. + --disable-16-color disable 16-color support Do not compile-in code to recognize aixterm-style control sequences @@ -137,6 +147,11 @@ The options (in alphabetic order): Note: If desktop-utils is not found they will not be installed anyway. + --disable-direct-color disable direct color support + + Do not compile-in code that interprets SGR 38 and 48 for direct colors. + This feature extends the 256-color feature. + --disable-doublechars disable support for double-size chars Do not compile-in code that supports font-manipulation needed to @@ -156,7 +171,7 @@ The options (in alphabetic order): --disable-freetype disable freetype library-support - Do not use freetype libraries if they are found. Normally they will + Do not use freetype libraries if they are found. Normally they will be used automatically. --disable-full-tgetent disable check for termcap library @@ -285,6 +300,10 @@ The options (in alphabetic order): Do not compile-in code that suppresses redundant updates to the titlebar when the text has not changed. + --disable-screen-dumps disable XHTML and SVG screen dumps + + Do not compile-in code that provides XHTML and SVG screen dumps. + --disable-selection-ops disable selection operations Do not compile-in code to support the actions which allow users @@ -345,7 +364,7 @@ The options (in alphabetic order): ISO 6429 defines a few more which historically have found little use. Some people find these amusing. - This is normally enabled. + This is normally enabled. The direct-colors feature relies upon it. --disable-wide-charsdisable wide-character support @@ -365,14 +384,6 @@ The options (in alphabetic order): This uses less memory, but is less complete. However, most languages are covered by the 16-bit encoding. - --enable-256-color enable 256-color support - - Compile-in code that interprets SGR 38 and 48 for 256-colors. - - --enable-88-color enable 88-color support - - Co
xterm: Changes to 'upstream-unstable'
MANIFEST |2 NEWS | 161 +--- charproc.c | 185 - ctlseqs.ms | 50 ++ ctlseqs.txt | 40 +- fontutils.c | 169 ++--- fontutils.h |9 graphics.c | 18 graphics_regis.c | 870 +++ main.c |2 misc.c |4 package/debian/changelog | 12 package/freebsd/Makefile |2 package/xterm.spec |4 print.c |4 ptydata.c|6 trace.c |4 util.c | 32 - version.h|6 wcwidth.c| 628 ++--- wcwidth.h| 33 + xstrings.c | 20 - xterm.log.html | 148 +++ xterm.man|7 24 files changed, 1696 insertions(+), 720 deletions(-) New commits: commit 44287d929208662c177f7b123b7af447669252f9 Author: Sven Joachim Date: Thu Jun 22 19:11:05 2017 +0200 Imported Upstream version 330 diff --git a/MANIFEST b/MANIFEST index e3ef41e..d4d4430 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-329, version xterm-329 +MANIFEST for xterm-330, version xterm-330 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/NEWS b/NEWS index 6bdc013..7022694 100644 --- a/NEWS +++ b/NEWS @@ -1,44 +1,38 @@ The NEWS file was generated from xterm.log.html, which serves as the changelog for xterm. -Patch #329 - 2017/06/12 +Patch #330 - 2017/06/20 - * add control sequences for reading the Sixel and ReGIS graphics - sizes (suggested by Ben Wong). - * add a workaround for wcwidth returning -1 for characters which - should have been printable (FreeBSD #219800). - * fix a bug in font initialization from patch #328 (FreeBSD #219800). - * fix a special case in HideCursor which assigned a bold font to the - slot used for normal font in changes for italics in patch #307 - (Debian #858304). * updates for ReGIS (Ross Combs): - + Strings specified with no command are used as "comments". -Print these in the log when tracing. - + Catch attempts to use "alternate display" mode (AKA "blink") -from the GIGI, but do not implement it. - + The T(M) command should only multiply the height by 10, not -20. - + Make the S(E) command reset more state than just the screen -contents. - + Remove two rotation variables which were only being printed. - + Numerous minor fixes and comment updates in the R command. - + Unknown R command option names trigger an empty response. - + Fix the output position after printing rotated text (it was -missing the the sign before). - + Fix the position change with pixelvectors and rotated text -(the rotation transform was not being applied). - + Update the TODO list and remove a verification FIXME (slanted -text positioning is correct as is). - + Emulate the approximately 1.4x enlargement for text which -isn't rotated at right angles. - + Only update the color planes specified in the plane mask (the -W command's F option). - * fix a bug introduced by the changes to font information in patch - #328. When processing the "checkfont" option of the locale - resource, the program referred to the request data, to an array - which was only allocated in the new/result widget (report by H - Merijn Brand). - * fix a missing assignment initialization to make the utf8 resource - control whether escape sequences to enable/disable UTF-8 mode are - allowed. + + remove redundant text command error check which broke T(B) and +T(E). + + retain the loading alphabet number across multiple “L” +commands. + + add S(T) delay handler. + + fix some color handling error messages. + + add stubbed-out macrograph handling. + + use fragment_remaining() and fragment_consumed() instead of +manually checking position / length in various places. + + rename some local variables in string / extent / option +parsing + + wrap some long lines. + + move macrograph command handling out of the top-level. + * add a summary of the italic fonts loaded to -report-fonts option. + * modify t
xterm: Changes to 'upstream-unstable'
INSTALL | 13 MANIFEST |2 Makefile.in |6 NEWS | 147 + THANKS|9 Tekproc.c | 514 ++-- XTerm.ad |3 aclocal.m4| 87 button.c | 359 ++ cachedGCs.c | 12 charclass.c | 101 charclass.h |6 charproc.c| 949 --- config.guess | 133 - config.sub| 47 configure | 5139 -- configure.in | 20 ctlseqs.ms| 111 ctlseqs.txt | 96 cursor.c |9 data.h|9 doublechr.c | 23 fontutils.c | 1424 --- fontutils.h | 46 graphics_regis.c | 222 + html.c|6 input.c |6 main.c| 129 - main.h| 12 menu.c| 52 menu.h|5 minstall.in |5 misc.c| 84 package/debian/changelog |6 package/debian/control|2 package/debian/copyright |2 package/debian/rules |7 package/debian/xterm-dev.docs |1 package/debian/xterm-dev.menu |4 package/freebsd/Makefile |2 package/xterm.spec|4 print.c | 52 ptyx.h| 147 - resize.c | 19 screen.c | 36 terminfo | 512 +++- trace.c | 26 trace.h |6 util.c| 143 - version.c |4 version.h |8 vttests/256colors.pl | 25 vttests/256colors2.pl | 197 - vttests/88colors.pl | 24 vttests/88colors2.pl | 200 - vttests/closest-rgb.pl| 230 + vttests/dynamic.pl| 132 - vttests/query-color.pl| 94 vttests/query-status.pl | 169 + vttests/resize.pl | 154 - vttests/tcapquery.pl | 472 ++- xstrings.c| 47 xstrings.h|5 xterm.h | 81 xterm.log.html| 259 ++ xterm.man | 681 - xterm_io.h| 51 xtermcfg.hin |5 xutf8.c | 18 69 files changed, 8897 insertions(+), 4714 deletions(-) New commits: commit fc9f89a55e3f9e29cf4c9e024b6870cfaa9586a1 Author: Sven Joachim Date: Fri Jun 9 16:35:53 2017 +0200 Imported Upstream version 328 diff --git a/INSTALL b/INSTALL index 4d961da..188bac3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ --- $XTermId: INSTALL,v 1.160 2016/09/09 22:56:18 tom Exp $ +-- $XTermId: INSTALL,v 1.163 2017/05/30 08:32:35 tom Exp $ --- --- Copyright 1997-2015,2016 by Thomas E. Dickey +-- Copyright 1997-2016,2017 by Thomas E. Dickey -- -- All Rights Reserved -- @@ -432,6 +432,13 @@ The options (in alphabetic order): further work because colors used for clearing the screen do not match the expected behavior (see vttest for instance). + --enable-env-terminfo setenv $TERMINFO if --with-own-terminfo gives value + + Use the custom terminfo directory specified in "--with-own-terminfo" + as the $TERMINFO variable for the shells spawned by xterm. Setting + this variable makes most curses (and termcap) applications look in + that directory for terminal descriptions. + --enable-exec-xterm enable "spawn-new-terminal" action If your platform supports the process filesystem "cwd" link, @@ -614,7 +621,7 @@ The options (in alphabetic order): at existing ".desktop" files for xterm and common terminal emulators, to use those. If none are found, the script uses this default: - System;TerminalEmulator;Utility; + System;TerminalEmulator; --with-freetype-config configure script to use for FreeType diff --git a/MANIFEST b/MANIFEST index bd690d0..b5bdd85 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-327, version xterm-327 +MANIFEST for xterm-328, version xterm-328 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Makefile.in b/Makefile.in index 5fcbfab..5b4f67f 100644 --- a/Makefile.in ++
xterm: Changes to 'upstream-unstable'
Imakefile| 20 +++-
MANIFEST |2
Makefile.in | 26 --
NEWS | 22 +
Tekparse.h | 90 +
VTparse.h| 200 ---
charproc.c | 17 ++-
ctlseqs.ms |8 -
ctlseqs.txt |6 -
main.c | 169 +++
misc.c |8 -
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4
ptyx.h |9 +-
trace.c | 42 +
trace.h |4
util.c |8 -
version.h|6 -
xterm.log.html | 36
xterm.man|8 +
21 files changed, 374 insertions(+), 319 deletions(-)
New commits:
commit 1a027e1ec651c4298f19f92a8fdef55225e4049c
Author: Sven Joachim
Date: Sat Oct 8 08:40:13 2016 +0200
Imported Upstream version 327
diff --git a/Imakefile b/Imakefile
index bbe389a..daf250e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
+XCOMM $XTermId: Imakefile,v 1.113 2016/10/06 00:56:32 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -244,11 +244,21 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
AllTarget($(PROGRAMS))
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
+.SUFFIXES : .def .hin
+.def.hin :
+ awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+
SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES))
SpecialCObjectRule(menu,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(misc,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(VTPrsTbl,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(charproc,$(VTPARSE_H),$(MISC_DEFINES))
SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(TekPrsTbl,$(TEKPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(TekProc,$(TEKPARSE_H),$(MISC_DEFINES))
#if InstallXtermSetUID
SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs
XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
@@ -319,4 +329,8 @@ InstallAppDefaults(UXTerm)
InstallAppDefaultsLong(XTerm-col,XTerm-color)
InstallManPage(xterm,$(MANDIR))
InstallManPage(resize,$(MANDIR))
+
+cleandir::
+ $(RM) *parse.hin
+
DependTarget()
diff --git a/MANIFEST b/MANIFEST
index 9f99009..bd690d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-326, version xterm-326
+MANIFEST for xterm-327, version xterm-327
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 17b273d..5fcbfab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.235 2016/05/15 16:45:53 tom Exp $
+## $XTermId: Makefile.in,v 1.238 2016/10/06 00:28:15 tom Exp $
# -
# this file is part of xterm
#
@@ -125,7 +125,7 @@ EXTRAOBJ= @EXTRAOBJS@
all : $(PROGRAMS)
-.SUFFIXES : .i .def .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html
@GROFF_NOTE@ .ps .pdf
+.SUFFIXES : .i .def .cin .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html
@GROFF_NOTE@ .ps .pdf
.c$o :
@RULE_CC@
@@ -135,8 +135,11 @@ all : $(PROGRAMS)
@RULE_CC@
@ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@
+.def.cin :
+ $(AWK) '/^CASE_/{printf "{ %d, \"%s\" },\n", n++, $$1; }' < $< >$@
+
.def.hin :
- grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
+ $(AWK) '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
.man.$(manext) :
$(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $* $*
$(pixmapdir)
@@ -169,6 +172,10 @@ all : $(PROGRAMS)
@groff_n...@.ps.pdf :
@GROFF_NOTE@ ps2pdf $*.ps
+
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
main$o : main.h
misc$o : version.h
@@ -189,10 +196,19 @@ resize$x : $(OBJS2)
-$(RM) $@
perl $(srcdir)/88colres.pl > $@
-charproc$o : main.h @CHARPROC_DEPS@
+charproc$o : $(VTPARSE_H) main.h @CHARPROC_DEPS@
+graphics_regis$o : $(VTPARSE_H)
+graphics_sixel$o : $(VTPARSE_H)
+misc$o : $(VTPARSE_H)
+VTPrsTbl$o : $(VTPARSE_H)
+
+TekPrsTbl$o : $(TEKPARSE_H)
+Tekproc$o : $(TEKPARSE_H)
misc$o : builtin_icons.h
+trace$o : VTparse.cin Tekparse.cin
+
# do this to quiet gcc -Wcast-qual warnings
builtin_icons.h :
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
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
MANIFESTthis 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 v\" 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 @@ BSBackspace (Ctrl-H).
CRCarriage Return (Ctrl-M).
ENQ Return Terminal Status (Ctrl-E). Default response is an empty
string, but may be overridden by a resource answerbackString.
-FFForm Feed or New Page (NP). Ctrl-L is treated the same as LF.
-LFLine Feed or New Line (NL). (LF is Ctrl-J).
+FFForm Feed or New Page (NP). (FF is Ctrl-L). FF is treated
+ the same as LF .
+LFLine Feed or New Line (NL). (LF is Ctrl-J).
SI
xterm: Changes to 'upstream-unstable'
INSTALL | 11 MANIFEST |2 Makefile.in |9 Tekproc.c | 42 aclocal.m4| 38 button.c | 113 - cachedGCs.c | 25 charproc.c| 94 - config.guess | 15 config.sub| 16 configure | 3862 +++--- configure.in |7 cursor.c | 32 data.c|6 data.h|8 doublechr.c | 13 fontutils.c | 49 graphics.c| 29 graphics.h| 42 graphics_regis.c | 146 + graphics_regis.h |8 graphics_sixel.c | 187 +- graphics_sixel.h |8 input.c | 31 keysym2ucs.c |6 main.c| 23 menu.c|6 misc.c| 152 + package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec|4 precompose.c |8 print.c | 26 ptydata.c |7 ptyx.h|8 scrollback.c |9 scrollbar.c | 17 svg.c |8 termcap | 14 terminfo |9 trace.c | 49 trace.h | 12 unicode/README| 13 unicode/convmap.pl|9 unicode/keysym.map|3 unicode/precompose.c.tail |6 util.c| 214 +- version.c |9 version.h |6 wcwidth.c | 22 xstrings.c| 24 xterm.h |3 xterm.log.html| 103 + xterm.man | 94 - xtermcap.c| 24 xtermcfg.hin | 19 56 files changed, 3030 insertions(+), 2678 deletions(-) New commits: commit c9cb401305a4c9866c5462a724410472c4e6db29 Author: Sven Joachim Date: Mon Jun 6 17:27:21 2016 +0200 Imported Upstream version 325 diff --git a/INSTALL b/INSTALL index f049a7c..e2f03b4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ --- $XTermId: INSTALL,v 1.158 2015/08/10 23:38:32 tom Exp $ +-- $XTermId: INSTALL,v 1.159 2016/05/28 18:39:26 tom Exp $ --- --- Copyright 1997-2014,2015 by Thomas E. Dickey +-- Copyright 1997-2015,2016 by Thomas E. Dickey -- -- All Rights Reserved -- @@ -777,6 +777,13 @@ The options (in alphabetic order): Activate the --disable-leaks option, and ensure that "-g" is added to CFLAGS. + --without-xinerama do not use Xinerama extension for multiple screens + + Xinerama is an X server extension that allows multiple physical + screens to behave as a single screen. If you do not need the feature + (or do not want the extra library dependency), use this option to + suppress it. + --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 818655f..98e5f3b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-324, version xterm-324 +MANIFEST for xterm-325, version xterm-325 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Makefile.in b/Makefile.in index 5064a12..17b273d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -## $XTermId: Makefile.in,v 1.234 2015/02/12 09:31:30 tom Exp $ +## $XTermId: Makefile.in,v 1.235 2016/05/15 16:45:53 tom Exp $ # - # this file is part of xterm # -# Copyright 1997-2014,2015 by Thomas E. Dickey +# Copyright 1997-2015,2016 by Thomas E. Dickey # # All Rights Reserved # @@ -52,6 +52,7 @@ ETAGS = @ETAGS@ LN_S = @LN_S@ RM = rm -f LINT = @LINT@ +LINT_OPTS = @LINT_OPTS@ INSTALL= @INSTALL@ INSTALL_PROGRAM= @INSTALL_PROGRAM@ @@ -563,8 +564,8 @@ koi8rxterm.ps : koi8rxterm.$(manext) koi8rxterm.txt : koi8rxterm.$(manext) lint : - $(LINT) $(CPPFLAGS) $(SRCS1) - $(LINT) $(CPPFLAGS) $(SRCS2) + $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(SRCS1) + $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(SRCS2) tags : $(CTAGS) $(SRCS) $(HDRS) diff --git a/Tekproc.c b/Tekproc.c index 6f8da47..a640643 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,7 +1,7 @@ -/* $XTermId: Tekproc.c,
xterm: Changes to 'upstream-unstable'
MANIFEST |2 aclocal.m4 | 37 configure| 3389 --- main.c |4 package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec |4 version.h|6 xterm.log.html | 21 9 files changed, 1806 insertions(+), 1665 deletions(-) New commits: commit 3471bdbb26bd5c9f4450c3f57b46d1affef90393 Author: Sven Joachim Date: Fri Mar 11 18:03:42 2016 +0100 Imported Upstream version 324 diff --git a/MANIFEST b/MANIFEST index 067c42e..818655f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-323, version xterm-323 +MANIFEST for xterm-324, version xterm-324 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/aclocal.m4 b/aclocal.m4 index ef41c84..9ac69df 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $XTermId: aclocal.m4,v 1.406 2016/03/07 01:30:21 tom Exp $ +dnl $XTermId: aclocal.m4,v 1.408 2016/03/11 00:54:28 tom Exp $ dnl dnl --- dnl @@ -1377,7 +1377,7 @@ AC_TRY_COMPILE([ test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG,1,[Define to 1 if we can define lastlog pathname]) ])dnl dnl --- -dnl CF_LD_RPATH_OPT version: 6 updated: 2015/04/12 15:39:00 +dnl CF_LD_RPATH_OPT version: 7 updated: 2016/02/20 18:01:19 dnl --- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -1395,13 +1395,13 @@ case $cf_cv_system_name in LD_RPATH_OPT="-rpath " fi ;; -(linux*|gnu*|k*bsd*-gnu) +(linux*|gnu*|k*bsd*-gnu|freebsd*) LD_RPATH_OPT="-Wl,-rpath," ;; (openbsd[[2-9]].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," ;; -(dragonfly*|freebsd*) +(dragonfly*) LD_RPATH_OPT="-rpath " ;; (netbsd*) @@ -1723,18 +1723,26 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ make an error #endif], [cf_cv_posix_c_source=no], - [case .$cf_POSIX_C_SOURCE in -(.[[12]]??*|.2) + [cf_want_posix_source=no +case .$cf_POSIX_C_SOURCE in +(.[[12]]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; +(.2) + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + cf_want_posix_source=yes + ;; (.*) + cf_want_posix_source=yes ;; esac - AC_TRY_COMPILE([#include ],[ +if test "$cf_want_posix_source" = yes ; then + AC_TRY_COMPILE([#include ],[ #ifdef _POSIX_SOURCE make an error #endif],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") +fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" @@ -1755,17 +1763,6 @@ if test "$cf_cv_posix_c_source" != no ; then CF_ADD_CFLAGS($cf_cv_posix_c_source) fi -AC_CACHE_CHECK(if we should define _POSIX_SOURCE,cf_cv_posix_source,[ - AC_TRY_COMPILE([#include ],[ -#ifdef _POSIX_SOURCE -make an error -#endif],[cf_cv_posix_source=yes], - [cf_cv_posix_source=no]) -]) - -if test "$cf_cv_posix_source" != no ; then - CF_ADD_CFLAGS(-D_POSIX_SOURCE) -fi ])dnl dnl --- dnl CF_POSIX_SAVED_IDS version: 8 updated: 2012/10/04 20:12:20 @@ -3985,6 +3982,7 @@ case $host_os in (mirbsd*) # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw @@ -4019,11 +4017,10 @@ case $host_os in ;; (*) CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac -CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) - if test -n "$cf_xopen_source" ; then CF_ADD_CFLAGS($cf_xopen_source,true) fi diff --git a/configure b/configure index 7ec2fde..db7a9fd 100755 --- a/configure +++ b/configure @@ -2619,6 +2619,244 @@ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" (mirbsd*) # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= + +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" + +cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ + s
xterm: Changes to 'upstream-unstable'
Imakefile| 15 MANIFEST |2 XTerm.ad |6 aclocal.m4 | 33 button.c | 19 charproc.c | 12 configure| 3743 ++- configure.in | 16 ctlseqs.ms | 16 ctlseqs.txt | 10 html.c | 304 +++ menu.c | 50 menu.h | 10 misc.c | 64 package/debian/changelog |6 package/debian/rules |1 package/freebsd/Makefile |2 package/xterm.spec |8 print.c | 12 ptyx.h |8 svg.c| 288 +++ uxterm.desktop |5 version.h|6 xterm.appdata.xml| 10 xterm.dat|2 xterm.desktop|5 xterm.h | 21 xterm.log.html | 33 xterm.man| 119 + xtermcfg.hin |5 30 files changed, 2819 insertions(+), 2012 deletions(-) New commits: commit dabaa890d428573a9cfa4a13a5e42d229df66887 Author: Sven Joachim Date: Wed Mar 9 17:28:12 2016 +0100 Imported Upstream version 323 diff --git a/Imakefile b/Imakefile index f2119ec..bbe389a 100644 --- a/Imakefile +++ b/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $ +XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR #if !HasPutenv PUTENVDEF = -DNOPUTENV #endif +#ifdef DumpsXTerm + DUMPSDEF = -DOPT_SCREEN_DUMPS=1 +#endif #ifdef RegisXTerm SIXELDEF = -DOPT_REGIS_GRAPHICS=1 #endif @@ -180,11 +183,15 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) -DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF) +DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF) $(DUMPSDEF) INCLUDES = -I. $(XRFINCLUDES) MAINSRC = main.c MAINOBJ = main.o +#ifdef DumpsXTerm + DUMPSSRC = html.c svg.c + DUMPSOBJ = html.o svg.o +#endif #ifdef RegisXTerm SIXELSRC = graphics_regis.c SIXELOBJ = graphics_regis.o @@ -202,13 +209,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR linedata.c menu.c misc.c print.c ptydata.c scrollback.c \ screen.c scrollbar.c tabs.c util.c version.c xstrings.c \ xtermcap.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \ - $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC) + $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC) $(DUMPSSRC) OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \ data.o doublechr.o fontutils.o input.o \ linedata.o menu.o misc.o print.o ptydata.o scrollback.o \ screen.o scrollbar.o tabs.o util.o version.o xstrings.o \ xtermcap.o TekPrsTbl.o Tekproc.o VTPrsTbl.o \ - $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ) + $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ) $(DUMPSOBJ) SRCS2 = resize.c version.c xstrings.c OBJS2 = resize.o version.o xstrings.o SRCS = $(SRCS1) $(SRCS2) diff --git a/MANIFEST b/MANIFEST index 1009b48..067c42e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-322, version xterm-322 +MANIFEST for xterm-323, version xterm-323 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/XTerm.ad b/XTerm.ad index 69e578b..716b175 100644 --- a/XTerm.ad +++ b/XTerm.ad @@ -1,8 +1,8 @@ -! $XTermId: XTerm.ad,v 1.99 2013/06/23 08:57:13 Ross.Combs Exp $ +! $XTermId: XTerm.ad,v 1.101 2016/01/28 02:15:29 tom Exp $ ! - ! this file is part of xterm ! -! Copyright 1996-2010,2011 by Thomas E. Dickey +! Copyright 1996-2011,2016 by Thomas E. Dickey ! ! All Rights Reserved ! @@ -52,6 +52,8 @@ *mainMenu*print-on-error*Label: Print-All on Error *mainMenu*print*Label: Print Window *mainMenu*print-redir*Label: Redirect to Printer +*mainMenu*dump-html*Label: XHTML Screen Dump +*mainMenu*dump-svg*Label: SVG Screen Dump *mainMenu*8-bit
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
main.c |8
package/debian/changelog |6 ++
package/debian/copyright |2 +-
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
version.h|8
xterm.log.html | 15 +--
8 files changed, 32 insertions(+), 15 deletions(-)
New commits:
commit 7bfca55d7cd7433af575284dfbbed6d81409eb85
Author: Sven Joachim
Date: Sat Jan 2 16:06:31 2016 +0100
Imported Upstream version 322
diff --git a/MANIFEST b/MANIFEST
index 74cd987..1009b48 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-321, version xterm-321
+MANIFEST for xterm-322, version xterm-322
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/main.c b/main.c
index 27120b3..2e68a44 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/* $XTermId: main.c,v 1.776 2015/12/29 15:19:35 tom Exp $ */
+/* $XTermId: main.c,v 1.777 2016/01/02 14:12:19 tom Exp $ */
/*
- * Copyright 2002-2014,2015 by Thomas E. Dickey
+ * Copyright 2002-2015,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -3248,8 +3248,8 @@ validShell(const char *pathname)
if (validProgram(pathname)
&& stat(ok_shells, &sb) == 0
&& (sb.st_mode & S_IFMT) == S_IFREG
- && (sb.st_size != 0)
- && (sb.st_size < (off_t) (((size_t) ~0) - 2))
+ && ((size_t) sb.st_size > 0)
+ && ((size_t) sb.st_size < (((size_t) ~0) - 2))
&& (blob = calloc((size_t) sb.st_size + 2, sizeof(char))) != 0) {
if ((fp = fopen(ok_shells, "r")) != 0) {
rc = fread(blob, sizeof(char), (size_t) sb.st_size, fp);
diff --git a/package/debian/changelog b/package/debian/changelog
index a8592c8..1d0ce23 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (322) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey Sat, 02 Jan 2016 08:42:56
-0500
+
xterm-dev (321) unstable; urgency=low
* maintenance updates
diff --git a/package/debian/copyright b/package/debian/copyright
index 0a69d30..1280a8c 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -35,7 +35,7 @@ authorization.
Files: * */*
License: MIT-X11
-Copyright 1996-2014,2015 by Thomas E. Dickey
+Copyright 1996-2015,2016 by Thomas E. Dickey
(date ranges vary, depending on when the respective files were first changed
significantly, and run through the most recent change date).
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 493e30d..55f002b 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 321
+PORTVERSION= 322
CATEGORIES=x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 8ded496..d2e5b70 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.86 2015/09/27 23:17:50 tom Exp $
+# $XTermId: xterm.spec,v 1.87 2016/01/02 13:42:56 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: 321
+Version: 322
Release: 1
License: X11
Group: User Interface/X
diff --git a/version.h b/version.h
index b394bcc..3768c54 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
-/* $XTermId: version.h,v 1.420 2016/01/01 01:37:58 tom Exp $ */
+/* $XTermId: version.h,v 1.422 2016/01/02 14:15:49 tom Exp $ */
/*
- * Copyright 1998-2014,2015 by Thomas E. Dickey
+ * Copyright 1998-2015,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -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 321
-#define XTERM_DATE2015-12-31
+#define XTERM_PATCH 322
+#define XTERM_DATE2016-01-02
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index bbc7b86..2349539 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -2,7 +2,7 @@
*
* this file is part of xterm*
* *
- * Copyright 1997-2014,2015 by Thomas E. Dickey *
+ * Copyright 1997-2015,2016 by Thomas E. Dickey *
* *
* All Rights Reserved
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
THANKS |7 +--
button.c | 33 +++--
main.c |4 ++--
package/debian/changelog |6 ++
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
version.h|6 +++---
xstrings.c | 29 -
xstrings.h |5 +++--
xterm.log.html | 27 ---
xterm.man| 19 ++-
12 files changed, 112 insertions(+), 32 deletions(-)
New commits:
commit e53d527194aa459a043487f7f83265b2f9eaaf94
Author: Sven Joachim
Date: Sat Aug 29 08:54:39 2015 +0200
Imported Upstream version 320
diff --git a/MANIFEST b/MANIFEST
index 424d573..ff79fa6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-319, version xterm-319
+MANIFEST for xterm-320, version xterm-320
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index e953827..f2af2bf 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.14 2014/07/12 14:41:17 tom Exp $
+-- $XTermId: THANKS,v 1.15 2015/08/28 08:17:31 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -61,7 +61,6 @@ Denis Zaitsev
Dennis Preiser
Dennis Schneider
Dimitrios Christidis
-Dr Werner Fink
Ed Schouten
Eddy De Greef
Edward S Arthur
@@ -74,6 +73,7 @@ Frank Giessler
Frank Guangxin Liu
Frank Liu
Gael Roualland
+George Nachman
George Peter Staplin
Gertjan Halkes
Greg Badros
@@ -120,6 +120,8 @@ Marius Tolzmann
Mark Waggoner
Markus Kuhn
Martin Pirker
+Martin Tournoij
+Matthew Green
Matthias Baake
Matthias Scheler
Matthieu Herrb
@@ -188,6 +190,7 @@ Tor Lillqvist
Torrey Lyons
Victor Stinner
Vincent Lefevre
+Werner Fink
Werner Lemberg
Will Day
Zdenek Sekera
diff --git a/button.c b/button.c
index fb922d1..e407136 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.492 2015/04/10 10:16:19 tom Exp $ */
+/* $XTermId: button.c,v 1.494 2015/08/27 23:47:56 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -4927,6 +4927,20 @@ formatVideoAttrs(XtermWidget xw, char *buffer, CELL
*cell)
}
}
+static char *
+formatStrlen(char *target, char *source, int freeit)
+{
+if (source != 0) {
+ sprintf(target, "%u", (unsigned) strlen(source));
+ if (freeit) {
+ free(source);
+ }
+} else {
+ strcpy(target, "0");
+}
+return target;
+}
+
/* substitute data into format, reallocating the result */
static char *
expandFormat(XtermWidget xw,
@@ -4971,21 +4985,20 @@ expandFormat(XtermWidget xw,
finish->col + 1);
value = numbers;
break;
+ case 'R':
+ value = formatStrlen(numbers, x_strrtrim(data), 1);
+ break;
+ case 'r':
+ value = x_strrtrim(data);
+ break;
case 'S':
- sprintf(numbers, "%u", (unsigned) strlen(data));
- value = numbers;
+ value = formatStrlen(numbers, data, 0);
break;
case 's':
value = data;
break;
case 'T':
- if ((value = x_strtrim(data)) != 0) {
- sprintf(numbers, "%u", (unsigned) strlen(value));
- free(value);
- } else {
- strcpy(numbers, "0");
- }
- value = numbers;
+ value = formatStrlen(numbers, x_strtrim(data), 1);
break;
case 't':
value = x_strtrim(data);
diff --git a/main.c b/main.c
index d992486..8ed2e29 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.772 2015/08/19 00:25:35 tom Exp $ */
+/* $XTermId: main.c,v 1.773 2015/08/26 23:39:36 tom Exp $ */
/*
* Copyright 2002-2014,2015 by Thomas E. Dickey
@@ -3679,7 +3679,7 @@ spawnXTerm(XtermWidget xw)
added_utmp_entry = False;
#if defined(USE_UTEMPTER)
#undef UTMP
-if (xw->misc.login_shell && !resource.utmpInhibit) {
+if ((xw->misc.login_shell || !command_to_exec) && !resource.utmpInhibit) {
struct UTMP_STR dummy;
/* Note: utempter may trim it anyway */
diff --git a/package/debian/changelog b/package/debian/changelog
index 9fd174a..f47483c 100644
--- a/package/debian/changelog
+++ b/package/debian/
xterm: Changes to 'upstream-unstable'
INSTALL |6
MANIFEST |2
charproc.c | 24 -
configure|6
configure.in |6
ctlseqs.ms | 129 -
ctlseqs.txt | 119 -
fontutils.c | 53 +-
graphics.c | 53 +-
graphics.h |7
graphics_regis.c | 1022 ++-
main.c |7
misc.c | 17
package/debian/changelog |6
package/freebsd/Makefile |2
package/xterm.spec |4
version.h|6
vttests/fonts.sh |7
xterm.h |4
xterm.log.html | 60 ++
xterm.man|6
xtermcfg.hin |3
22 files changed, 1134 insertions(+), 415 deletions(-)
New commits:
commit e27b1046f0ab81daba99fa741507e5bf9826867d
Author: Sven Joachim
Date: Thu Aug 20 19:54:05 2015 +0200
Imported Upstream version 319
diff --git a/INSTALL b/INSTALL
index 7c4dfd2..f049a7c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.157 2015/04/12 20:44:43 tom Exp $
+-- $XTermId: INSTALL,v 1.158 2015/08/10 23:38:32 tom Exp $
---
-- Copyright 1997-2014,2015 by Thomas E. Dickey
--
@@ -385,14 +385,14 @@ The options (in alphabetic order):
This sets the default resource value, which is shown in the manpage.
- --enable-broken-osc allow broken Linux OSC-strings],
+ --enable-broken-osc allow broken Linux OSC-strings
Compile-in code to accommodate scripts that write Linux's malformed
palette control strings without checking. The result makes xterm
appear to freeze. This workaround makes xterm ignore the strings,
and is compiled-in by default for Linux.
- --enable-builtin-xpms allow broken Linux OSC-strings],
+ --enable-builtin-xpms compile-in icon data
Compile-in X pixmap data for these icons:
filled-xterm
diff --git a/MANIFEST b/MANIFEST
index 455149c..424d573 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-318, version xterm-318
+MANIFEST for xterm-319, version xterm-319
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/charproc.c b/charproc.c
index df6adf4..c331a5f 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1409 2015/04/12 16:57:00 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1413 2015/07/15 09:21:40 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -7075,9 +7075,23 @@ RequestResize(XtermWidget xw, int rows, int cols, Bool
text)
TRACE(("RequestResize(rows=%d, cols=%d, text=%d)\n", rows, cols, text));
-if ((int) (askedWidth = (Dimension) cols) < cols
- || (int) (askedHeight = (Dimension) rows) < rows)
- return;
+/* check first if the row/column values fit into a Dimension */
+if (cols > 0) {
+ if ((int) (askedWidth = (Dimension) cols) < cols) {
+ TRACE(("... cols too large for Dimension\n"));
+ return;
+ }
+} else {
+ askedWidth = 0;
+}
+if (rows > 0) {
+ if ((int) (askedHeight = (Dimension) rows) < rows) {
+ TRACE(("... rows too large for Dimension\n"));
+ return;
+ }
+} else {
+ askedHeight = 0;
+}
if (askedHeight == 0
|| askedWidth == 0
@@ -10921,7 +10935,7 @@ HandleKeymapChange(Widget w,
size_t len;
TRACE(("HandleKeymapChange(%#lx, %s)\n",
- w,
+ (unsigned long) w,
(*param_count
? params[0]
: "missing")));
diff --git a/configure b/configure
index 39486ea..3919996 100755
--- a/configure
+++ b/configure
@@ -15807,13 +15807,13 @@ if test "${enable_builtin_xpms+set}" = set; then
enableval="$enable_builtin_xpms"
test "$enableval" != yes && enableval=no
if test "$enableval" != "no" ; then
-enable_builtin_xpms=no
- else
enable_builtin_xpms=yes
+ else
+enable_builtin_xpms=no
fi
else
enableval=no
- enable_builtin_xpms=yes
+ enable_builtin_xpms=no
fi;
echo "$as_me:15819: result: $enable_builtin_xpms" >&5
diff --git a/configure.in b/configure.in
index ff5d563..d5139f4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.335 2015/04/12 20:41:52 tom Exp $
+dnl $XTermId: configure.in,v 1.336 2015/08/10 23:45:36 tom Exp $
dnl
dnl
-
dnl this file is part of xterm
@@ -495,8 +495,8 @@ test "$enable_broken_st" = no &&
AC_DEFINE(OPT_BROKEN_ST,0,[Define to 0 to disal
AC_MSG_CHECKING(if you want to compile-in icon data)
CF_ARG_ENABLE(builtin-xpms,
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
button.c |4 ++--
package/debian/changelog |6 ++
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
version.h|6 +++---
xterm.log.html | 13 -
7 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 06a538fbafd3b224fe7a994fb68db0c1896b2ef0
Author: Sven Joachim
Date: Mon Sep 29 17:08:30 2014 +0200
Imported Upstream version 312
diff --git a/MANIFEST b/MANIFEST
index 634ec2c..e9068a6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-311, version xterm-311
+MANIFEST for xterm-312, version xterm-312
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 77929c9..8dd7390 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */
+/* $XTermId: button.c,v 1.482 2014/09/26 23:58:14 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -3257,7 +3257,7 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
int start_col = indexToCol(indexed, len, start_inx);
int finis_col = indexToCol(indexed, len, finis_inx);
- if (start_col >= actual &&
+ if (start_col <= actual &&
actual < finis_col) {
int test = finis_col - start_col;
if (best_len < test) {
diff --git a/package/debian/changelog b/package/debian/changelog
index 92638d6..2a486f8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (312) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey Fri, 26 Sep 2014 18:42:15
-0400
+
xterm-dev (311) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 9f4c4fc..9c22d21 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 311
+PORTVERSION= 312
CATEGORIES=x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index c9a0fcc..a9100d0 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.76 2014/07/28 21:36:30 tom Exp $
+# $XTermId: xterm.spec,v 1.77 2014/09/26 22:42:15 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: 311
+Version: 312
Release: 1
License: X11
Group: User Interface/X
diff --git a/version.h b/version.h
index b7ef006..30be6f3 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.397 2014/09/18 21:12:19 tom Exp $ */
+/* $XTermId: version.h,v 1.399 2014/09/29 00:37:50 tom Exp $ */
/*
* Copyright 1998-2013,2014 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 311
-#define XTERM_DATE2014-09-18
+#define XTERM_PATCH 312
+#define XTERM_DATE2014-09-28
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 91626de..6b83682 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.1522 2014/09/18 21:11:45 tom Exp $
+ $XTermId: xterm.log.html,v 1.1526 2014/09/29 00:39:23 tom Exp $
-->
@@ -72,6 +72,8 @@
CHANGELOG).
+Patch #312 - 2014/09/28
+
Patch #311 - 2014/09/18
Patch #310 - 2014/07/25
@@ -907,6 +909,15 @@
Patch #1 - 1996/1/6
+ Patch #312 -
+ 2014/09/28
+
+
+undo change to do_select_regex() in patch #311 (reports by H Merijn Brand,
+Sven-Haegar Koch, Debian #762978).
+
+
Patch #311 -
2014/09/18
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xyck5-00064h...@moszumanska.debian.org
xterm: Changes to 'upstream-unstable'
MANIFEST |2
button.c | 194 +--
charproc.c | 26 +++---
fontutils.c | 29 ++-
graphics_regis.c | 65 ++-
menu.c | 28 --
menu.h |8 +
misc.c | 18
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4
ptyx.h | 23 +
screen.c |6 -
version.h|6 -
xterm.h |9 +-
xterm.log.html | 46 ++-
xterm.man| 20
17 files changed, 327 insertions(+), 165 deletions(-)
New commits:
commit 2982e471d559c69d331ec2f8b4e26c5c583f76c0
Author: Sven Joachim
Date: Fri Sep 19 18:03:56 2014 +0200
Imported Upstream version 311
diff --git a/MANIFEST b/MANIFEST
index 22b4d14..634ec2c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-310, version xterm-310
+MANIFEST for xterm-311, version xterm-311
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 69936a5..77929c9 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.473 2014/05/26 17:12:51 tom Exp $ */
+/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -2177,16 +2177,39 @@ SelectionReceived(Widget w,
#endif
for (i = 0; i < text_list_count; i++) {
size_t len = removeControls(xw, text_list[i]);
+
if (screen->selectToBuffer) {
- size_t have = (screen->internal_select
- ? strlen(screen->internal_select)
+ InternalSelect *mydata = &(screen->internal_select);
+ size_t have = (mydata->buffer
+ ? strlen(mydata->buffer)
: 0);
size_t need = have + len + 1;
- char *buffer = realloc(screen->internal_select, need);
+ char *buffer = realloc(mydata->buffer, need);
+
+ screen->selectToBuffer = False;
+#if OPT_PASTE64
+ screen->base64_paste = mydata->base64_paste;
+#endif
+#if OPT_READLINE
+ screen->paste_brackets = mydata->paste_brackets;
+#endif
if (buffer != 0) {
strcpy(buffer + have, text_list[i]);
- screen->internal_select = buffer;
+ mydata->buffer = buffer;
}
+ TRACE(("FormatSelect %d.%d .. %d.%d %s\n",
+ screen->startSel.row,
+ screen->startSel.col,
+ screen->endSel.row,
+ screen->endSel.col,
+ mydata->buffer));
+ mydata->format_select(w, mydata->format, mydata->buffer,
+ &(screen->startSel),
+ &(screen->endSel));
+
+ free(mydata->format);
+ free(mydata->buffer);
+ memset(mydata, 0, sizeof(*mydata));
} else {
_WriteSelectionData(xw, (Char *) text_list[i], len);
}
@@ -3204,7 +3227,7 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
char *search;
int *indexed;
-TRACE(("Select_REGEX:%s\n", NonNull(expr)));
+TRACE(("Select_REGEX[%d]:%s\n", inx, NonNull(expr)));
if (okPosition(screen, &ld, startc) && expr != 0) {
if (regcomp(&preg, expr, REG_EXTENDED) == 0) {
int firstRow = firstRowOfLine(screen, startc->row, True);
@@ -3234,7 +3257,7 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
int start_col = indexToCol(indexed, len, start_inx);
int finis_col = indexToCol(indexed, len, finis_inx);
- if (start_col <= actual &&
+ if (start_col >= actual &&
actual < finis_col) {
int test = finis_col - start_col;
if (best_len < test) {
@@ -4559,53 +4582,33 @@ getEventTime(XEvent *event)
}
/* obtain the selection string, passing the endpoints to caller's parameters */
-static char *
-getSelectionString(XtermWidget xw,
- Widget w,
- XEvent *event,
- String *params,
- Cardinal *num_params,
- CELL *start, CELL *finish)
+static void
+doSelectionFormat(XtermWidget xw,
+ Widget w,
+ XEvent *event,
+ String *params,
+ Cardinal *num_params,
+ FormatSelect format_select)
{
TSc
xterm: Changes to 'upstream-unstable'
Imakefile |4
MANIFEST |2
aclocal.m4| 21
configure | 3122 +++---
graphics_sixel.c |3
main.c| 18
package/debian/changelog |6
package/freebsd/Makefile | 106 -
package/freebsd/pkg-plist |7
package/xterm.spec|4
precompose.c | 10
resize.c |8
unicode/precompose.c.head |1
version.h |6
xterm.h |6
xterm.log.html| 21
xterm_io.h| 17
xtermcfg.hin |3
18 files changed, 1716 insertions(+), 1649 deletions(-)
New commits:
commit 63042043364f6150467f874353c7d86472bb868f
Author: Sven Joachim
Date: Wed Aug 27 19:33:48 2014 +0200
Imported Upstream version 310
diff --git a/Imakefile b/Imakefile
index 0c2b20e..f2119ec 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
+XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -140,7 +140,7 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
# endif
#endif
-#if !defined(OS2Architecture) && !defined(__GNU__)
+#if !defined(OS2Architecture) && !defined(__GNU__) &&
!defined(Minix3Architecture)
#if defined(UseUtempter)
UTMPDEF = -DUSE_UTEMPTER
#else
diff --git a/MANIFEST b/MANIFEST
index 06f60d1..22b4d14 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-309, version xterm-309
+MANIFEST for xterm-310, version xterm-310
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index dff8843..364e683 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.376 2014/07/13 18:36:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.378 2014/07/24 22:52:40 tom Exp $
dnl
dnl ---
dnl
@@ -84,7 +84,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
dnl -
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -109,7 +109,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -146,7 +146,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -315,7 +315,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
fi
])dnl
dnl ---
-dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
+dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
dnl ---
dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
dnl a build-configuration such as imake. These have the pitfall that they
@@ -327,10 +327,10 @@ CF_VERBOSE(checking additions to CFLAGS)
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
CF_ADD_CFLAGS($1,yes)
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
AC_TRY_LINK([#include ],[printf("Hello world");],,
[CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS)
-if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
CF_VERBOSE(but keeping change to \$CPPFLAGS)
fi
CFLAGS="$cf_check_flags"])
@@ -3769,7 +3769,7 @@ then
fi
])
dnl ---
-dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
+dnl CF_XOPEN_SOURCE version: 47 updated: 2014/07/23 17:11:49
dnl ---
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3820,6 +3820,9 @@ irix[[56]].*) #(vi
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURC
xterm: Changes to 'upstream-unstable'
INSTALL | 12
MANIFEST |2
THANKS |6
Tekproc.c|8
aclocal.m4 | 68
charproc.c | 27
config.guess | 164 -
config.sub | 15
configure| 6077 +--
fontutils.c |4
graphics.c | 125
graphics.h |4
graphics_regis.c | 3600 +++
main.c |6
menu.c | 14
package/debian/changelog |6
package/debian/rules |2
package/freebsd/Makefile |2
package/xterm.spec |5
scrollbar.c | 40
version.h|6
xterm.h |6
xterm.log.html | 62
23 files changed, 7122 insertions(+), 3139 deletions(-)
New commits:
commit fffb2571529ed6c77a752cc64711ff70d6ef10ea
Author: Sven Joachim
Date: Fri Jul 25 16:56:41 2014 +0200
Imported Upstream version 309
diff --git a/INSTALL b/INSTALL
index 66336c4..4d442d2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.151 2014/05/08 07:58:06 tom Exp $
+-- $XTermId: INSTALL,v 1.152 2014/07/12 22:40:36 Steve.Wall Exp $
---
-- Copyright 1997-2013,2014 by Thomas E. Dickey
--
@@ -461,7 +461,7 @@ The options (in alphabetic order):
--enable-narrowprotoenable narrow prototypes for X libraries
- Originally xterm was built using imake rather than a configure script.
+ Originally xterm was built using imake rather than a configure script.
One feature of imake that is not possible to guess within the
configure script is the wide-prototype compile-time definition
NARROWPROTO. When this is not set properly, the Athena widget
@@ -540,6 +540,10 @@ The options (in alphabetic order):
Look for, compile and link with the Xaw 3d widget library.
+ --with-Xaw3dxft link with Xaw 3d xft library
+
+ Look for, compile and link with the Xaw 3d xft widget library.
+
--with-XawPlus link with Athena-Plus library
Look for, compile and link with the Xaw Plus widget library.
@@ -601,7 +605,7 @@ The options (in alphabetic order):
just one of the variations:
"pkg*", e.g., pkg-config or pkgconfig uses whatever pkg-config
- script was found.
+ script was found.
otherwise, the parameter value is used as the name of the script
to try, using --cflags and --libs options.
@@ -724,7 +728,7 @@ The options (in alphabetic order):
If xterm is installed setuid'd to root, change the group of the tty
device to the given value on startup. Three cases are possible:
-
+
a) If this option is not given, the configure script will attempt to
find a suitable value (usually "tty"), and verify that it exists in
the group database.
diff --git a/MANIFEST b/MANIFEST
index 1cfa15b..06f60d1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-308, version xterm-308
+MANIFEST for xterm-309, version xterm-309
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index 1b83740..e953827 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
+-- $XTermId: THANKS,v 1.14 2014/07/12 14:41:17 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -157,7 +157,7 @@ Rob Braun
Robert Brady
Robert Earl
Robin Cutshaw
-Romain Francois
+Romain Francoise
Ross Combs
Ross Paterson
Ryan Johnson
@@ -167,7 +167,7 @@ Sergei Laskavy
Sergey Vlasov
Slava Semushin
Stefan Dirsch
-Steve Wall
+Stephen P Wall
Stuart Lissaman
Sven Verdoolaege
Taketo Kabe
diff --git a/Tekproc.c b/Tekproc.c
index 5289bc0..6f8da47 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.196 2014/04/12 00:55:22 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.198 2014/07/12 22:55:02 tom Exp $ */
/*
* Copyright 2001-2012,2014 by Thomas E. Dickey
@@ -90,6 +90,8 @@
#include
#elif defined(HAVE_LIB_XAW3D)
#include
+#elif defined(HAVE_LIB_XAW3DXFT)
+#include
#elif defined(HAVE_LIB_NEXTAW)
#include
#elif defined(HAVE_LIB_XAWPLUS)
@@ -924,7 +926,7 @@ TekConfigure(Widget w)
/*ARGSUSED*/
void
TekExpose(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
Region region GCC_UNUSED)
{
TekWidget tw = getTekWidget(w);
@@ -1936,7 +1938,7 @@ TekCopy(TekWidget tw)
/*ARGSUSED*/
void
HandleGINInput(Widget w,
-
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
package/debian/changelog |6 ++
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
screen.c |8
util.c | 17 -
version.h|6 +++---
xterm.log.html | 15 ++-
8 files changed, 43 insertions(+), 17 deletions(-)
New commits:
commit 4051c2ae6ba3be9f496adc5fc8b9f06e9e028d88
Author: Sven Joachim
Date: Fri Jun 20 17:31:01 2014 +0200
Imported Upstream version 308
diff --git a/MANIFEST b/MANIFEST
index a54262d..1cfa15b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-307, version xterm-307
+MANIFEST for xterm-308, version xterm-308
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/package/debian/changelog b/package/debian/changelog
index 15b8144..4712656 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (308) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey Thu, 19 Jun 2014 15:58:13
-0400
+
xterm-dev (307) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 186e0e5..fd7baca 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 307
+PORTVERSION= 308
CATEGORIES=x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 7d4a4ff..ec33b16 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.71 2014/06/04 22:58:36 tom Exp $
+# $XTermId: xterm.spec,v 1.72 2014/06/19 19:58:13 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: 307
+Version: 308
Release: 1
License: X11
Group: User Interface/X
diff --git a/screen.c b/screen.c
index 1e52e4d..0e2d241 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.499 2014/06/11 18:40:34 tom Exp $ */
+/* $XTermId: screen.c,v 1.500 2014/06/19 21:09:11 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -1431,6 +1431,8 @@ ScrnRefresh(XtermWidget xw,
nrows, ncols,
force ? " force" : ""));
+++recurse;
+
if (screen->cursorp.col >= leftcol
&& screen->cursorp.col <= (leftcol + ncols - 1)
&& screen->cursorp.row >= ROW2INX(screen, toprow)
@@ -1510,7 +1512,7 @@ ScrnRefresh(XtermWidget xw,
col = leftcol;
}
} else {
- xtermWarning("This should not happen. Why is it so?\n");
+ xtermWarning("Unexpected recursion drawing hidden
characters.\n");
}
});
@@ -1549,13 +1551,11 @@ ScrnRefresh(XtermWidget xw,
} else {
/* row intersects selection; split into pieces of single type */
if (row == screen->startH.row && col < screen->startH.col) {
- recurse++;
ScrnRefresh(xw, row, col, 1, screen->startH.col - col,
force);
col = screen->startH.col;
}
if (row == screen->endH.row && maxcol >= screen->endH.col) {
- recurse++;
ScrnRefresh(xw, row, screen->endH.col, 1,
maxcol - screen->endH.col + 1, force);
maxcol = screen->endH.col - 1;
diff --git a/util.c b/util.c
index 91aa6d4..dabeb05 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.658 2014/06/17 23:20:43 tom Exp $ */
+/* $XTermId: util.c,v 1.660 2014/06/19 22:15:20 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -4023,8 +4023,12 @@ drawXtermText(XtermWidget xw,
gc = getCgsGC(xw, currentWin, cgsId);
#if OPT_WIDE_ATTRS
- need_clipping = fixupItalics(xw, draw_flags, gc, curFont,
-y, x, font_width, len);
+#if OPT_DEC_CHRSET
+ if (!(CSET_DOUBLE(chrset) || (draw_flags & DOUBLEWFONT)))
+#endif
+ need_clipping = fixupItalics(xw, draw_flags, gc,
+getCgsFont(xw, currentWin, gc),
+y, x, font_width, len);
#endif
if (fntId != fNorm) {
XFontStruct *thisFp = WhichVFont(screen, fnts[fntId].fs);
@@ -4089,8 +4093,11 @@ drawXtermText(XtermWidget xw,
#endif
#if OPT_WIDE_ATTRS
- need_clipping = fixupItalics(xw, draw_flags, gc, curFont,
-y, x, font_width, len);
+#if OPT_DEC_CHRSET
+ if (!(CSET_DOUBLE(chrset) |
xterm: Changes to 'upstream-unstable'
MANIFEST |2
cachedGCs.c | 44 ++--
charproc.c | 82 ++-
fontutils.c | 144
fontutils.h | 11 +--
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4 -
print.c |8 +-
ptyx.h |5 +
screen.c |9 +-
util.c | 166 +--
version.h|6 -
xterm.appdata.xml|3
xterm.h |3
xterm.log.html | 36 +-
16 files changed, 409 insertions(+), 122 deletions(-)
New commits:
commit 0d7b6a924fe5a9a62bba90df7a821e12a6dde98c
Author: Sven Joachim
Date: Wed Jun 18 17:36:57 2014 +0200
Imported Upstream version 307
diff --git a/MANIFEST b/MANIFEST
index fc36f79..a54262d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-306, version xterm-306
+MANIFEST for xterm-307, version xterm-307
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/cachedGCs.c b/cachedGCs.c
index 21d3bb7..3dd1cd9 100644
--- a/cachedGCs.c
+++ b/cachedGCs.c
@@ -1,7 +1,7 @@
-/* $XTermId: cachedGCs.c,v 1.61 2011/09/11 14:59:38 tom Exp $ */
+/* $XTermId: cachedGCs.c,v 1.62 2014/06/12 23:04:07 tom Exp $ */
/*
- * Copyright 2007-2010,2011 by Thomas E. Dickey
+ * Copyright 2007-2011,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -120,7 +120,7 @@ traceCgsEnum(CgsEnum value)
#undef CASE
static const char *
-traceVTwin(XtermWidget xw, VTwin * value)
+traceVTwin(XtermWidget xw, VTwin *value)
{
const char *result = "?";
if (value == 0)
@@ -273,7 +273,7 @@ relinkData(CgsCache * me, int item)
* Returns the appropriate cache pointer.
*/
static CgsCache *
-myCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId)
+myCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId)
{
CgsCache *result = 0;
@@ -304,7 +304,7 @@ myDisplay(XtermWidget xw)
}
static Drawable
-myDrawable(XtermWidget xw, VTwin * cgsWin)
+myDrawable(XtermWidget xw, VTwin *cgsWin)
{
Drawable drawable = 0;
@@ -316,7 +316,7 @@ myDrawable(XtermWidget xw, VTwin * cgsWin)
}
static GC
-newCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, CgsCache * me)
+newCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, CgsCache * me)
{
XGCValues xgcv;
XtGCMask mask;
@@ -448,11 +448,12 @@ chgCache(XtermWidget xw, CgsEnum cgsId GCC_UNUSED,
CgsCache * me, Bool both)
THIS(used) = 0;
return THIS(gc);
}
+
/*
* Use the "setCgs()" calls to initialize parameters for a new GC.
*/
void
-setCgsFore(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel fg)
+setCgsFore(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel fg)
{
CgsCache *me;
@@ -463,7 +464,7 @@ setCgsFore(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,
Pixel fg)
}
void
-setCgsBack(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel bg)
+setCgsBack(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel bg)
{
CgsCache *me;
@@ -475,7 +476,7 @@ setCgsBack(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,
Pixel bg)
#if OPT_DEC_CHRSET
void
-setCgsCSet(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, unsigned cset)
+setCgsCSet(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, unsigned cset)
{
CgsCache *me;
@@ -489,7 +490,7 @@ setCgsCSet(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,
unsigned cset)
#endif
void
-setCgsFont(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, XTermFonts * font)
+setCgsFont(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, XTermFonts * font)
{
CgsCache *me;
@@ -505,8 +506,9 @@ setCgsFont(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,
XTermFonts * font)
font = &(TScreenOf(xw)->fnts[fNorm]);
}
if (HaveFont(font) && okFont(font->fs)) {
- TRACE2(("...updated next font in %p for %s to %s\n",
- me, traceCgsEnum(cgsId), traceFont(font)));
+ TRACE2(("setCgsFont next: %s for %s slot %p, gc %#x\n",
+ traceFont(font), traceCgsEnum(cgsId),
+ me, (unsigned) THIS(gc)));
TRACE2(("...next font was %s\n", traceFont(NEXT(font;
NEXT(font) = font;
me->mask |= GCFont;
@@ -523,7 +525,7 @@ setCgsFont(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,
XTermFonts * font)
* Keep the GC's so we can simply change them rather than creating new ones.
*/
void
-clrCgsFonts(XtermWidget xw, VTwin * cgsWin, XTermFonts * font)
+clrCgsFonts(XtermWidget xw, VTwin *cgsWin, XTermFonts * font)
{
CgsCache *me;
int j, k;
@@ -559,7 +561,7 @@ clrCgsFonts(XtermWidget xw, VTwin * cgsWin, XTermFonts *
font)
* Return a GC associated with
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
charproc.c |9 ++---
package/debian/changelog |6 ++
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
util.c | 14 +-
version.h|6 +++---
xterm.log.html | 12 +++-
8 files changed, 39 insertions(+), 16 deletions(-)
New commits:
commit fae0a8d42e10cca348e47f950df9767af1260022
Author: Sven Joachim
Date: Wed Jun 4 17:27:41 2014 +0200
Imported Upstream version 306
diff --git a/MANIFEST b/MANIFEST
index 001e738..fc36f79 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-305, version xterm-305
+MANIFEST for xterm-306, version xterm-306
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/charproc.c b/charproc.c
index af5b2a8..d86fcac 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1357 2014/05/29 23:47:15 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1359 2014/06/03 23:38:02 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -2864,6 +2864,9 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState
*sp)
#if OPT_WIDE_ATTRS
case 2: /* faint, decreased intensity or second colour */
UIntSet(xw->flags, ATR_FAINT);
+ if_OPT_ISO_COLORS(screen, {
+ setExtendedFG(xw);
+ });
break;
case 3: /* italicized */
setItalicFont(xw, True);
@@ -9929,7 +9932,7 @@ ShowCursor(void)
drawXtermText(xw,
flags & DRAWX_MASK,
- flags & DRAWX_MASK,
+ 0,
currentGC, x, y,
LineCharSet(screen, ld),
&base, 1, 0);
@@ -10067,7 +10070,7 @@ HideCursor(void)
drawXtermText(xw,
flags & DRAWX_MASK,
- flags & DRAWX_MASK,
+ 0,
currentGC, x, y,
LineCharSet(screen, ld),
&base, 1, 0);
diff --git a/package/debian/changelog b/package/debian/changelog
index 16451c4..5defea5 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (306) unstable; urgency=low
+
+ * fix incomplete implementation of new SGRs
+
+ -- Thomas E. Dickey Tue, 03 Jun 2014 16:25:02
-0400
+
xterm-dev (305) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index e245243..84c64c7 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 305
+PORTVERSION= 306
CATEGORIES=x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 4c49109..1abfe9a 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.69 2014/05/10 13:31:26 tom Exp $
+# $XTermId: xterm.spec,v 1.70 2014/06/03 20:25:02 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: 305
+Version: 306
Release: 1
License: X11
Group: User Interface/X
diff --git a/util.c b/util.c
index a43415c..582a307 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.646 2014/05/27 00:17:14 tom Exp $ */
+/* $XTermId: util.c,v 1.648 2014/06/03 23:39:08 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -1089,7 +1089,7 @@ WriteText(XtermWidget xw, IChar *str, Cardinal len)
drawXtermText(xw,
test & DRAWX_MASK,
- test & DRAWX_MASK,
+ 0,
currentGC,
LineCursorX(screen, ld, screen->cur_col),
CursorY(screen, screen->cur_row),
@@ -4375,11 +4375,12 @@ getXtermForeground(XtermWidget xw, unsigned attr_flags,
int color)
#if OPT_WIDE_ATTRS
#define DIM_IT(n) work.n = (unsigned short) ((2 * work.n) / 3)
if ((attr_flags & ATR_FAINT)) {
- static Pixel last;
- if (result != last) {
+ static Pixel last_in;
+ static Pixel last_out;
+ if (result != last_in) {
XColor work;
work.pixel = result;
- last = result;
+ last_in = result;
if (XQueryColor(TScreenOf(xw)->display, xw->core.colormap, &work)) {
DIM_IT(red);
DIM_IT(green);
@@ -4388,6 +4389,9 @@ getXtermForeground(XtermWidget xw, unsigned attr_flags,
int color)
result = work.pixel;
}
xterm: Changes to 'upstream-unstable'
INSTALL | 12
MANIFEST |3
button.c | 52
charclass.c |4
charproc.c | 181 ++
configure| 3245 +++
configure.in | 10
ctlseqs.ms | 12
ctlseqs.txt |8
doublechr.c | 29
fontutils.c | 313 +++-
fontutils.h | 24
graphics.c |4
graphics_regis.c | 139 +-
main.c |3
menu.c |4
misc.c | 68
package/debian/changelog |6
package/freebsd/Makefile |2
package/xterm.spec |5
print.c | 20
ptydata.c| 66
ptyx.h | 69
screen.c | 75 -
scrollback.c | 14
terminfo |9
testxmc.c| 10
util.c | 441 --
version.h|6
xterm.appdata.xml| 24
xterm.h | 24
xterm.log.html | 78 +
xtermcfg.hin |5
33 files changed, 2860 insertions(+), 2105 deletions(-)
New commits:
commit da4dc0f6a03b79967f9f404763d813bae955ac94
Author: Julien Cristau
Date: Tue Jun 3 09:27:02 2014 +0200
Imported Upstream version 305
diff --git a/INSTALL b/INSTALL
index 2eab615..66336c4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.150 2014/04/11 19:36:41 Ross.Combs Exp $
+-- $XTermId: INSTALL,v 1.151 2014/05/08 07:58:06 tom Exp $
---
--- Copyright 1997-2012,2013 by Thomas E. Dickey
+-- Copyright 1997-2013,2014 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -339,6 +339,14 @@ The options (in alphabetic order):
A genuine vt100 emulates a vt52.
+ --disable-wide-attrsdisable wide-attribute support
+
+ Xterm's base attributes include all of those used in DEC terminals.
+ ISO 6429 defines a few more which historically have found little use.
+ Some people find these amusing.
+
+ This is normally enabled.
+
--disable-wide-charsdisable wide-character support
The wide-character code supports Unicode and UTF-8.
diff --git a/MANIFEST b/MANIFEST
index c140bba..001e738 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-304, version xterm-304
+MANIFEST for xterm-305, version xterm-305
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
@@ -100,6 +100,7 @@ wcwidth.h interface of wcwidth.c
xcharmouse.hJason Bacon's mouse-defs, cleaned up a little
xstrings.c a few common string functions
xstrings.h interface of xstrings.c
+xterm.appdata.xml sample "appdata.xml" file
xterm.dat application defaults for VMS port of 'xterm'
xterm.desktop sample desktop file for xterm.
xterm.h common includes, definitions and prototypes
for 'xterm'
diff --git a/button.c b/button.c
index 7dc6e86..69936a5 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.467 2014/04/22 00:50:10 tom Exp $ */
+/* $XTermId: button.c,v 1.473 2014/05/26 17:12:51 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -1235,7 +1235,7 @@ UTF8toLatin1(TScreen *screen, Char *s, unsigned long len,
unsigned long *result)
PtyData data;
fakePtyData(&data, s, s + len);
- while (decodeUtf8(&data)) {
+ while (decodeUtf8(screen, &data)) {
Bool fails = False;
Bool extra = False;
IChar value = skipPtyData(&data);
@@ -1846,7 +1846,7 @@ ToNational(TScreen *screen, Char *buffer, unsigned
*length)
memcpy(data->buffer, buffer, (size_t) *length);
p = buffer;
while (data->next < data->last) {
- if (!decodeUtf8(data)) {
+ if (!decodeUtf8(screen, data)) {
data->utf_size = 1;
data->utf_data = data->next[0];
}
@@ -2821,7 +2821,7 @@ static int
LastTextCol(TScreen *screen, LineData *ld, int row)
{
int i = -1;
-Char *ch;
+IAttr *ch;
if (ld != 0) {
if (okScrnRow(screen, row)) {
@@ -3229,8 +3229,8 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
if (regexec(&preg,
search + indexed[col],
(size_t) 1, &match, 0) == 0) {
- int start_inx = match.rm_so + indexed[col];
- int finis_inx = match.rm_eo + indexed[col];
+ int star
xterm: Changes to 'upstream-unstable'
INSTALL |6 Imakefile| 13 MANIFEST |6 Tekproc.c| 38 VTPrsTbl.c | 38 VTparse.def |5 VTparse.h|5 aclocal.m4 | 35 button.c | 120 - charproc.c | 389 +++-- configure| 3299 ++-- configure.in | 31 ctlseqs.ms | 74 ctlseqs.txt | 92 - doublechr.c |6 fontutils.c | 97 - graphics.c | 1491 graphics.h | 78 - graphics_regis.c | 3482 +++ graphics_regis.h | 48 graphics_sixel.c | 640 graphics_sixel.h | 48 input.c | 10 main.c | 89 - menu.c | 353 ++-- menu.h | 12 misc.c | 202 +- package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec |4 ptyx.h | 43 resize.c |8 screen.c | 20 trace.c |5 util.c | 28 version.h|6 xstrings.c | 18 xterm.h | 42 xterm.log.html | 72 xterm.man|8 xtermcap.c | 22 xtermcfg.hin |4 42 files changed, 7873 insertions(+), 3122 deletions(-) New commits: commit 7c49ea6ca1f85fff688378d401441558bba22588 Author: Sven Joachim Date: Mon May 5 17:51:41 2014 +0200 Imported Upstream version 304 diff --git a/INSTALL b/INSTALL index 2554ca2..2eab615 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.149 2013/08/04 19:33:14 tom Exp $ +-- $XTermId: INSTALL,v 1.150 2014/04/11 19:36:41 Ross.Combs Exp $ --- -- Copyright 1997-2012,2013 by Thomas E. Dickey -- @@ -482,6 +482,10 @@ The options (in alphabetic order): Compile-in code to support SCO-style function keys. + --enable-regis-graphics enable support for ReGIS graphics + + Compile-in code to support experimental ReGIS graphics + --enable-sixel-graphics enable support for sixel-graphics Compile-in code to support experimental sixel-graphics diff --git a/Imakefile b/Imakefile index 81b6ce8..0c2b20e 100644 --- a/Imakefile +++ b/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.109 2013/06/23 22:32:37 tom Exp $ +XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR #if !HasPutenv PUTENVDEF = -DNOPUTENV #endif +#ifdef RegisXTerm + SIXELDEF = -DOPT_REGIS_GRAPHICS=1 +#endif #ifdef SixelXTerm SIXELDEF = -DOPT_SIXEL_GRAPHICS=1 #endif @@ -182,9 +185,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR MAINSRC = main.c MAINOBJ = main.o +#ifdef RegisXTerm + SIXELSRC = graphics_regis.c + SIXELOBJ = graphics_regis.o +#endif #ifdef SixelXTerm - SIXELSRC = graphics.c - SIXELOBJ = graphics.o + SIXELSRC = graphics_sixel.c + SIXELOBJ = graphics_sixel.o #endif #ifdef TraceXTerm TRACESRC = trace.c diff --git a/MANIFEST b/MANIFEST index 7cc89db..c140bba 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-303, version xterm-303 +MANIFEST for xterm-304, version xterm-304 MANIFESTthis file 256colres.h resource-definitions for 256-color mode @@ -49,6 +49,10 @@ fontutils.h interface of fontutils.c gen-pc-fkeys.pl script to generate extended function-key terminfo graphics.c graphics support functions for 'xterm' graphics.h interface of graphics.c +graphics_regis.csupport for ReGIS +graphics_regis.hinterface of graphics_regis.c +graphics_sixel.csupport for Sixels +graphics_sixel.hinterface of graphics_sixel.c input.c VT100 key-symbol and function-key translation install-sh install-script (needed by configure) keysym2ucs.clookup-table for UTF-8 to keysyms diff --git a/Tekproc.c b/Tekproc.c index 3961c6b..5289bc0 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,7 +1,7 @@ -/* $XTermId: Tekproc.c,v 1.194 2012/09/07 09:08:44 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.196 2014/04/12 00:55:22 tom Exp $ */ /* - * Copyright 2001-2011,2012 by Thomas E. Dickey + * Copyright 2001-2012,2014 by Thomas E. Dickey *
xterm: Changes to 'upstream-unstable'
MANIFEST |2 -
THANKS |6 ++-
main.c | 48
misc.c | 60 +++
package/debian/changelog |6 +++
package/freebsd/Makefile |2 -
package/xterm.spec |4 +-
version.h|6 +--
xterm.log.html | 29 -
xterm.man| 79 +--
10 files changed, 190 insertions(+), 52 deletions(-)
New commits:
commit 95e6e9e31c13949dfaed09cedf61b6bdbbf97eb9
Author: Sven Joachim
Date: Fri Mar 7 17:49:03 2014 +0100
Imported Upstream version 303
diff --git a/MANIFEST b/MANIFEST
index bc11abb..7cc89db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-302, version xterm-302
+MANIFEST for xterm-303, version xterm-303
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index a38ebf9..1b83740 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.11 2013/08/08 08:24:07 tom Exp $
+-- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -13,6 +13,7 @@ Here's a list from xterm.log.html of people who have
contributed changes.
Adam M Costello
Adam Sulmicki
Ailin Nemui
+Al Poole
Alan Coopersmith
Alex Hornung
Alexander Pohoyda
@@ -23,6 +24,7 @@ Andreas Schwab
Andres Perera
Andrew Sumner
Andrew Tipton
+Andrey Panov
Andries E Brouwer
Anton Kovalenko
Balazs Kezes
@@ -155,6 +157,7 @@ Rob Braun
Robert Brady
Robert Earl
Robin Cutshaw
+Romain Francois
Ross Combs
Ross Paterson
Ryan Johnson
@@ -184,6 +187,7 @@ Tomohiro Kubota
Tor Lillqvist
Torrey Lyons
Victor Stinner
+Vincent Lefevre
Werner Lemberg
Will Day
Zdenek Sekera
diff --git a/main.c b/main.c
index 6157068..c644e7a 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.748 2014/03/03 01:15:27 tom Exp $ */
+/* $XTermId: main.c,v 1.751 2014/03/07 02:35:39 tom Exp $ */
/*
* Copyright 2002-2013,2014 by Thomas E. Dickey
@@ -1203,6 +1203,9 @@ static OptionHelp xtermOptions[] = {
{ "-/+rw", "turn on/off reverse wraparound" },
{ "-/+s", "turn on/off multiscroll" },
{ "-/+sb", "turn on/off scrollbar" },
+#if OPT_REPORT_COLORS
+{ "-report-colors","report colors as they are allocated" },
+#endif
#if OPT_REPORT_FONTS
{ "-report-fonts", "report fonts as loaded to stdout" },
#endif
@@ -3149,9 +3152,37 @@ find_utmp(struct UTMP_STR *tofind)
#define USE_NO_DEV_TTY 0
#endif
+static int
+same_leaf(char *a, char *b)
+{
+char *p = x_basename(a);
+char *q = x_basename(b);
+return !strcmp(p, q);
+}
+
+/*
+ * "good enough" (inode wouldn't port to Cygwin)
+ */
+static int
+same_file(const char *a, const char *b)
+{
+struct stat asb;
+struct stat bsb;
+int result = 0;
+
+if ((stat(a, &asb) == 0)
+ && (stat(b, &bsb) == 0)
+ && ((asb.st_mode & S_IFMT) == S_IFREG)
+ && ((bsb.st_mode & S_IFMT) == S_IFREG)
+ && (asb.st_mtime == bsb.st_mtime)
+ && (asb.st_size == bsb.st_size)) {
+ result = 1;
+}
+return result;
+}
+
/*
* Only set $SHELL for paths found in the standard location.
- * ...or if $SHELL happens to give an absolute pathname to an executable.
*/
static Boolean
validShell(const char *pathname)
@@ -3179,6 +3210,9 @@ validShell(const char *pathname)
TRACE(("...test \"%s\"\n", q));
if (!strcmp(q, pathname)) {
result = True;
+ } else if (same_leaf(q, (char *) pathname) &&
+ same_file(q, pathname)) {
+ result = True;
}
free(r);
}
@@ -4577,7 +4611,7 @@ spawnXTerm(XtermWidget xw)
* program rather than choosing between $SHELL and "/bin/sh".
*/
if (validShell(explicit_shname)) {
- xtermSetenv("SHELL", shell_path = explicit_shname);
+ xtermSetenv("SHELL", explicit_shname);
} else if (validProgram(shell_path = x_getenv("SHELL"))) {
if (!validShell(shell_path)) {
xtermUnsetenv("SHELL");
@@ -4595,11 +4629,13 @@ spawnXTerm(XtermWidget xw)
* Set $XTERM_SHELL, which is not necessarily a valid shell, but
* is executable.
*/
- if (explicit_shname != 0 && access(explicit_shname, X_OK) == 0) {
- free(shell_path);
+ if (validProgram(explicit_shname)) {
shell_path =
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Makefile.in | 21 -
charproc.c | 30 +---
data.h |7 +
main.c | 26 ---
minstall.in | 10 +-
misc.c | 174 ---
package/debian/changelog |6 +
package/debian/control |2
package/debian/rules |2
package/freebsd/Makefile |2
package/xterm.spec | 39 +-
ptyx.h | 26 +--
trace.c |7 +
version.h|6 -
vttests/256colors.pl | 13 ++-
vttests/256colors2.pl| 13 +--
vttests/88colors.pl | 11 ++
vttests/88colors2.pl | 13 +--
vttests/dynamic.pl |7 +
vttests/paste64.pl |8 +-
vttests/query-color.pl |7 +
vttests/query-fonts.pl |7 +
vttests/resize.pl| 28 +--
vttests/tcapquery.pl |7 +
xterm.h |4 -
xterm.log.html | 53 ++
xterm.man| 53 ++
28 files changed, 413 insertions(+), 171 deletions(-)
New commits:
commit f5a1486f17c95692747293c2400117ea79439c88
Author: Sven Joachim
Date: Mon Mar 3 18:44:37 2014 +0100
Imported Upstream version 302
diff --git a/MANIFEST b/MANIFEST
index 95ab9da..bc11abb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-301, version xterm-301
+MANIFEST for xterm-302, version xterm-302
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index a468ff5..1dc71ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-## $XTermId: Makefile.in,v 1.223 2013/06/23 23:40:18 tom Exp $
+## $XTermId: Makefile.in,v 1.225 2014/03/01 15:15:26 tom Exp $
# -
# this file is part of xterm
#
-# Copyright 1997-2012,2013 by Thomas E. Dickey
+# Copyright 1997-2013,2014 by Thomas E. Dickey
#
# All Rights Reserved
#
@@ -189,6 +189,21 @@ resize$x : $(OBJS2)
perl $(srcdir)/88colres.pl > $@
charproc$o : main.h @CHARPROC_DEPS@
+
+misc$o : builtin_icons.h
+
+# do this to quiet gcc -Wcast-qual warnings
+builtin_icons.h :
+ @echo "#if OPT_BUILTIN_XPMS" >$@
+ @echo "#include " >>$@
+ @echo "#include " >>$@
+ @echo "#include " >>$@
+ @echo "#include " >>$@
+ @echo "#else" >>$@
+ @sed -e 's/static char \* /static const char * /'
$(srcdir)/icons/mini.xterm_48x48.xpm >>$@
+ @echo "#endif" >>$@
+ @echo "made $@"
+
actual_xterm = `echo xterm|sed '$(transform)'`
actual_resize = `echo resize| sed '$(transform)'`
@@ -418,7 +433,7 @@ mostlyclean :
-$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
clean : mostlyclean
- -$(RM) $(PROGRAMS)
+ -$(RM) $(PROGRAMS) builtin_icons.h
distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
diff --git a/charproc.c b/charproc.c
index 4991f68..1ebd75d 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: charproc.c,v 1.1319 2013/11/26 20:38:11 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1322 2014/03/02 23:32:05 tom Exp $ */
/*
- * Copyright 1999-2012,2013 by Thomas E. Dickey
+ * Copyright 1999-2013,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -3924,12 +3924,16 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState
*sp)
* command-line, allow it to be enabled/disabled by
* control sequence.
*/
+ TRACE(("CASE_UTF8 wide:%d, utf8:%d, req:%s\n",
+ screen->wide_chars,
+ screen->utf8_mode,
+ BtoS(c == 'G')));
+ if ((!screen->wide_chars) && (c == 'G')) {
+ WriteNow();
+ ChangeToWide(xw);
+ }
if (screen->wide_chars
- && screen->utf8_mode != uAlways) {
- if (!screen->wide_chars) {
- WriteNow();
- ChangeToWide(xw);
- }
+ && !screen->utf8_always) {
switchPtyData(screen, c == 'G');
TRACE(("UTF8 mode %s\n",
BtoS(screen->utf8_mode)));
@@ -6937,6 +6941,7 @@ VTInitialize_locale(XtermWidget xw)
TRACE(("... request screen.utf8_mode = %d\n", screen->utf8_mode));
TRACE(("... request screen.utf8_fonts = %d\n", screen->utf8_fonts));
+screen->utf8_always = (screen->utf8_mode == uAlways);
if (screen->utf8_mode < 0)
screen->utf8_mode = uFalse;
@@ -7397,6 +7402,11 @@ VTInitialize(Widget wrequest,
*/
TScreenOf(wn
xterm: Changes to 'upstream-unstable'
MANIFEST |2
config.guess | 30
configure| 2505 +++
configure.in |5
ctlseqs.ms | 34
ctlseqs.txt | 16
fontutils.c | 15
fontutils.h |7
main.c | 107 +-
misc.c | 70 -
package/debian/changelog |6
package/debian/copyright |2
package/freebsd/Makefile |2
package/xterm.spec |4
util.c | 37
version.h|8
xterm.h |8
xterm.log.html | 46
xterm.man| 192 ++-
xtermcfg.hin |5
20 files changed, 1674 insertions(+), 1427 deletions(-)
New commits:
commit 8e93c34ea71623763318a83fbac8b8457c225059
Author: Sven Joachim
Date: Mon Jan 20 19:35:56 2014 +0100
Imported Upstream version 301
diff --git a/MANIFEST b/MANIFEST
index 499d9ab..95ab9da 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-300, version xterm-300
+MANIFEST for xterm-301, version xterm-301
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/config.guess b/config.guess
index b79252d..9afd676 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2013-11-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1260,16 +1260,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
diff --git a/configure b/configure
index 1ec5f9f..d24be2d 100755
--- a/configure
+++ b/configure
@@ -4550,6 +4550,7 @@ fi
for ac_func in \
gethostname \
getlogin \
+ initgroups \
mkdtemp \
putenv \
unsetenv \
@@ -4562,13 +4563,13 @@ for ac_func in \
wcwidth
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4565: checking for $ac_func" >&5
+echo "$as_me:4566: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4571 "configure"
+#line 4572 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -4599,16 +4600,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f ==
0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4603: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4605: \$? = $ac_status" >&5
+ echo "$as_me:4606: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4608: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4609: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4611: \$? = $ac_status" >&5
+ echo "$as_me:4612: \$? = $ac_status" >&5
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
misc.c |3 +--
package/debian/changelog |6 ++
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
version.h|6 +++---
xterm.log.html | 19 ++-
7 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit 9d1d81fcbf72e3222b196493a9a0cbed10a43f93
Author: Sven Joachim
Date: Wed Dec 4 17:49:17 2013 +0100
Imported Upstream version 300
diff --git a/MANIFEST b/MANIFEST
index 1804074..499d9ab 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-299, version xterm-299
+MANIFEST for xterm-300, version xterm-300
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/misc.c b/misc.c
index 9c26cb6..129d0a5 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.681 2013/11/26 22:47:29 tom Exp $ */
+/* $XTermId: misc.c,v 1.682 2013/12/03 23:24:48 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -735,7 +735,6 @@ init_colored_cursor(void)
strcat(leaf, theme);
if ((fp = fopen(xterm_cursor_theme, "w")) != 0) {
fprintf(fp, "[Icon Theme]\n");
- fprintf(fp, "Inherits=\n");
fclose(fp);
*leaf = '\0';
xtermSetenv("XCURSOR_PATH", xterm_cursor_theme);
diff --git a/package/debian/changelog b/package/debian/changelog
index 00907c7..828b54c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (300) unstable; urgency=high
+
+ * fix a regression from #298 changes
+
+ -- Thomas E. Dickey Tue, 03 Dec 2013 18:59:58
-0500
+
xterm-dev (299) unstable; urgency=low
* fix remaining regression from #297 changes
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index b3c4f6c..9d0bcb3 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 299
+PORTVERSION= 300
CATEGORIES=x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 854d4b4..092668a 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.57 2013/12/01 16:47:52 tom Exp $
+# $XTermId: xterm.spec,v 1.58 2013/12/03 23:59:13 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: 299
+Version: 300
Release: 1
License: X11
Group: User Interface/X
diff --git a/version.h b/version.h
index 50477c5..bc96669 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.375 2013/12/01 16:38:13 tom Exp $ */
+/* $XTermId: version.h,v 1.376 2013/12/03 23:53:59 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 299
-#define XTERM_DATE2013-12-01
+#define XTERM_PATCH 300
+#define XTERM_DATE2013-12-03
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 4af7eec..3fb93b0 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.1407 2013/12/01 20:56:56 tom Exp $
+ $XTermId: xterm.log.html,v 1.1410 2013/12/04 00:16:42 tom Exp $
-->
@@ -69,6 +69,8 @@
CHANGELOG).
+Patch #300 - 2013/12/03
+
Patch #299 - 2013/12/01
Patch #298 - 2013/11/27
@@ -880,6 +882,21 @@
Patch #1 - 1996/1/6
+ Patch #300 -
+ 2013/12/03
+
+
+amend workaround for Xcursor library from
+patch #298; the suggested solution for
+Debian #466704 fell afoul of a bug in Xcursor
+which treated an empty value for Inherits= as a
+valid theme—and resulted in a stack overflow due to
+unbounded recursion. Certain environments such as XFCE4 exposed
+the bug. A related report in Debian #531679 was closed without
+following the recommendation to limit stack recursion in this
+library (reported by Sergey V Dyatko, Debian #731269).
+
+
Patch #299 -
2013/12/01
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vofyj-0006wy...@moszumanska.debian.org
xterm: Changes to 'upstream-unstable'
MANIFEST |3 ++-
Tekproc.c|4 ++--
VTPrsTbl.c |4 ++--
charsets.c |4 ++--
cursor.c |4 ++--
doublechr.c |4 ++--
minstall.in |4 ++--
package/debian/changelog |6 ++
package/debian/copyright |2 +-
package/freebsd/Makefile |2 +-
package/xterm.spec |4 ++--
trace.h |4 ++--
version.h|6 +++---
xterm.log.html | 14 +-
xtermcap.h |4 ++--
15 files changed, 44 insertions(+), 25 deletions(-)
New commits:
commit a5ef86eb6abce2eada071b4c97a8571daa990ad5
Author: Sven Joachim
Date: Mon Dec 2 18:33:49 2013 +0100
Imported Upstream version 299
diff --git a/MANIFEST b/MANIFEST
index 91125e6..1804074 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-298, version xterm-298
+MANIFEST for xterm-299, version xterm-299
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
@@ -48,6 +48,7 @@ fontutils.c xterm functions for
(re)loading fonts
fontutils.h interface of fontutils.c
gen-pc-fkeys.pl script to generate extended function-key
terminfo
graphics.c graphics support functions for 'xterm'
+graphics.h interface of graphics.c
input.c VT100 key-symbol and function-key translation
install-sh install-script (needed by configure)
keysym2ucs.clookup-table for UTF-8 to keysyms
diff --git a/Tekproc.c b/Tekproc.c
index bb22f3b..3961c6b 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.193 2012/09/07 09:08:44 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.194 2012/09/07 09:08:44 tom Exp $ */
/*
- * Copyright 2001-2010,2011 by Thomas E. Dickey
+ * Copyright 2001-2011,2012 by Thomas E. Dickey
*
* All Rights Reserved
*
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index 34accc3..9f67957 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,7 +1,7 @@
-/* $XTermId: VTPrsTbl.c,v 1.72 2013/08/21 23:50:44 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.73 2013/08/21 23:50:44 tom Exp $ */
/*
- * Copyright 1999-2011,2012 by Thomas E. Dickey
+ * Copyright 1999-2012,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
diff --git a/charsets.c b/charsets.c
index 5644fd1..fbad58a 100644
--- a/charsets.c
+++ b/charsets.c
@@ -1,4 +1,4 @@
-/* $XTermId: charsets.c,v 1.66 2013/09/16 21:26:10 tom Exp $ */
+/* $XTermId: charsets.c,v 1.67 2013/12/01 16:38:13 tom Exp $ */
/*
* Copyright 1998-2011,2013 by Thomas E. Dickey
@@ -576,7 +576,7 @@ xtermCharSetOut(XtermWidget xw, IChar *buf, IChar *ptr, int
leftset)
case nrc_DEC_Spec_Graphic:
if (seven > 0x5f && seven <= 0x7e) {
#if OPT_WIDE_CHARS
- if (screen->utf8_nrc_mode)
+ if (screen->utf8_mode || screen->utf8_nrc_mode)
chr = (int) dec2ucs((unsigned) (seven - 0x5f));
else
#endif
diff --git a/cursor.c b/cursor.c
index 034f5fe..6fdc35d 100644
--- a/cursor.c
+++ b/cursor.c
@@ -1,7 +1,7 @@
-/* $XTermId: cursor.c,v 1.68 2013/08/08 08:16:40 Iwamoto.Kouichi Exp $ */
+/* $XTermId: cursor.c,v 1.69 2013/08/08 08:16:40 tom Exp $ */
/*
- * Copyright 2002-2010,2012 by Thomas E. Dickey
+ * Copyright 2002-2012,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
diff --git a/doublechr.c b/doublechr.c
index 36418a5..d228e7f 100644
--- a/doublechr.c
+++ b/doublechr.c
@@ -1,7 +1,7 @@
-/* $XTermId: doublechr.c,v 1.82 2013/08/30 21:35:13 tom Exp $ */
+/* $XTermId: doublechr.c,v 1.83 2013/08/30 21:35:13 tom Exp $ */
/*
- * Copyright 1997-2011,2012 by Thomas E. Dickey
+ * Copyright 1997-2012,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
diff --git a/minstall.in b/minstall.in
index bc9e032..86a40bc 100644
--- a/minstall.in
+++ b/minstall.in
@@ -1,9 +1,9 @@
#!/bin/sh
-# $XTermId: minstall.in,v 1.19 2013/04/21 18:58:54 Andres.Perera Exp $
+# $XTermId: minstall.in,v 1.20 2013/04/21 18:58:54 tom Exp $
# -
# this file is part of xterm
#
-# Copyright 2001-2011,2012 by Thomas E. Dickey
+# Copyright 2001-2012,2013 by Thomas E. Dickey
#
# All Rights Reserved
#
diff --git a/package/debian/changelog b/package/debian/changelog
index 24e9d76..00907c7 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (299) unstable; urgency=low
+
+ * fix remaining regression from #297 changes
+
+ -- Thomas E. Dickey Sun, 01 Dec 2013 11:48:42
-0500
+
xterm-dev (298) unstable; urgency=low
* miscellan
xterm: Changes to 'upstream-unstable'
MANIFEST |2 aclocal.m4 | 30 button.c |4 charproc.c |8 charsets.c |5 config.guess | 167 +-- config.sub | 89 - configure| 2563 --- configure.in |6 ctlseqs.ms | 20 ctlseqs.txt | 15 data.c |8 data.h | 11 fontutils.c | 135 ++ fontutils.h |6 graphics.c | 46 input.c | 13 main.c | 41 misc.c | 81 + package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec |4 ptyx.h |6 trace.c | 20 trace.h |4 util.c | 145 +- version.h|6 xstrings.c |8 xterm.h |4 xterm.log.html | 55 - xterm.man| 21 xtermcfg.hin |4 32 files changed, 2010 insertions(+), 1525 deletions(-) New commits: commit 4d8cd69e7b269c9f9d88ef0722bb0da0a73db363 Author: Sven Joachim Date: Wed Nov 27 19:10:34 2013 +0100 Imported Upstream version 298 diff --git a/MANIFEST b/MANIFEST index 08d673c..91125e6 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-297, version xterm-297 +MANIFEST for xterm-298, version xterm-298 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/aclocal.m4 b/aclocal.m4 index da13727..3a1f086 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $XTermId: aclocal.m4,v 1.369 2013/07/10 01:29:34 tom Exp $ +dnl $XTermId: aclocal.m4,v 1.372 2013/11/20 00:24:55 tom Exp $ dnl dnl --- dnl @@ -376,7 +376,7 @@ fi ])dnl dnl --- -dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 +dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 dnl - dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -387,7 +387,7 @@ dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from dnl the wrappers for gcc and g++ warnings. dnl dnl $1 = GCC (default) or GXX -dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS +dnl $2 = CLANG_COMPILER (default) dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_CLANG_COMPILER],[ ifelse([$2],,CLANG_COMPILER,[$2])=no @@ -950,7 +950,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --- -dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 +dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35 dnl --- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1022,10 +1022,14 @@ then EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -1033,7 +1037,7 @@ then Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST $1 + Wundef $cf_gcc_warnings $cf_warn_CONST $1 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" if AC_TRY_EVAL(ac_compile); then @@ -1446,7 +1450,7 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --- -dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03 +dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05 dnl -- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -1455,7 +1459,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi + *-o
xterm: Changes to 'upstream-unstable'
INSTALL | 50 +- MANIFEST |2 THANKS |4 VTPrsTbl.c | 342 ++- VTparse.def |6 VTparse.h|7 button.c | 291 ++-- charproc.c | 297 +--- charsets.c | 825 +-- configure| 138 +++ configure.in | 52 +- ctlseqs.ms | 28 + ctlseqs.txt | 29 + cursor.c |4 doublechr.c |6 fontutils.c | 68 +-- fontutils.h | 20 - graphics.c | 18 - input.c | 19 - misc.c | 87 ++-- package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec |4 ptyx.h | 64 +++ screen.c | 12 trace.c | 110 +++--- trace.h |9 util.c | 90 +++-- version.h|6 xterm.h | 10 xterm.log.html | 97 + xterm.man|7 32 files changed, 1848 insertions(+), 862 deletions(-) New commits: commit 109db94a827306c71c63fd8e3314e21509bde184 Author: Sven Joachim Date: Wed Sep 11 17:33:32 2013 +0200 Imported Upstream version 297 diff --git a/INSTALL b/INSTALL index 9d555fc..2554ca2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.148 2013/06/23 20:22:46 tom Exp $ +-- $XTermId: INSTALL,v 1.149 2013/08/04 19:33:14 tom Exp $ --- -- Copyright 1997-2012,2013 by Thomas E. Dickey -- @@ -30,23 +30,12 @@ --- Xterm was originally built as part of the X Window System source tree, using -imake to generate a Makefile from Imakefile. You can also use the configure -script to generate a Makefile from Makefile.in: +imake to generate a Makefile from Imakefile. - + If you have imake (or xmkmf), then you can use those directly, - or use the configure script, which normally uses those tools - to obtain the special definitions needed to build xterm. +An example Imakefile is provided for legacy use. - Ultimately, imake will not be necessary, since it is possible - to add configure tests that derive the information that imake - would supply. - - + You need the Athena widgets (or a clone, such as Xaw3d or - neXtaw), to provide the popup menus. - -Even if you have imake, the configure script is still convenient because -it allows you to build different configurations more easily than with -imake, simply by specifying options to the configure script. +The preferred method uses the configure script to generate a Makefile from +Makefile.in Options: --- @@ -221,6 +210,15 @@ The options (in alphabetic order): tool. Normally these chunks of memory are retained as long as xterm is running. + --disable-luit disable support for luit filter (Unicode translation) + + Luit is a filter that can be run between an arbitrary application and a + UTF-8 terminal emulator. It will convert application output from the + locale's encoding into UTF-8, and convert terminal input from UTF-8 + into the locale's encoding. + + This is normally enabled, relying upon "--enable-wide-chars". + --disable-maximize disable actions for iconify/deiconify/maximize/restore Do not compile-in code that implements runtime 'actions' for @@ -341,6 +339,12 @@ The options (in alphabetic order): A genuine vt100 emulates a vt52. + --disable-wide-charsdisable wide-character support + + The wide-character code supports Unicode and UTF-8. + + This is normally enabled. + --disable-ziconbeep disable -ziconbeep option Do not compile-in code that modifies the icon's title and sounds a @@ -436,15 +440,6 @@ The options (in alphabetic order): Logging was disabled in X11R5 xterm because of security problems. They were addressed in X11R6, but the feature was not reinstated. - --enable-luit enable support for luit filter (Unicode translation) - - Luit is a filter that can be run between an arbitrary application and a - UTF-8 terminal emulator. It will convert application output from the - locale's encoding into UTF-8, and convert terminal input from UTF-8 - into the locale's encoding. - - This sets "--enable-wide-chars" as a side-effect. - --enable-meta-sends-esc set default metaSendsEscape resource (default: no) This sets the default resource value, which is shown in the manpage. @@ -523,11 +518,6 @@ The options (in alphabetic order): I use th
xterm: Changes to 'upstream-unstable'
MANIFEST |2
aclocal.m4 | 10 +-
configure| 20 ++---
graphics.c | 164 ---
graphics.h | 16 ++--
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4 -
screen.c | 66 +-
util.c | 70 +++-
version.h|6 -
xterm.log.html | 20 +
12 files changed, 244 insertions(+), 142 deletions(-)
New commits:
commit a3928ced8a82ccb420c23b2caad32f758cbf4aab
Author: Sven Joachim
Date: Thu Jul 11 20:24:55 2013 +0200
Imported Upstream version 296
diff --git a/MANIFEST b/MANIFEST
index 03fd848..5675bd8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-295, version xterm-295
+MANIFEST for xterm-296, version xterm-296
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index e32778e..da13727 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.368 2013/07/07 01:30:48 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.369 2013/07/10 01:29:34 tom Exp $
dnl
dnl ---
dnl
@@ -188,7 +188,7 @@ dnl $1 = libraries to add, with the "-l", etc.
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1
[$]ifelse($2,,LIBS,[$2])"])dnl
dnl ---
-dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
dnl
dnl Add a given library after another, e.g., following the one it satisfies a
dnl dependency for.
@@ -197,7 +197,7 @@ dnl $1 = the first library
dnl $2 = its dependency
AC_DEFUN([CF_ADD_LIB_AFTER],[
CF_VERBOSE(...before $LIBS)
-LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[]]*/ /g" -e "s,$1 ,$1 $2 ," -e
's/ / /g'`
+LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[]]*/ /g" -e "s%$1 %$1 $2 %" -e
's% % %g'`
CF_VERBOSE(...after $LIBS)
])dnl
dnl ---
@@ -2322,7 +2322,7 @@ foo.c_ospeed = B9600;
test "$cf_cv_termio_c_ispeed" = yes &&
AC_DEFINE(HAVE_TERMIO_C_ISPEED,1,[define 1 if we have IRIX 6.5 baud-rate
redefinitions])
])dnl
dnl ---
-dnl CF_TRIM_X_LIBS version: 1 updated: 2013/07/06 21:27:06
+dnl CF_TRIM_X_LIBS version: 2 updated: 2013/07/09 21:27:22
dnl --
dnl Trim extra base X libraries added as a workaround for inconsistent library
dnl dependencies returned by "new" pkg-config files.
@@ -2331,7 +2331,7 @@ AC_DEFUN([CF_TRIM_X_LIBS],[
do
case "$LIBS" in
*-l$cf_trim_lib\ *-l$cf_trim_lib*)
- LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
CF_VERBOSE(..trimmed $LIBS)
;;
esac
diff --git a/configure b/configure
index 1f4a5e6..1bfcb84 100755
--- a/configure
+++ b/configure
@@ -9225,7 +9225,7 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6
echo "${as_me:-configure}:9226: testing ...before $LIBS ..." 1>&5
-LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11
," -e 's/ / /g'`
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11
%" -e 's% % %g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
echo "${as_me:-configure}:9231: testing ...after $LIBS ..." 1>&5
@@ -9497,7 +9497,7 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6
echo "${as_me:-configure}:9498: testing ...before $LIBS ..." 1>&5
-LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt
$X_PRE_LIBS ," -e 's/ / /g'`
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt
$X_PRE_LIBS %" -e 's% % %g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
echo "${as_me:-configure}:9503: testing ...after $LIBS ..." 1>&5
@@ -10267,7 +10267,7 @@ EOF
do
case "$LIBS" in
*-l$cf_trim_lib\ *-l$cf_trim_lib*)
- LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
test -n "$verbose" && echo "..trimmed $LIBS" 1>&6
echo "${as_me:-configure}:10273: testing ..trimmed $LIBS ..." 1>&5
@@ -10436,7 +10436,7 @@ test -n "$verbose" && echo "...before $L
xterm: Changes to 'upstream-unstable'
INSTALL |6
Imakefile| 15
MANIFEST |3
Makefile.in |4
THANKS |7
VTparse.h|2
XTerm.ad |4
aclocal.m4 | 47
button.c | 10
charproc.c | 269 ++-
configure| 3366 ---
configure.in | 15
ctlseqs.ms | 104 +
ctlseqs.txt | 215 +--
graphics.c | 1409 +++
graphics.h | 66
menu.c | 72 -
menu.h | 18
misc.c | 248 ++-
package/debian/changelog | 12
package/debian/rules |1
package/freebsd/Makefile |2
package/xterm.spec |5
plink.sh | 33
ptyx.h | 132 +
screen.c | 36
scrollbar.c |3
util.c | 36
version.h|6
xterm.h | 11
xterm.log.html | 60
xterm.man| 67
xtermcap.h |4
xtermcfg.hin |3
34 files changed, 4299 insertions(+), 1992 deletions(-)
New commits:
commit 03c940de3dd124a2baa8c1c324d07a23b0aa4b69
Author: Sven Joachim
Date: Sun Jul 7 08:30:46 2013 +0200
Imported Upstream version 295
diff --git a/MANIFEST b/MANIFEST
index 5c9f348..03fd848 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-294, version xterm-294
+MANIFEST for xterm-295, version xterm-295
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index c25a90b..e32778e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.365 2013/05/27 22:36:25 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.368 2013/07/07 01:30:48 tom Exp $
dnl
dnl ---
dnl
@@ -2322,7 +2322,23 @@ foo.c_ospeed = B9600;
test "$cf_cv_termio_c_ispeed" = yes &&
AC_DEFINE(HAVE_TERMIO_C_ISPEED,1,[define 1 if we have IRIX 6.5 baud-rate
redefinitions])
])dnl
dnl ---
-dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30
+dnl CF_TRIM_X_LIBS version: 1 updated: 2013/07/06 21:27:06
+dnl --
+dnl Trim extra base X libraries added as a workaround for inconsistent library
+dnl dependencies returned by "new" pkg-config files.
+AC_DEFUN([CF_TRIM_X_LIBS],[
+ for cf_trim_lib in Xmu Xt X11
+ do
+ case "$LIBS" in
+ *-l$cf_trim_lib\ *-l$cf_trim_lib*)
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ CF_VERBOSE(..trimmed $LIBS)
+ ;;
+ esac
+ done
+])
+dnl ---
+dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
dnl -
dnl This is a simple wrapper to use for pkg-config, for libraries which may be
dnl available in that form.
@@ -2343,6 +2359,8 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists
$1; then
CF_ADD_LIBS($cf_pkgconfig_libs)
ifelse([$2],,:,[$2])
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
ifelse([$3],,:,[$3])
fi
])
@@ -3822,7 +3840,7 @@ make an error
fi
])
dnl ---
-dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
+dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06
dnl ---
dnl Check for Xaw (Athena) libraries
dnl
@@ -3881,6 +3899,8 @@ if test "$PKG_CONFIG" != none ; then
CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+ CF_TRIM_X_LIBS
+
AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
AC_TRY_LINK([
#include
@@ -3896,7 +3916,15 @@ int check = XmuCompareISOLatin1("big", "small")
;;
*)
CF_VERBOSE(work around broken package)
-
CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)])
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed
-e 's/^[ ][ ]*//' -e 's/ .*//'`
+ CF_TRY_PKG_CONFIG(xmu,[
+ LIBS="$cf_save_xmu"
+
CF_ADD_LIB_AFTER($cf_first_lib,$cf_pk
xterm: Changes to 'upstream-unstable'
INSTALL | 15 MANIFEST |2 Makefile.in | 56 aclocal.m4 | 31 button.c | 18 charproc.c | 53 configure| 3193 +++ configure.in |3 fontutils.c |4 main.c | 53 misc.c |9 package/debian/changelog |6 package/freebsd/Makefile |2 package/xterm.spec | 68 - print.c | 38 ptyx.h | 14 util.c |4 version.h|6 xterm.log.html | 256 ++- xterm.man| 100 + xtermcfg.hin |3 21 files changed, 2097 insertions(+), 1837 deletions(-) New commits: commit 9d791112866a5ac58ae9bd05f41f277cb8c099c0 Author: Sven Joachim Date: Tue May 28 19:56:26 2013 +0200 Imported Upstream version 293 diff --git a/INSTALL b/INSTALL index 1918578..c31726d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $ +-- $XTermId: INSTALL,v 1.147 2013/05/27 22:19:09 tom Exp $ --- -- Copyright 1997-2012,2013 by Thomas E. Dickey -- @@ -625,6 +625,19 @@ The options (in alphabetic order): small sizes. This is used for window decoration, e.g., the icon at the upper left corner in many window managers. + --with-icon-symlink=NAME create symbolic links to icon name (default: NONE) + + This is a workaround for certain systems which translate icon names + containing "xterm", e.g., "xterm-color" into the single icon "xterm". + The option should also be harmless on a properly configured system. + + If the option is used, its default value is "xterm". For each icon, + the makefile will strip the suffix (e.g., ".png"), as well as the part + of the filename which denotes the size (e.g., "_32x32" in an xpm file), + and constructs a link with that name to the icon. + + If the option is unused, its default value is "NONE" (no link is made). + --with-icondir=DIR directory in which to install icon files (default: no) The X libraries may automatically search these locations: diff --git a/MANIFEST b/MANIFEST index 0ea4ed9..25e9cc5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-292, version xterm-292 +MANIFEST for xterm-293, version xterm-293 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Makefile.in b/Makefile.in index b35582f..f9c3f20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.216 2013/01/03 01:33:29 tom Exp $ +## $XTermId: Makefile.in,v 1.219 2013/05/27 19:39:59 tom Exp $ # - # this file is part of xterm # @@ -83,11 +83,15 @@ pixmapdir = @PIXMAPDIR@ End of system configuration section. +ICON_NAME = @ICON_NAME@ +ICON_SYMLINK = @ICON_SYMLINK@ + DESTDIR= BINDIR = $(DESTDIR)$(bindir) LIBDIR = $(DESTDIR)$(libdir) MANDIR = $(DESTDIR)$(mandir) APPSDIR= $(DESTDIR)$(appsdir) + @no_icondir@ICONDIR= $(DESTDIR)$(icondir) @no_pixmapdir@PIXMAPDIR= $(DESTDIR)$(pixmapdir) @@ -267,17 +271,29 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm @no_icondir@install-icon \ @no_icondir@install-full :: $(ICONDIR) @no_icondir@ ACTUAL_XTERM=$(actual_xterm) \ -@no_icondir@ $(SHELL) -c 'for n in $(ICON_LIST); \ -@no_icondir@ do \ -@no_icondir@ x=$$ACTUAL_XTERM; \ -@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \ -@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,@ICON_NAME@,$$x-color,`; \ -@no_icondir@ test -z "$$r" && continue; \ +@no_icondir@ $(SHELL) -c '\ @no_icondir@ h=$(ICONDIR)/$(ICON_THEME); \ -@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \ -@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \ -@no_icondir@ echo installing icon $$h/$$r; \ -@no_icondir@ $(INSTALL_DATA) $$l $$h/$$r; \ +@no_icondir@ for n in $(ICON_LIST); \ +@no_icondir@ do \ +@no_icondir@ x=$$ACTUAL_XTERM; \ +@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \ +@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,$(ICON_NAME),$$x-color,`; \ +@no_icondir@ test -z "$$r" && continue; \ +@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \ +@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \ +@no_icondir@ echo "installing icon $$h/$$r"; \ +@no_
xterm: Changes to 'upstream-unstable'
INSTALL | 97 Imakefile | 32 MANIFEST | 42 Makefile.in | 187 THANKS| 12 Tekproc.c |7 VTPrsTbl.c| 110 VTparse.def | 10 VTparse.h | 16 aclocal.m4| 1336 ++ button.c | 226 charproc.c| 2579 +++-- config.guess | 202 config.sub| 112 configure |12266 ++--- configure.in | 233 ctlseqs.ms| 311 ctlseqs.txt | 527 - cursor.c | 166 data.h|6 dev/null |binary df-install.in | 19 doublechr.c | 44 error.h |5 fontutils.c | 68 icons/filled-xterm.png|binary icons/filled-xterm.svg| 680 + icons/filled-xterm.xpms | 694 + icons/filled-xterm_16x16.xpm | 129 icons/filled-xterm_32x32.xpm | 260 icons/filled-xterm_48x48.xpm | 297 icons/make-xpms | 26 icons/mini.xterm.svg | 128 icons/mini.xterm.xpms | 553 + icons/mini.xterm_16x16.png|binary icons/mini.xterm_16x16.xpm| 103 icons/mini.xterm_256x256.png |binary icons/mini.xterm_32x32.png|binary icons/mini.xterm_32x32.xpm| 178 icons/mini.xterm_48x48.png|binary icons/mini.xterm_48x48.xpm| 264 icons/terminal_48x48.svg | 643 + icons/terminal_48x48.xpm | 53 icons/xterm-color.png |binary icons/xterm-color.svg | 792 + icons/xterm-color.xpms| 263 icons/xterm-color_16x16.xpm | 99 icons/xterm-color_32x32.xpm | 123 icons/xterm-color_48x48.xpm |4 icons/xterm.png |binary icons/xterm.svg | 652 + icons/xterm.xpms | 119 icons/xterm_16x16.xpm | 21 icons/xterm_32x32.xpm | 126 icons/xterm_48x48.xpm | 100 input.c | 349 koi8rxterm.man| 39 linedata.c|5 main.c| 263 main.h| 16 menu.c| 170 menu.h| 11 minstall.in | 39 misc.c| 1027 +- os2main.c | 2227 package/debian/changelog | 89 package/debian/rules | 10 package/debian/xterm-dev.menu | 14 package/debian/xterm-xres.sed |3 package/freebsd/Makefile | 98 package/freebsd/pkg-descr | 10 package/freebsd/pkg-message | 10 package/freebsd/pkg-plist | 22 package/xterm.spec| 59 precompose.c |7 print.c | 55 proto.h | 62 ptydata.c | 12 ptyx.h| 213 resize.c | 281 resize.man| 169 screen.c | 327 scrollback.c | 16 scrollbar.c | 97 tabs.c| 17 termcap | 14 terminfo | 14 trace.c | 120 trace.h | 21 util.c| 917 + uxterm.desktop|5 uxterm.man| 37 version.c | 74 version.h | 17 vttests/256colors2.pl | 116 vttests/88colors2.pl | 108 vttests/query-color.pl| 168 wcwidth.c | 148 xcharmouse.h |8 xstrings.c| 196 xstrings.h|5 xterm.desktop |5 xterm.h | 168 xterm.log.html|20418 +++--- xterm.man | 1292 +- xterm_io.h| 96 xtermcfg.hin | 33 xutf8.c | 20 108 files changed, 33969 insertions(+), 20668 deletions(-) New commits: commit 02fcb7e21166059a85543800bd548b33131003c3 Author: Sven Joachim Date: Thu May 23 19:43:20 2013 +0200 Imported Upstream version 292 diff --git a/INSTALL b/INSTALL index 13a18f0..1918578 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.142 2013/02/03 19:36:47 tom Exp $ +-- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $ --- -- Copyright 1997-2012,2013 by Thomas E. Dickey -- @@ -240,6 +240,12 @@ The options (in alphabetic order): (The same ifdef controls the metaSendsEscape support)
xterm: Changes to 'upstream-unstable'
MANIFEST |2
aclocal.m4 | 19 -
charproc.c | 14
configure| 853 +++
ctlseqs.ms | 18
package/debian/changelog |7
package/xterm.spec |4
version.h|4
xterm.log.html | 18
xterm.man|5
10 files changed, 494 insertions(+), 450 deletions(-)
New commits:
commit e0ff34130ae920146d27d074b475079933271b8e
Author: Julien Cristau
Date: Mon Apr 9 21:41:15 2012 +0200
Imported Upstream version 278
diff --git a/MANIFEST b/MANIFEST
index 36647ff..30e5fd3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-277, version xterm-277
+MANIFEST for xterm-278, version xterm-278
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index ea0d846..c019357 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.319 2012/01/07 13:29:08 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.321 2012/01/12 13:09:35 tom Exp $
dnl
dnl ---
dnl
@@ -543,17 +543,22 @@ AC_DEFUN([CF_ERRNO],
CF_CHECK_ERRNO(errno)
])dnl
dnl ---
-dnl CF_FUNC_GRANTPT version: 2 updated: 2011/11/28 20:14:06
+dnl CF_FUNC_GRANTPT version: 3 updated: 2012/01/12 08:07:51
dnl ---
dnl Check for grantpt versus openpty, as well as functions that "should" be
dnl available if grantpt is available.
AC_DEFUN([CF_FUNC_GRANTPT],[
-AC_CHECK_FUNCS(\
-grantpt \
-posix_openpt \
-ptsname \
-)
+cf_func_grantpt="grantpt ptsname"
+case $host_os in #(vi
+darwin[[0-9]].*) #(vi
+ ;;
+*)
+ cf_func_grantpt="$cf_func_grantpt posix_openpt"
+ ;;
+esac
+
+AC_CHECK_FUNCS($cf_func_grantpt)
if test "x$ac_cv_func_grantpt" != "xyes" ; then
AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no])
diff --git a/charproc.c b/charproc.c
index e3e3350..ec5f498 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1159 2012/01/07 01:59:02 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1161 2012/01/19 00:22:08 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -6787,15 +6787,19 @@ VTInitialize(Widget wrequest,
#endif /* OPT_WIDE_CHARS */
init_Sres(screen.eight_bit_meta_s);
-request->screen.eight_bit_meta =
+wnew->screen.eight_bit_meta =
extendedBoolean(request->screen.eight_bit_meta_s, tbl8BitMeta, uLast);
-if (request->screen.eight_bit_meta == ebLocale) {
+if (wnew->screen.eight_bit_meta == ebLocale) {
#if OPT_WIDE_CHARS
if (xtermEnvUTF8()) {
- request->screen.eight_bit_meta = ebFalse;
+ wnew->screen.eight_bit_meta = ebFalse;
+ TRACE(("...eightBitMeta is false due to locale\n"));
} else
#endif /* OPT_WIDE_CHARS */
- request->screen.eight_bit_meta = ebTrue;
+ {
+ wnew->screen.eight_bit_meta = ebTrue;
+ TRACE(("...eightBitMeta is true due to locale\n"));
+ }
}
init_Bres(screen.always_bold_mode);
diff --git a/configure b/configure
index 22aac42..d52bd28 100755
--- a/configure
+++ b/configure
@@ -12092,20 +12092,25 @@ EOF
LIBS="$LIBS $X_EXTRA_LIBS"
-for ac_func in \
-grantpt \
-posix_openpt \
-ptsname \
+cf_func_grantpt="grantpt ptsname"
+case $host_os in #(vi
+darwin[0-9].*) #(vi
+ ;;
+*)
+ cf_func_grantpt="$cf_func_grantpt posix_openpt"
+ ;;
+esac
+for ac_func in $cf_func_grantpt
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12102: checking for $ac_func" >&5
+echo "$as_me:12107: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12108 "configure"
+#line 12113 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12136,16 +12141,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12144: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12142: \$? = $ac_status" >&5
+ echo "$as_me:12147: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12145: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12150: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12148: \$? = $ac_status" >&5
+ echo "$as_me:12153: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_a
xterm: Changes to 'upstream-unstable'
INSTALL |7
Imakefile|7
MANIFEST |2
Tekproc.c|8
VTPrsTbl.c | 22
VTparse.def | 10
VTparse.h| 10
aclocal.m4 | 162 +-
button.c | 832 ++
charproc.c | 497 --
configure| 3631 +++
configure.in | 26
ctlseqs.ms | 89 +
ctlseqs.txt | 99 -
fontutils.c | 20
input.c | 23
main.c | 467 ++
main.h |8
menu.c |4
misc.c | 381 +++-
os2main.c| 43
package/debian/changelog |6
package/xterm.spec |4
ptyx.h | 62
screen.c |4
trace.c |4
util.c | 81 -
version.h|4
vttests/16colors.sh |6
vttests/8colors.sh |6
vttests/acolors.sh |6
vttests/doublechars.sh |6
vttests/dynamic.sh |6
vttests/dynamic2.sh |6
vttests/fonts.sh |6
vttests/resize.sh|6
vttests/title.sh |6
xcharmouse.h |7
xterm.h | 25
xterm.log.html | 107 +
xterm.man| 457 +++--
xterm_io.h |4
xtermcfg.hin |9
43 files changed, 4713 insertions(+), 2463 deletions(-)
New commits:
commit 4e01e5971e45b9d39ac1531f9b84f5058e362400
Author: Julien Cristau
Date: Sun Jan 8 13:21:43 2012 +0100
Imported Upstream version 277
diff --git a/INSTALL b/INSTALL
index c8f28eb..0d0a4de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.126 2011/08/30 09:51:01 tom Exp $
+-- $XTermId: INSTALL,v 1.127 2011/12/22 01:59:16 tom Exp $
---
-- Copyright 1997-2010,2011 by Thomas E. Dickey
--
@@ -281,6 +281,11 @@ The options (in alphabetic order):
Do not compile-in code that suppresses redundant updates to the
titlebar when the text has not changed.
+ --disable-selection-ops disable selection operations
+
+ Do not compile-in code to support the actions which allow users
+ to bind keys that use the selection or extract data from the screen.
+
--disable-session-mgt enable support for session management
Do not compile-in code which adds simple session management hooks
diff --git a/Imakefile b/Imakefile
index f65c300..fcfaced 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.104 2011/07/02 00:48:49 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.105 2011/11/29 10:19:20 Thorsten.Glaser Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -253,6 +253,11 @@ SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS)
XkbClientLibs XawClien
NormalProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs
XawClientLibs,$(TERMCAPLIB) $(UTMPLIB) $(PTYLIB))
#endif
+#if defined(OpenBSDArchitecture) || defined(MirBSDArchitecture)
+/* On OpenBSD xterm is now setgid utmp */
+INSTUIDFLAGS= -m 2555 -g utmp
+#endif
+
#if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries &&
(OSMajorVersion < 5)
#if AlternateUsrLibDir
#if ((OSMajorVersion == 4) && (OSMinorVersion >= 1))
diff --git a/MANIFEST b/MANIFEST
index b17561b..36647ff 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-276, version xterm-276
+MANIFEST for xterm-277, version xterm-277
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index 1aa9282..6a7f668 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.190 2011/09/03 12:13:42 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.191 2011/12/27 10:19:51 tom Exp $ */
/*
* Copyright 2001-2010,2011 by Thomas E. Dickey
@@ -397,7 +397,7 @@ TekPtyData(void)
if (Tpushb == 0) {
if ((Tpushb = TypeMallocN(Char, 10)) == NULL
|| (Tline = TypeMallocN(XSegment, MAX_VTX)) == NULL) {
- fprintf(stderr, "%s: Not enough core for Tek mode\n", ProgramName);
+ xtermWarning("Not enough core for Tek mode\n");
if (Tpushb)
free(Tpushb);
Tfailed = True;
@@ -1571,8 +1571,8 @@ TekRealize(Widget gw,
else if (TestGIN(GIN_TERM_EOT_STR) == 0)
tekscr->gin_terminator = GIN_TERM_EOT;
else
- fprintf(stderr, "%s: illegal GIN terminator setting \"%s\"\n",
- ProgramName, tw->tek.gin_terminator_str);
+ xtermWarning("illegal GIN terminator setting \"%s\"\n",
+tw->te
xterm: Changes to 'upstream-unstable'
MANIFEST |2
VTPrsTbl.c |7 -
cachedGCs.c | 62
charsets.c | 63 -
doublechr.c | 62
fontutils.c | 329 ++-
fontutils.h | 64 -
linedata.c | 62
main.c | 233 ++---
main.h |8 -
menu.c | 20 ++
misc.c | 80 ---
package/debian/changelog | 12 +
package/xterm.spec |4
print.c | 62
ptydata.c| 62
resize.c | 41 +++--
resize.man | 25 ++-
scrollback.c | 62
tabs.c |5
testxmc.c| 62
trace.c | 13 +
trace.h |3
util.c | 22 ++-
version.h| 19 +-
xstrings.c | 175 -
xstrings.h | 68 +
xterm.h | 65 -
xterm.log.html | 64 -
xterm.man| 11 -
xtermcap.h | 62
xtermcfg.hin | 62
xutf8.c | 43 +++---
33 files changed, 1098 insertions(+), 836 deletions(-)
New commits:
commit ac8d0db086bba2551cd863d5eba1075a9e5a3a8a
Author: Julien Cristau
Date: Sat Oct 15 19:33:22 2011 +0200
Imported Upstream version 276
diff --git a/MANIFEST b/MANIFEST
index d941673..b17561b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-275, version xterm-275
+MANIFEST for xterm-276, version xterm-276
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/fontutils.c b/fontutils.c
index b22d634..a689b91 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.368 2011/09/11 13:22:34 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.378 2011/10/10 23:46:00 tom Exp $ */
/*
* Copyright 1998-2010,2011 by Thomas E. Dickey
@@ -52,7 +52,7 @@
#include
#define SetFontWidth(screen,dst,src) (dst)->f_width = (src)
-#define SetFontHeight(screen,dst,src) (dst)->f_height =
(int)((screen)->scale_height * (float) (src))
+#define SetFontHeight(screen,dst,src) (dst)->f_height =
dimRound((screen)->scale_height * (float) (src))
/* from X11/Xlibint.h - not all vendors install this file */
#define CI_NONEXISTCHAR(cs) (((cs)->width == 0) && \
@@ -116,8 +116,12 @@ typedef struct {
char *end;
} FontNameProperties;
+#if OPT_RENDERFONT
+static void fillInFaceSize(XtermWidget, int);
+#endif
+
#if OPT_SHIFT_FONTS
-static void lookupOneFontSize(XtermWidget, int);
+static int lookupOneFontSize(XtermWidget, int);
#endif
#if OPT_WIDE_CHARS
@@ -1256,6 +1260,25 @@ xtermLoadFont(XtermWidget xw,
bad:
if (tmpname)
free(tmpname);
+
+#if OPT_RENDERFONT
+if (x_strcasecmp(myfonts.f_n, DEFFONT)) {
+ int code;
+
+ myfonts.f_n = DEFFONT;
+ TRACE(("...recovering for TrueType fonts\n"));
+ code = xtermLoadFont(xw, &myfonts, doresize, fontnum);
+ if (code) {
+ SetItemSensitivity(fontMenuEntries[fontnum].widget,
+ UsingRenderFont(xw));
+ TRACE(("...recovered size %dx%d\n",
+ FontHeight(screen),
+ FontWidth(screen)));
+ }
+ return code;
+}
+#endif
+
releaseWindowGCs(xw, win);
xtermCloseFonts(xw, fnts);
@@ -1744,7 +1767,7 @@ xtermOpenXft(XtermWidget xw, const char *name, XftPattern
* pat, const char *tag
* (Newton Raphson).
*/
static double
-mySquareRoot(double value)
+dimSquareRoot(double value)
{
double result = 0.0;
if (value > 0.0) {
@@ -1863,18 +1886,22 @@ setFaceName(XtermWidget xw, const char *value)
{
TScreen *screen = TScreenOf(xw);
int n;
+Boolean changed = ((xw->misc.face_name == 0)
+ || strcmp(xw->misc.face_name, value));
-xw->misc.face_name = x_strdup(value);
-for (n = 0; n < NMENUFONTS; ++n) {
- xw->misc.face_size[n] = -1.0;
- xtermCloseXft(screen, &(screen->renderFontNorm[n]));
- xtermCloseXft(screen, &(screen->renderFontBold[n]));
- xtermCloseXft(screen, &(screen->renderFontBold[n]));
+if (changed) {
+ xw->misc.face_name = x_strdup(value);
+ for (n = 0; n < NMENUFONTS; ++n) {
+ xw->misc.face_size[n] = -1.0;
+ xtermCloseXft(screen, &(screen->renderFontNorm[n]));
+ xtermCloseXft(screen, &(screen->renderFontBold[n]));
+ xtermCloseXft(screen, &(screen->renderFontBold[n]));
#if OPT_RENDERWIDE
- xtermCloseXft(screen, &(screen->renderWideNorm[n]));
- xtermCloseXft(scre
xterm: Changes to 'upstream-unstable'
INSTALL | 19
MANIFEST |2
Tekproc.c|4
aclocal.m4 | 108 +
charproc.c | 22
configure| 2980 ---
configure.in |4
ctlseqs.ms | 48
ctlseqs.txt | 36
fontutils.c | 31
main.c | 28
menu.c |6
menu.h | 10
misc.c | 250 +++
package/debian/changelog |6
package/xterm.spec |4
ptyx.h |5
scrollbar.c |4
trace.c | 13
trace.h | 11
util.c |5
version.h|4
xstrings.c |6
xterm.h |6
xterm.log.html | 48
xterm.man| 29
xtermcap.h |6
xtermcfg.hin |6
28 files changed, 2093 insertions(+), 1608 deletions(-)
New commits:
commit b7466d18be04cf6f831536156f12940e07d5a3bb
Author: Julien Cristau
Date: Wed Sep 7 20:43:35 2011 +0200
Imported Upstream version 274
diff --git a/INSTALL b/INSTALL
index 028375a..c8f28eb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $
+-- $XTermId: INSTALL,v 1.126 2011/08/30 09:51:01 tom Exp $
---
-- Copyright 1997-2010,2011 by Thomas E. Dickey
--
@@ -537,6 +537,23 @@ The options (in alphabetic order):
at existing ".desktop" files for xterm and common terminal
emulators, to use those.
+ --with-freetype-config configure script to use for FreeType
+
+ Use a specific option value to tell the configure script to try
+ just one of the variations:
+
+ "pkg*", e.g., pkg-config or pkgconfig uses whatever pkg-config
+ script was found.
+
+ otherwise, the parameter value is used as the name of the script
+ to try, using --cflags and --libs options.
+
+ Use --without-freetype-config to enable the --with-freetype-cflags
+ and --with-freetype-libs options.
+
+ The default value "auto" tells the configure script to try the
+ pkg-config script first, then freetype-config and finally xft-config.
+
--with-freetype-cflags -D/-I options for compiling with FreeType library
Override options provided by xft-config or freetype-config.
diff --git a/MANIFEST b/MANIFEST
index 083ef51..470da66 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-273, version xterm-273
+MANIFEST for xterm-274, version xterm-274
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index f07831e..1aa9282 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.189 2011/07/10 22:19:32 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.190 2011/09/03 12:13:42 tom Exp $ */
/*
* Copyright 2001-2010,2011 by Thomas E. Dickey
@@ -826,7 +826,7 @@ Tinput(TekWidget tw)
TCursorToggle(tw, TOGGLE);
Ttoggled = False;
}
- if (XtAppPending(app_con) & XtIMXEvent) {
+ if (xtermAppPending() & XtIMXEvent) {
#ifdef VMS
Tselect_mask = X_mask;
#else /* VMS */
diff --git a/aclocal.m4 b/aclocal.m4
index a78eb7e..f77b1d7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.310 2011/07/17 19:28:03 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.313 2011/09/04 21:20:20 tom Exp $
dnl
dnl ---
dnl
@@ -574,7 +574,7 @@ int main() {
fi
])])dnl
dnl ---
-dnl CF_FUNC_TGETENT version: 17 updated: 2011/07/14 19:34:47
+dnl CF_FUNC_TGETENT version: 18 updated: 2011/08/09 21:06:37
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
@@ -621,7 +621,7 @@ AC_CACHE_CHECK(for $cf_test_message
function,cf_cv_lib_tgetent,[
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib ncurses curses"
cf_TERMTST="buffer[[0]] == 0"
else
cf_TERMLIB="termlib ncurses curses"
@@ -2048,7 +2048,7 @@ cf_cv_struct_lastlog=unknown])])
test $cf_cv_struct_lastlog != no && AC_DEFINE(USE_STRUCT_LASTLOG)
])dnl
dnl ---
-dnl CF_SVR4 version: 3 updated: 2000/05/31 10:16:52
+dnl CF_SVR4 version: 4 updated: 201
xterm: Changes to 'upstream-unstable'
MANIFEST |4
Makefile.in | 36 -
THANKS |7
aclocal.m4 | 32 -
button.c |4
charproc.c |7
configure| 965 +++
configure.in |8
fontutils.c |6
koi8rxterm.man |6
main.c | 460 ++
minstall.in | 133 ++
minstall.sh | 125 --
misc.c | 152 +++
package/debian/changelog | 12
package/xterm.spec |4
ptyx.h |9
resize.man | 24 -
termcap | 48 +-
terminfo | 24 -
trace.c | 88
trace.h | 12
uxterm.man |6
version.h|4
xstrings.c | 75 +++
xstrings.h | 10
xterm.h | 12
xterm.log.html | 76 +++
xterm.man| 110 ++---
29 files changed, 1539 insertions(+), 920 deletions(-)
New commits:
commit e2853acdc3e5209924a7030e9083299bfd3f7003
Author: Julien Cristau
Date: Sun Aug 28 17:56:20 2011 +0200
Imported Upstream version 273
diff --git a/MANIFEST b/MANIFEST
index 4e2d987..083ef51 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-272, version xterm-272
+MANIFEST for xterm-273, version xterm-273
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 9cc073a..17684ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.184 2011/08/19 09:08:05 tom Exp $
+## $XTermId: Makefile.in,v 1.186 2011/08/25 09:25:51 tom Exp $
# -
# this file is part of xterm
#
@@ -130,7 +130,7 @@ all : $(PROGRAMS)
grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
.man.$(manext) :
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS)
.$(manext).html :
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man"
>$@
@@ -142,13 +142,13 @@ all : $(PROGRAMS)
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | nroff -Tascii -man
| col -bx" >$@
.ms.html :
- GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.ms | groff -Thtml -ms" >$@
+ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -ms" >$@
.ms.ps :
- $(SHELL) -c "tbl $*.ms | groff -ms" >$@
+ $(SHELL) -c "tbl $< | groff -ms" >$@
.ms.txt :
- GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.ms | nroff -Tascii -ms | col
-bx" >$@
+ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | nroff -Tascii -ms | col -bx"
>$@
.ps.pdf :
ps2pdf $*.ps
@@ -222,10 +222,10 @@ install-full ::
install \
install-man \
install-full :: $(MANDIR)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man
$(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/resize.man
$(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man
$(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
- $(SHELL) $(srcdir)/minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man
$(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man
$(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man
$(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man
$(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man
$(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) &&
rm -f @XTERM_SYMLINK@.$(manext) ; fi"
@-$(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"
@@ -252,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)/$(actual_xterm)-color_32x32.xpm
-@no_icondir@ @$(INSTALL_DATA) $(srcdir)/icons/xterm
xterm: Changes to 'upstream-unstable'
INSTALL |7 Imakefile|7 MANIFEST |3 Makefile.in | 48 Tekproc.c|4 XTerm.ad |4 aclocal.m4 | 138 +- button.c | 30 charproc.c | 151 +- configure| 3004 --- configure.in | 15 ctlseqs.ms | 19 ctlseqs.txt | 20 data.h |6 df-install.in| 20 fontutils.c | 61 main.c | 59 menu.c | 272 +++- menu.h | 16 misc.c | 52 os2main.c| 25 package/debian/changelog |6 package/debian/control |4 package/debian/rules |9 package/xterm.spec | 26 print.c | 239 ++- ptyx.h | 40 terminfo | 30 trace.c | 18 trace.h |6 version.h|4 vttests/dynamic.pl | 131 ++ xterm.h | 11 xterm.log.html | 102 + xterm.man| 388 -- xterm_io.h |6 xtermcap.c | 10 xutf8.c | 24 38 files changed, 3047 insertions(+), 1968 deletions(-) New commits: commit 5d85c8906d416e1e4cb556d6313585b16b83b814 Author: Julien Cristau 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=XXXX 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 #ifdefined(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 MANIFESTthis file 256colres.h resource-definitions for 256-color mode @@ -155,6 +155,7 @@ vttests/88colors2.plsample 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.shscript 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
xterm: Changes to 'upstream-unstable'
INSTALL | 18
MANIFEST |3
Makefile.in |9
XTerm.ad |8
aclocal.m4 | 158 ++
charproc.c | 75 +
config.guess | 37
config.sub | 75 -
configure| 2889 ---
configure.in | 54
data.h |7
df-install.in| 91 +
error.h |3
fontutils.c | 98 +
fontutils.h |8
main.c | 55
menu.c | 132 +-
menu.h | 14
misc.c | 14
os2main.c| 20
package/debian/changelog |6
package/debian/rules | 10
package/xterm.spec |4
print.c | 115 +
ptyx.h | 62 -
screen.c | 22
scrollbar.c | 11
trace.c |6
version.h|4
xterm.h | 12
xterm.log.html | 76 +
xterm.man| 124 +-
32 files changed, 2548 insertions(+), 1672 deletions(-)
New commits:
commit 1816c00f92661cf3ef349c9962532cbcbf8d103d
Author: Cyril Brulebois
Date: Thu Jun 2 23:53:48 2011 +0200
Import xterm 270
diff --git a/INSTALL b/INSTALL
index 4f1cd8c..0cdf04a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.123 2010/06/14 08:57:22 tom Exp $
+-- $XTermId: INSTALL,v 1.124 2011/04/22 09:30:55 tom Exp $
---
--- Copyright 1997-2009,2010 by Thomas E. Dickey
+-- Copyright 1997-2010,2011 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -29,9 +29,9 @@
-- authorization.
---
-Xterm is normally built as part of the X Window System source tree, using
-imake to generate a Makefile from Imakefile. You can also use the
-configure script to generate a Makefile from Makefile.in:
+Xterm was originally built as part of the X Window System source tree, using
+imake to generate a Makefile from Imakefile. You can also use the configure
+script to generate a Makefile from Makefile.in:
+ If you have imake (or xmkmf), then you can use those directly,
or use the configure script, which normally uses those tools
@@ -524,6 +524,14 @@ The options (in alphabetic order):
Use --without-app-defaults or --with-app-defaults=no to disable the
feature.
+ --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.
+
+ The default value "auto" tells the configure script to look
+ at existing ".desktop" files for xterm and common terminal
+ emulators, to use those.
+
--with-freetype-cflags -D/-I options for compiling with FreeType library
Override options provided by xft-config or freetype-config.
diff --git a/MANIFEST b/MANIFEST
index fe2ab6d..58226e8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-269, version xterm-269
+MANIFEST for xterm-270, version xterm-270
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
@@ -41,6 +41,7 @@ ctlseqs.txt generated rendition of
ctlseqs.ms
cursor.cVT100 low-level cursor movement
data.c global data declarations
data.h global data external-definitions
+df-install.in utility script for desktop-files
doublechr.c VT100 double-size character support
error.h error-code definitions for 'xterm'
fontutils.c xterm functions for (re)loading fonts
diff --git a/Makefile.in b/Makefile.in
index e0f8586..69cc21d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-## $XTermId: Makefile.in,v 1.175 2011/02/13 18:17:55 tom Exp $
+## $XTermId: Makefile.in,v 1.177 2011/04/22 08:51:33 tom Exp $
# -
# this file is part of xterm
#
-# Copyright 1997-2009,2010 by Thomas E. Dickey
+# Copyright 1997-2010,2011 by Thomas E. Dickey
#
# All Rights Reserved
#
@@ -330,8 +330,8 @@ uninstall-full ::
@desktop_utils@DESKTOP_FLAGS = @DESKTOP_FLAGS@
@desktop_utils@install-desktop \
@desktop_utils@install-full ::
-@desktop_utils@desktop-file-install $(DESKTOP_FLAGS) xterm.desktop
-@desktop_utils@desktop-file-install $(DESKTOP_FLAGS) uxterm.desktop
+@desktop_utils@$(SHELL) df-install $(DESKTOP_FL
xterm: Changes to 'upstream-unstable'
Imakefile| 12
MANIFEST |2
Makefile.in |4
THANKS |3
Tekproc.c| 12
aclocal.m4 | 51 +
button.c |4
charproc.c | 339 ++-
config.guess | 172 ++---
config.sub | 109 ++-
configure| 1415 ---
ctlseqs.ms |4
ctlseqs.txt |2
data.c |5
data.h |9
main.c | 32 -
menu.c | 174 -
misc.c | 23
os2main.c| 99 +--
package/debian/changelog |6
package/debian/copyright |2
package/xterm.spec |4
ptyx.h | 15
screen.c | 188 ++
scrollbar.c |4
trace.c | 10
util.c | 44 +
version.h|6
xterm.h | 27
xterm.log.html | 57 +
xterm.man| 58 +
xtermcap.c |6
32 files changed, 1689 insertions(+), 1209 deletions(-)
New commits:
commit b0a490d98e4f25dd2ed3e3a660098f8fa3116769
Author: Cyril Brulebois
Date: Sat Mar 5 16:52:54 2011 +0100
Import xterm 269
diff --git a/Imakefile b/Imakefile
index 57a7fd0..5bfaba7 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.102 2009/04/27 19:26:34 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.103 2011/02/19 13:09:15 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -7,8 +7,6 @@ XCOMM Xterm assumes that bcopy can handle overlapping
arguments. If your
XCOMM bcopy (or memcpy) cannot, write a routine called bcopy and link it in
XCOMM or add -Dbcopy=mybcopy to the DEFINES list below.
XCOMM
-XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.73 2006/04/10 00:34:36 dickey
Exp $
-XCOMM
/* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */
SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT
@@ -144,6 +142,14 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
+#ifdefined(NTOArchitecture)|| \
+ defined(LinuxArchitecture) || \
+ defined(OpenBSDArchitecture)|| \
+ defined(SGIArchitecture)|| \
+ defined(SunArchitecture)
+TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+#endif
+
#if !defined(OS2Architecture) && !defined(__GNU__)
#if defined(UseUtempter)
UTMPDEF = -DUSE_UTEMPTER
diff --git a/MANIFEST b/MANIFEST
index 3b01936..fe2ab6d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-268, version xterm-268
+MANIFEST for xterm-269, version xterm-269
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 2a6a265..e0f8586 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.174 2010/11/24 11:21:01 tom Exp $
+## $XTermId: Makefile.in,v 1.175 2011/02/13 18:17:55 tom Exp $
# -
# this file is part of xterm
#
@@ -65,7 +65,7 @@ EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@
CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ $(EXTRA_CPPFLAGS)
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
-LDFLAGS= @LDFLAGS@
+LDFLAGS= @LDFLAGS@ @EXTRA_LDFLAGS@
LIBS = @LIBS@
prefix = @prefix@
diff --git a/THANKS b/THANKS
index 02cc710..97d533c 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.3 2011/01/22 13:22:37 tom Exp $
+-- $XTermId: THANKS,v 1.4 2011/02/11 10:55:53 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -51,6 +51,7 @@ David Yeo
Denis Zaitsev
Dennis Preiser
Dennis Schneider
+Dimitrios Christidis
Dr Werner Fink
Ed Schouten
Eddy De Greef
diff --git a/Tekproc.c b/Tekproc.c
index d124394..57eaa02 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,8 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.185 2011/01/20 10:50:19 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.188 2011/02/20 00:55:33 tom Exp $ */
/*
- *
- * Copyright 2001-2009,2010 by Thomas E. Dickey
+ * Copyright 2001-2010,2011 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -398,7 +397,7 @@ TekPtyData(void)
if (Tpushb == 0) {
if ((Tpushb = TypeMallocN(Char, 10)) == NULL
|| (Tline = TypeMallocN(XSegment, MAX_VTX)) == NULL) {
- fprintf(stderr, "%s: Not enough core for Tek mode\n", xterm_name);
+ fprintf(stderr, "%s: Not enough core for Tek m
xterm: Changes to 'upstream-unstable'
MANIFEST |2 Makefile.in |7 - THANKS |3 Tekproc.c|4 XTerm.ad |5 button.c | 53 +--- cachedGCs.c |5 charproc.c | 216 -- ctlseqs.ms |8 - ctlseqs.txt |5 input.c | 14 +- linedata.c |6 main.c | 47 +++ menu.c | 297 +++ menu.h | 24 ++- misc.c | 91 +++--- package/debian/changelog |6 package/xterm.spec |4 plink.sh |4 print.c | 10 - ptydata.c| 12 - ptyx.h | 22 ++- screen.c | 52 +++- scrollbar.c | 28 +++- trace.c | 20 ++- util.c | 12 - version.h|4 xterm.h | 14 +- xterm.log.html | 45 ++- xterm.man| 64 +- 30 files changed, 776 insertions(+), 308 deletions(-) New commits: commit 17adfe97bdb9be5917b071c96bd968c2dee765b9 Author: Julien Cristau Date: Thu Feb 10 18:34:29 2011 +0100 Imported Upstream version 268 diff --git a/MANIFEST b/MANIFEST index c5e1d32..3b01936 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-267, version xterm-267 +MANIFEST for xterm-268, version xterm-268 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Makefile.in b/Makefile.in index 4d59cb1..2a6a265 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.173 2010/11/13 12:52:34 tom Exp $ +## $XTermId: Makefile.in,v 1.174 2010/11/24 11:21:01 tom Exp $ # - # this file is part of xterm # @@ -360,6 +360,7 @@ maintainer-clean : realclean terminfo.out : terminfo; tic -a -I -1 terminfo >$@ termcap.out : termcap ; tic -a -C -U termcap >$@ +docs-ctlseqs \ docs :: ctlseqs.html \ ctlseqs.pdf \ ctlseqs.ps \ @@ -369,6 +370,7 @@ ctlseqs.pdf : ctlseqs.ps ctlseqs.ps : ctlseqs.ms ctlseqs.txt : ctlseqs.ms +docs-resize \ docs :: resize.html \ resize.pdf \ resize.ps \ @@ -378,6 +380,7 @@ resize.pdf : resize.ps resize.ps : resize.$(manext) resize.txt : resize.$(manext) +docs-xterm \ docs :: xterm.html \ xterm.pdf \ xterm.ps \ @@ -387,6 +390,7 @@ xterm.pdf : xterm.ps xterm.ps : xterm.$(manext) xterm.txt : xterm.$(manext) +docs-uxterm \ docs :: uxterm.html \ uxterm.pdf \ uxterm.ps \ @@ -396,6 +400,7 @@ uxterm.pdf : uxterm.ps uxterm.ps : uxterm.$(manext) uxterm.txt : uxterm.$(manext) +docs-koi8rxterm \ docs :: koi8rxterm.html \ koi8rxterm.pdf \ koi8rxterm.ps \ diff --git a/THANKS b/THANKS index 424dfa2..02cc710 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ --- $XTermId: THANKS,v 1.2 2010/10/24 17:46:47 tom Exp $ +-- $XTermId: THANKS,v 1.3 2011/01/22 13:22:37 tom Exp $ -- vile:txtmode fk=8bit There's no AUTHORS file in this distribution; it would be redundant since I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996. @@ -40,6 +40,7 @@ Chuck Blake D Roland Walker Daniel Colascione Daniel Jacobowitz +Dave Simmons David Dawes David Krause David Madore diff --git a/Tekproc.c b/Tekproc.c index a7bcf8f..d124394 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,4 +1,4 @@ -/* $XTermId: Tekproc.c,v 1.184 2010/10/14 08:07:03 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.185 2011/01/20 10:50:19 tom Exp $ */ /* * @@ -1538,7 +1538,7 @@ TekRealize(Widget gw, XtWindow(tw) = TWindow(tekscr) = XCreateWindow(XtDisplay(tw), - XtWindow(SHELL_OF(tw)), + VShellWindow(tw), tw->core.x, tw->core.y, tw->core.width, tw->core.height, BorderWidth(tw), diff --git a/XTerm.ad b/XTerm.ad index 975f7cd..dd99d9f 100644 --- a/XTerm.ad +++ b/XTerm.ad @@ -1,8 +1,8 @@ -! $XTermId: XTerm.ad,v 1.93 2010/06/15 10:55:59 tom Exp $ +! $XTermId: XTerm.ad,v 1.94 2011/01/19 22:05:58 tom Exp $ ! - !
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Makefile.in |7
aclocal.m4 | 178 ++-
button.c | 50
charproc.c | 30
configure| 2434 ++-
configure.in |4
ctlseqs.ms | 1134 +++--
ctlseqs.txt | 1039 ++--
misc.c |4
package/debian/changelog |6
package/xterm.spec |4
trace.h |9
version.h|4
xterm.h |5
xterm.log.html | 39
xterm.man| 16
xtermcfg.hin |3
18 files changed, 3154 insertions(+), 1814 deletions(-)
New commits:
commit 8c231dcdea0b7c5e697b7a724ccd63c6ff8bc21c
Author: Julien Cristau
Date: Mon Nov 22 19:05:14 2010 +0100
Import xterm 267
diff --git a/MANIFEST b/MANIFEST
index ad9bc8d..c5e1d32 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-266, version xterm-266
+MANIFEST for xterm-267, version xterm-267
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index ed86ce2..4d59cb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.172 2010/10/23 18:15:25 tom Exp $
+## $XTermId: Makefile.in,v 1.173 2010/11/13 12:52:34 tom Exp $
# -
# this file is part of xterm
#
@@ -339,8 +339,11 @@ mostlyclean :
clean : mostlyclean
-$(RM) $(PROGRAMS)
-distclean : clean
+distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
+
+distclean \
+docs-clean ::
-$(RM) *.ps *.pdf *.png
-$(SHELL) -c 'for p in xterm resize uxterm koi8rxterm; \
do \
diff --git a/aclocal.m4 b/aclocal.m4
index 0a05548..e0800dc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.285 2010/06/14 21:44:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.293 2010/11/19 10:44:13 tom Exp $
dnl
dnl ---
dnl
@@ -162,13 +162,26 @@ dnl $1 = libraries to add, with the "-l", etc.
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1
[$]ifelse($2,,LIBS,[$2])"])dnl
dnl ---
-dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
+dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl
+dnl Add a given library after another, e.g., following the one it satisfies a
+dnl dependency for.
+dnl
+dnl $1 = the first library
+dnl $2 = its dependency
+AC_DEFUN([CF_ADD_LIB_AFTER],[
+CF_VERBOSE(...before $LIBS)
+LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[]]*/ /g" -e "s,$1 ,$1 $2 ," -e
's/ / /g'`
+CF_VERBOSE(...after $LIBS)
+])dnl
+dnl ---
+dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
dnl
dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
dnl in the sharutils 4.2 distribution.
AC_DEFUN([CF_ANSI_CC_CHECK],
[
-AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
cf_cv_ansi_cc=no
cf_save_CFLAGS="$CFLAGS"
cf_save_CPPFLAGS="$CPPFLAGS"
@@ -600,7 +613,7 @@ else
fi
])dnl
dnl ---
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
dnl -
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -627,7 +640,7 @@ if test "$GCC" = yes
then
AC_CHECKING([for $CC __attribute__ directives])
cat > conftest.$ac_ext < conftest.$ac_ext <&AC_FD_CC
+echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
])dnl
dnl ---
dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
@@ -1262,7 +1275,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
AC_SUBST(PATH_SEPARATOR)
])dnl
dnl ---
-dnl CF_PATH_PROG version: 7 updated: 2009/01/11 20:34:16
+dnl CF_PATH_PROG version: 8 updated: 2010/10/23 16:12:25
dnl
dnl Check for a given program, defining corresponding symbol.
dnl$1 = environment variable, which is suffixed by "_PATH" in the #define.
@@ -1281,7 +1294,7 @@ AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1)
cf_path_prog=""
cf_path_args=""
-IFS="${IFS=}"; cf
xterm: Changes to 'upstream-unstable'
MANIFEST | 17 +++ Makefile.in | 43 THANKS| 12 ++ charproc.c| 10 - fontutils.c | 16 +-- package/debian/changelog |5 package/debian/color.sed |4 package/debian/compat |1 package/debian/control| 21 +++ package/debian/copyright | 221 ++ package/debian/rules | 185 +++ package/debian/source/format |1 package/debian/watch |4 package/debian/xterm-dev.docs |8 + package/debian/xterm-xres.sed |8 + package/xterm.spec| 175 + version.h |4 xterm.log.html| 10 + xtermcfg.hin | 41 --- 19 files changed, 733 insertions(+), 53 deletions(-) New commits: commit 73d90d5e5a4411620f5e1710930adf8c38bf30eb Author: Cyril Brulebois Date: Wed Oct 27 12:40:14 2010 +0200 Import xterm 266 diff --git a/MANIFEST b/MANIFEST index fb673de..ad9bc8d 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-265, version xterm-265 +MANIFEST for xterm-266, version xterm-266 MANIFESTthis file 256colres.h resource-definitions for 256-color mode @@ -115,6 +115,21 @@ icons/xterm_32x32.xcf gimp file, for editing 32x32 icon icons/xterm_32x32.xpm 32x32 monochrome icon icons/xterm_48x48.xcf gimp file, for editing 48x48 icon icons/xterm_48x48.xpm 48x48 monochrome icon +package/debian subdirectory +package/debian/changelogbuild-script +package/debian/color.sedbuild-script +package/debian/compat build-script +package/debian/control build-script +package/debian/copyrightbuild-script +package/debian/rulesbuild-script +package/debian/source subdirectory +package/debian/source/formatbuild-script +package/debian subdirectory +package/debian/watchbuild-script +package/debian/xterm-dev.docs build-script +package/debian/xterm-xres.sed build-script +package subdirectory +package/xterm.spec build-script tektestssubdirectory tektests/aitest.tek tek4014 demo: draw a globe tektests/dmerc.tek tek4014 demo: draws a Mercator projection with orbit diff --git a/Makefile.in b/Makefile.in index 0c0bff6..ed86ce2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.171 2010/04/04 22:41:32 tom Exp $ +## $XTermId: Makefile.in,v 1.172 2010/10/23 18:15:25 tom Exp $ # - # this file is part of xterm # @@ -196,27 +196,34 @@ install \ install-bin \ install-scripts \ install-full :: - @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ - if test "$(binary_xterm)" != "xterm"; then \ - name="$(binary_xterm)"; \ - sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \ - $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/$(binary_uxterm); \ + @$(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)/$(binary_uxterm); \ - fi' - @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_k8term)"; \ - if test "$(binary_xterm)" != "xterm"; then \ - name="$(binary_xterm)"; \ - sed -e "s,=xterm,=$$name," $(srcdir)/koi8rxterm >k8term.tmp; \ - $(INSTALL_SCRIPT) -m 755 k8term.tmp $(BINDIR)/$(binary_k8term); \ + $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/\$$dest; \ + fi" + @$(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
xterm: Changes to 'upstream-unstable'
MANIFEST |3
Tekproc.c | 22 ++-
VTPrsTbl.c | 340 ++-
VTparse.def|5
VTparse.h |6
button.c | 375 -
charproc.c | 250 +-
ctlseqs.ms | 210 ++-
ctlseqs.txt| 153 +++
fontutils.c| 66 +-
fontutils.h|4
misc.c | 363 +++
ptyx.h | 17 +-
screen.c | 36 +
trace.h| 47 ++-
util.c | 45 +-
version.h |4
vms.c |5
vms.h |2
xcharmouse.h |5
xterm.h| 15 +-
xterm.log.html | 93 +-
xterm.man | 370
xutf8.h|8 -
24 files changed, 1828 insertions(+), 616 deletions(-)
New commits:
commit 7c49776bdc523ca345d765ef91020b9726346e71
Author: Cyril Brulebois
Date: Fri Oct 22 21:05:11 2010 +0200
Import xterm 265
diff --git a/MANIFEST b/MANIFEST
index 5f04908..fb673de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-264, version xterm-264
+MANIFEST for xterm-265, version xterm-265
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index abaa880..9693186 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.389 2010/10/13 09:37:08 tom Exp $ */
+/* $XTermId: button.c,v 1.390 2010/10/22 00:53:57 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -180,9 +180,10 @@ EmitMousePosition(TScreen * screen, Char line[], unsigned
count, int value)
? EXT_MOUSE_LIMIT
: MOUSE_LIMIT);
-/* Add pointer position to key sequence
-
- * In extended mode we encode large positions as two-byte UTF-8
+/*
+ * Add pointer position to key sequence
+ *
+ * In extended mode we encode large positions as two-byte UTF-8.
*
* NOTE: historically, it was possible to emit 256, which became
* zero by truncation to 8 bits. While this was arguably a bug,
@@ -211,29 +212,30 @@ SendMousePosition(XtermWidget xw, XEvent * event)
switch (screen->send_mouse_pos) {
case MOUSE_OFF:
/* If send_mouse_pos mode isn't on, we shouldn't be here */
- return False;
+ break;
case BTN_EVENT_MOUSE:
case ANY_EVENT_MOUSE:
- /* xterm extension for motion reporting. June 1998 */
- /* EditorButton() will distinguish between the modes */
- switch (event->type) {
- case MotionNotify:
- my_event->button = 0;
- /* FALLTHRU */
- case ButtonPress:
- /* FALLTHRU */
- case ButtonRelease:
- EditorButton(xw, my_event);
- result = True;
- break;
+ if (KeyModifiers(event) == 0 || KeyModifiers(event) == ControlMask) {
+ /* xterm extension for motion reporting. June 1998 */
+ /* EditorButton() will distinguish between the modes */
+ switch (event->type) {
+ case MotionNotify:
+ my_event->button = 0;
+ /* FALLTHRU */
+ case ButtonPress:
+ /* FALLTHRU */
+ case ButtonRelease:
+ EditorButton(xw, my_event);
+ result = True;
+ break;
+ }
}
break;
default:
/* Make sure the event is an appropriate type */
if (IsBtnEvent(event)) {
-
switch (screen->send_mouse_pos) {
case X10_MOUSE: /* X10 compatibility sequences */
@@ -315,7 +317,6 @@ SendLocatorPosition(XtermWidget xw, XButtonEvent * event)
/* Make sure the event is an appropriate type */
if ((!IsBtnEvent(event) &&
-
!screen->loc_filter) ||
(BtnModifiers(event) != 0 && BtnModifiers(event) != ControlMask))
return (False);
diff --git a/fontutils.c b/fontutils.c
index 34c6498..2fce86a 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.350 2010/10/14 09:27:25 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.351 2010/10/22 09:02:10 tom Exp $ */
/
@@ -235,7 +235,7 @@ check_fontname(const char *name)
{
Boolean result = True;
-if (name == 0) {
+if (IsEmpty(name)) {
TRACE(("fontname missing\n"));
result = False;
} else if (strlen(name) >= MAX_FONTNAME - 1) {
@@ -1238,7 +1238,7 @@ typedef struct {
} SubResourceRec;
#define MERGE_SUBFONT(src,dst,name) \
- if (dst.name == 0) { \
+ if (IsEmpty(dst.name)) { \
TRACE(("MERGE_SUBFONT " #dst "." #name " merg
xterm: Changes to 'upstream-unstable'
charproc.c | 15 ++-
version.h |4 ++--
xterm.log.html | 10 +-
3 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 400e8ed360cd27710233916db075673bb3c78a2a
Author: Julien Cristau
Date: Mon Jun 28 21:50:38 2010 +0100
Imported Upstream version 261
diff --git a/charproc.c b/charproc.c
index a0b2d7f..b75a093 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1070 2010/06/20 21:39:59 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1071 2010/06/28 09:03:42 tom Exp $ */
/*
@@ -6551,10 +6551,15 @@ VTInitialize(Widget wrequest,
wnew->misc.render_font =
(Boolean) extendedBoolean(wnew->misc.render_font_s,
tblRenderFont, erLast);
-if (wnew->misc.render_font == erDefault && IsEmpty(wnew->misc.face_name)) {
- wnew->misc.face_name = x_strdup(DEFFACENAME_AUTO);
- TRACE(("will allow runtime switch to render_font using \"%s\"\n",
- wnew->misc.face_name));
+if (wnew->misc.render_font == erDefault) {
+ if (IsEmpty(wnew->misc.face_name)) {
+ wnew->misc.face_name = x_strdup(DEFFACENAME_AUTO);
+ TRACE(("will allow runtime switch to render_font using \"%s\"\n",
+ wnew->misc.face_name));
+ } else {
+ wnew->misc.render_font = erTrue;
+ TRACE(("initially using TrueType font\n"));
+ }
}
/* minor tweak to make debug traces consistent: */
if (wnew->misc.render_font) {
diff --git a/version.h b/version.h
index 296dcf0..08a4fe2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.318 2010/06/13 16:03:59 tom Exp $
+ * $XTermId: version.h,v 1.319 2010/06/28 08:49:07 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 260
+#define XTERM_PATCH 261
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index deab291..2e33935 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.954 2010/06/21 00:40:58 tom Exp $
+ $XTermId: xterm.log.html,v 1.957 2010/06/28 09:25:58 tom Exp $
-->
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
+Patch #261 - 2010/6/28
Patch #260 - 2010/6/20
Patch #259 - 2010/6/5
Patch #258 - 2010/5/1
@@ -319,6 +320,13 @@ is the latest version of this file.
Patch #1 - 1996/1/6
+Patch #261 - 2010/6/28
+
+ fix regression in renderFont logic, from
+ patch #260 changes
+ (report by Joseph Quinsey).
+
+
Patch #260 - 2010/6/20
modify plink.sh to work around problem linking to
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1otlsa-0007f7...@alioth.debian.org
xterm: Changes to 'upstream-unstable'
INSTALL| 24 - MANIFEST |2 Tekproc.c | 192 VTPrsTbl.c |4 VTparse.def|4 VTparse.h |4 XTerm.ad |8 aclocal.m4 | 42 + charproc.c | 385 ++--- configure | 1244 ++--- configure.in | 19 ctlseqs.ms | 10 ctlseqs.txt|4 doublechr.c|4 fontutils.c| 22 - fontutils.h|4 input.c|8 main.c | 21 main.h | 10 menu.c | 140 +++--- misc.c | 85 ++- os2main.c | 17 plink.sh |6 print.c|4 ptydata.c | 17 ptyx.h | 24 + screen.c |9 scrollbar.c| 14 trace.c|4 trace.h|4 util.c |4 uxterm.desktop |4 version.h |4 vms.c |4 xterm.desktop |4 xterm.h| 20 xterm.log.html | 47 ++ xterm.man | 127 + xtermcap.c |6 39 files changed, 1505 insertions(+), 1050 deletions(-) New commits: commit 17deb5faec7299f1fe7d849319dfe64f9a1ed05e Author: Julien Cristau Date: Wed Jun 23 15:18:55 2010 +0100 Imported Upstream version 260 diff --git a/INSTALL b/INSTALL index d2afa33..4f1cd8c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.122 2010/04/14 10:56:29 tom Exp $ +-- $XTermId: INSTALL,v 1.123 2010/06/14 08:57:22 tom Exp $ --- -- Copyright 1997-2009,2010 by Thomas E. Dickey -- @@ -105,6 +105,19 @@ The options (in alphabetic order): e.g., to make boxes. When xterm loads a font, it checks if those characters are present, and draws its own if they are missing. + --disable-broken-st disallow broken string-terminators], + + Do not compile-in code that works around a bug in some ISDN routers + (and possibly other applications written by the same people): they + send an unterminated control string in their banner text, making xterm + freeze. + + The workaround tells xterm to stop processing the control string when + it receives one of the whitespace control characters such as newline. + That was the behavior before patch #171. + + See also --enable-broken-osc + --disable-c1-print disallow -k8 option for printable 128-159], Use this option to suppress support for nonstandard use of codes @@ -344,15 +357,6 @@ The options (in alphabetic order): appear to freeze. This workaround makes xterm ignore the strings, and is compiled-in by default for Linux. - --enable-broken-st allow broken string-terminators], - - Compile-in code that works around a bug in some ISDN routers (and - possibly other applications written by the same people): they send an - unterminated control string in their banner text, making xterm freeze. - The workaround tells xterm to stop processing the control string when - it receives one of the whitespace control characters such as newline. - That was the behavior before patch #171. - --enable-dabbrevenable dynamic-abbreviation support Compile-in support for "dabbrev-expand()" action and related key diff --git a/MANIFEST b/MANIFEST index f56b8fd..e956b9a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-259, version xterm-259 +MANIFEST for xterm-260, version xterm-260 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Tekproc.c b/Tekproc.c index f12aa5c..920d1c3 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,61 +1,57 @@ -/* $XTermId: Tekproc.c,v 1.178 2010/06/04 09:39:15 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.182 2010/06/20 21:34:37 tom Exp $ */ /* - * Warning, there be crufty dragons here. - */ - -/* - -Copyright 2001-2008,2009 by Thomas E. Dickey - -All Rights Reserved - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY -CLA
xterm: Changes to 'upstream-unstable'
MANIFEST |3
Tekproc.c | 17
aclocal.m4 | 296 --
button.c | 14
charproc.c | 100 +-
configure | 2265 ++---
configure.in |8
error.h|3
fontutils.c| 11
main.c | 142 +--
menu.c |4
misc.c | 91 +
os2main.c |9
print.c|6
ptyx.h | 12
resize.c | 21
screen.c | 76 -
scrollbar.c| 25
trace.c| 94 +-
trace.h|7
util.c | 28
version.h |4
vttests/query-fonts.pl | 166 +++
xterm.log.html | 44
xterm.man | 72 +
xterm_io.h | 10
xtermcap.c |4
27 files changed, 2414 insertions(+), 1118 deletions(-)
New commits:
commit e1a934caebec27fe54d1f49c43dc495fb09a87c0
Author: Julien Cristau
Date: Sun Jun 6 13:48:33 2010 +0200
Imported Upstream version 259
diff --git a/MANIFEST b/MANIFEST
index 262de0b..f56b8fd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-258, version xterm-258
+MANIFEST for xterm-259, version xterm-259
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
@@ -144,6 +144,7 @@ vttests/dynamic.sh script to illustrate the
dynamic colors control
vttests/dynamic2.sh complete example of dynamic colors
vttests/fonts.shscript to demonstrate font-switching sequences
vttests/paste64.pl script to test base64-selection option
+vttests/query-fonts.pl script to demo/test font-querying
vttests/resize.pl translated resize.sh to perl since it is easy
to test, and I needed
vttests/resize.sh script to demonstrate resizing
vttests/tcapquery.plscript to test tcap-query option
diff --git a/Tekproc.c b/Tekproc.c
index b5ae9d2..f12aa5c 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.176 2010/04/18 16:22:54 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.178 2010/06/04 09:39:15 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -707,7 +707,6 @@ Tekparse(TekWidget tw)
case CASE_PRINT:
TRACE(("case: printable character\n"));
ch = c;
- c = (IChar) tekscr->cur.fontsize;
x = (int) (tekscr->cur_X * TekScale(tekscr))
+ screen->border;
y = (int) ((TEKHEIGHT + TEKTOPPAD - tekscr->cur_Y) *
TekScale(tekscr))
@@ -869,13 +868,15 @@ Tinput(TekWidget tw)
tek = TekRecord;
if (tek->count >= TEK_LINK_BLOCK_SIZE
|| tek->fontsize != tekscr->cur.fontsize) {
- if ((TekRecord = tek->next = CastMalloc(TekLink)) == 0)
+ if ((TekRecord = tek->next = CastMalloc(TekLink)) == 0) {
Panic("Tinput: malloc error (%d)\n", errno);
- tek = tek->next;
- tek->next = (TekLink *) 0;
- tek->fontsize = (unsigned short) tekscr->cur.fontsize;
- tek->count = 0;
- tek->ptr = tek->data;
+ } else {
+ tek = tek->next;
+ tek->next = (TekLink *) 0;
+ tek->fontsize = (unsigned short) tekscr->cur.fontsize;
+ tek->count = 0;
+ tek->ptr = tek->data;
+ }
}
tek->count++;
diff --git a/aclocal.m4 b/aclocal.m4
index 70fb1fc..f9efe05 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.269 2010/04/17 20:32:28 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.284 2010/06/05 15:31:37 tom Exp $
dnl
dnl ---
dnl
@@ -55,7 +55,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
fi
])dnl
dnl ---
-dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50
+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
dnl The second parameter if given makes this macro verbose.
@@ -125,17 +125,17 @@ esac
done
if test -n "$cf_new_cflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
CFLAGS="$CFLAGS $cf_new_cflags"
fi
if test -n "$cf_new_cppflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
if test -n "$cf_new_extra_cppflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS
$cf_new_extra_cppflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
screen.c |6 --
scrollback.c |4 ++--
version.h |4 ++--
xterm.log.html | 10 +-
5 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 8c79875f8180d51a25fa262705f039cd507cb466
Author: Julien Cristau
Date: Sun May 2 11:00:49 2010 +0200
Import xterm 258
diff --git a/MANIFEST b/MANIFEST
index c82ef69..262de0b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-257, version xterm-257
+MANIFEST for xterm-258, version xterm-258
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/screen.c b/screen.c
index af0b948..e05d1ee 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.417 2010/04/18 18:14:10 tom Exp $ */
+/* $XTermId: screen.c,v 1.418 2010/04/28 23:49:28 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -1327,7 +1327,9 @@ ScrnRefresh(XtermWidget xw,
TRACE2(("ScrnRefresh row=%d lastind=%d ->%d\n",
row, lastind, ROW2INX(screen, lastind)));
- if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == 0) {
+ if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == 0
+ || ld->charData == 0
+ || ld->attribs == 0) {
continue;
}
if (maxcol >= (int) ld->lineSize) {
diff --git a/scrollback.c b/scrollback.c
index 99554c2..a28ec7e 100644
--- a/scrollback.c
+++ b/scrollback.c
@@ -1,4 +1,4 @@
-/* $XTermId: scrollback.c,v 1.13 2010/04/18 14:41:29 tom Exp $ */
+/* $XTermId: scrollback.c,v 1.14 2010/04/28 21:47:09 tom Exp $ */
/
@@ -48,7 +48,7 @@ getScrollback(TScreen * screen, int row)
{
LineData *result = 0;
-if (REAL_ROW(screen, row) >= 0) {
+if (screen->saved_fifo > 0 && REAL_ROW(screen, row) >= 0) {
unsigned which = ROW2FIFO(screen, row);
ScrnBuf where = scrnHeadAddr(screen, screen->saveBuf_index, which);
result = (LineData *) where;
diff --git a/version.h b/version.h
index 9809c16..6cdbe1e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.315 2010/03/12 00:53:57 tom Exp $
+ * $XTermId: version.h,v 1.316 2010/04/23 08:43:31 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 257
+#define XTERM_PATCH 258
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 6f8c9bf..b3aca53 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.932 2010/04/22 08:18:56 tom Exp $
+ $XTermId: xterm.log.html,v 1.933 2010/05/02 01:07:19 tom Exp $
-->
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
+Patch #258 - 2010/5/1
Patch #257 - 2010/4/22
Patch #256 - 2010/3/6
Patch #255 - 2010/1/21
@@ -316,6 +317,13 @@ is the latest version of this file.
Patch #1 - 1996/1/6
+Patch #258 - 2010/5/1
+
+ add pointer-checks in ScrnRefresh to fix a case in
+ rapid scrolling where an empty record is fetched from the
+ scrollback FIFO.
+
+
Patch #257 - 2010/4/22
correct ctlseqs.ms description of OSC 17 and OSC 19
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o8v71-000605...@alioth.debian.org
xterm: Changes to 'upstream-unstable'
INSTALL| 16
MANIFEST |2
Makefile.in|9
Tekproc.c |4
VTPrsTbl.c | 10
VTparse.def|3
VTparse.h |3
aclocal.m4 | 314 +
button.c | 142 +-
cachedGCs.c|8
charproc.c | 267 +++-
configure | 3157 +
configure.in | 12
ctlseqs.ms | 15
ctlseqs.txt| 11
cursor.c |8
doublechr.c|4
fontutils.c| 41
fontutils.h|4
input.c| 211 ++-
linedata.c | 31
main.c | 46
main.h |6
menu.c | 16
misc.c | 58 -
print.c|6
ptydata.c | 13
ptyx.h | 47
resize.c | 18
screen.c | 77 -
scrollback.c | 22
scrollbar.c| 326 +
tabs.c | 10
testxmc.c | 12
trace.c|7
trace.h|8
util.c | 188 +--
version.h |4
xstrings.c |6
xterm.h| 48
xterm.log.html | 69 +
xterm.man | 26
xtermcap.c |6
xtermcfg.hin |7
44 files changed, 3361 insertions(+), 1937 deletions(-)
New commits:
commit 628a46ec01513a19e3aa11a7662e00c06244f1fa
Author: Julien Cristau
Date: Thu Apr 22 18:11:09 2010 +0200
Import xterm 257
diff --git a/INSTALL b/INSTALL
index 2f85f3a..d2afa33 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.121 2009/08/06 00:39:09 tom Exp $
+-- $XTermId: INSTALL,v 1.122 2010/04/14 10:56:29 tom Exp $
---
--- Copyright 1997-2007,2008 by Thomas E. Dickey
+-- Copyright 1997-2009,2010 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -258,6 +258,11 @@ The options (in alphabetic order):
leaving the right scrollbar incorrectly positioned after changing
the font size.
+ --disable-rpath-hackdon't add rpath options for additional libraries
+
+ By default, the configure script looks for libraries in unusual places
+ and adds an rpath linker option to help.
+
--disable-samename disable check for redundant name-change
Do not compile-in code that suppresses redundant updates to the
@@ -561,6 +566,13 @@ The options (in alphabetic order):
If regular expressions are not disable (--disable-regex), use PCRE
rather than the POSIX regular expressions.
+ --with-pkg-config{=path} enable/disable use of pkg-config
+
+ The configure script looks for certain libraries which have well
+ established pkg-config scripts, and will use those settings if
+ available. Not all pkg-config scripts work; this option suppresses
+ the check and relies on normal library search paths.
+
--with-reference=XXXprogram to use as permissions-reference
To install xterm with setuid permissions, the scripts usually compare
diff --git a/MANIFEST b/MANIFEST
index 282f20a..c82ef69 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-255, version xterm-255
+MANIFEST for xterm-257, version xterm-257
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 07b1f74..0c0bff6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.170 2010/03/04 02:03:33 tom Exp $
+## $XTermId: Makefile.in,v 1.171 2010/04/04 22:41:32 tom Exp $
# -
# this file is part of xterm
#
@@ -46,6 +46,9 @@ CPP = @CPP@
AWK= @AWK@
LINK = $(CC) $(CFLAGS)
+CTAGS = @CTAGS@
+ETAGS = @ETAGS@
+
LN_S = @LN_S@
RM = rm -f
LINT = @LINT@
@@ -397,10 +400,10 @@ lint :
$(LINT) $(CPPFLAGS) $(SRCS2)
tags :
- ctags $(SRCS) $(HDRS)
+ $(CTAGS) $(SRCS) $(HDRS)
TAGS :
- etags $(SRCS) $(HDRS)
+ $(ETAGS) $(SRCS) $(HDRS)
$(TERMINFO_DIR) $(INSTALL_DIRS) :
mkdir -p $@
diff --git a/Tekproc.c b/Tekproc.c
index 52dc9f2..b5ae9d2 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.175 2009/12/09 23:25:34 Jochen.Voss Exp $ */
+/* $XTermId: Tekproc.c,v 1.176 2010/04/18 16:22:54 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -754,7 +754,7 @@ Tekparse(TekWidget tw)
Char buf2[512];
IChar c2;
- unsigned len = 0;
+ size_t len = 0;
while ((c2 = input()) != ANSI_BEL) {
if (!isprint((int) (c2 & 0x7f))
|| len + 2 >= (int) sizeof(buf2))
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index e0057fd..095b3c1 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,4 +1,4 @@
-/* $XTermI
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 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_syml...@.$(manext) ; fi" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @xterm_syml...@.$(manext) ; fi" +APP_NAMES = XTerm UXTerm KOI8RXTerm + @no_apps...@install \ @no_apps...@install-app \ @no_apps...@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@
xterm: Changes to 'upstream-unstable'
MANIFEST |4
Makefile.in | 16
VTPrsTbl.c | 10
VTparse.def |4
VTparse.h|4
XTerm.ad |7
aclocal.m4 | 176 ++
button.c |6
charproc.c | 177 ++-
config.guess | 214 +--
config.sub | 57
configure| 2997 +++
configure.in | 57
ctlseqs.ms | 48
ctlseqs.txt | 57
fontutils.c | 82 +
fontutils.h |7
input.c | 15
install-sh | 294 +
install.sh | 294 -
main.c | 89 -
main.h | 20
menu.c | 105 +
menu.h | 11
minstall.sh | 42
misc.c | 494 +---
os2main.c| 17
ptydata.c| 86 +
ptyx.h | 59 -
screen.c | 25
util.c | 12
version.h|6
vttests/tcapquery.pl | 83 +
xterm.h | 16
xterm.log.html | 100 +
xterm.man| 110 +
xtermcap.c | 218 +++
xtermcap.h | 51
38 files changed, 3895 insertions(+), 2175 deletions(-)
New commits:
commit 28bbd26ee60aea258fbcfef9cf554020d7dfdc23
Author: Julien Cristau
Date: Tue Mar 2 12:18:25 2010 +0100
Import xterm 255
diff --git a/MANIFEST b/MANIFEST
index 0680895..282f20a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-254, version xterm-254
+MANIFEST for xterm-255, version xterm-255
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
@@ -48,7 +48,7 @@ fontutils.c xterm functions for
(re)loading fonts
fontutils.h interface of fontutils.c
gen-pc-fkeys.pl script to generate extended function-key
terminfo
input.c VT100 key-symbol and function-key translation
-install.sh configure script: fallback install script
+install-sh install-script (needed by configure)
keysym2ucs.clookup-table for UTF-8 to keysyms
keysym2ucs.hinterface of keysym2ucs.c
koi8rxterm KOI-8 wrapper from Debian (originally me)
diff --git a/aclocal.m4 b/aclocal.m4
index 906ea96..e2a9af6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,8 @@
-dnl $XTermId: aclocal.m4,v 1.262 2010/01/05 00:48:45 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.263 2010/01/20 09:23:58 tom Exp $
dnl
dnl ---
dnl
-dnl Copyright 1997-2008,2009 by Thomas E. Dickey
+dnl Copyright 1997-2009,2010 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -55,7 +55,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
fi
])dnl
dnl ---
-dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30
+dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50
dnl -
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -81,8 +81,8 @@ no)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[[^=]]*='\''\"[[^"]]*//'`
test "${cf_add_cflags}" != "${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
if test $cf_fix_cppflags = yes ; then
cf_new_extra_cppflags="$cf_new_extra_cppflags
$cf_add_cflags"
@@ -97,6 +97,12 @@ no)
*$cf_add_cflags) #(vi
;;
*) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed
-e 's/^...//' -e 's/=.*//'`
+
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
+ ;;
+ esac
cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
esac
@@ -112,8 +118,8 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
test "${cf_add_cflags}" != "${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
;;
esac
done
@@ -1210,7 +1216,7 @@ fi
AC_SUBST(PKG_CONFIG)
])dnl
dnl
xterm: Changes to 'upstream-unstable'
256colres.pl | 35 ++
88colres.pl| 36 ++
KOI8RXTerm.ad | 36 ++
MANIFEST |3
Makefile.in| 56 ++-
Tekparse.def | 35 ++
Tekproc.c | 13
UXTerm.ad | 35 ++
VTPrsTbl.c | 357 +-
VTparse.def| 37 ++
VTparse.h | 47 +-
XTerm-col.ad | 33 ++
XTerm.ad | 33 ++
aclocal.m4 | 43 +-
button.c | 98 +++---
cachedGCs.c| 32 +-
charproc.c | 781 +
configure.in | 51 +--
ctlseqs.ms | 109 ++
ctlseqs.txt| 90 +
cursor.c | 14
doublechr.c| 12
fontutils.c| 56 ++-
gen-pc-fkeys.pl| 34 ++
input.c| 22 -
koi8rxterm | 35 ++
linedata.c |6
main.c | 336 ++---
main.h |6
menu.c | 316 +--
menu.h | 104 +++---
minstall.sh| 33 ++
misc.c | 553 --
mkdirs.sh | 51 ---
os2main.c | 346 ++---
plink.sh | 34 ++
print.c| 129 ++--
proto.h| 35 ++
ptydata.c |4
ptyx.h | 58 +++
run-tic.sh | 33 ++
screen.c | 58 +--
sinstall.sh| 33 ++
tabs.c |8
testxmc.c |8
trace.c| 115 +--
trace.h| 64 ++--
util.c | 131
uxterm | 33 ++
uxterm.desktop | 33 ++
version.h | 37 ++
vms.c |8
vttests/16colors.sh| 33 +-
vttests/256colors.pl | 34 ++
vttests/256colors2.pl | 37 ++
vttests/88colors.pl| 33 ++
vttests/88colors2.pl | 36 ++
vttests/8colors.sh | 33 +-
vttests/acolors.sh | 33 +-
vttests/doublechars.sh | 33 +-
vttests/dynamic.sh | 33 +-
vttests/dynamic2.sh| 33 +-
vttests/fonts.sh | 33 +-
vttests/paste64.pl | 34 +-
vttests/resize.pl | 33 +-
vttests/resize.sh | 33 +-
vttests/tcapquery.pl | 33 +-
vttests/title.sh | 33 +-
xstrings.c | 104 +-
xstrings.h | 15
xterm.desktop | 33 ++
xterm.h| 51 ++-
xterm.log.html | 137 +++-
xterm.man | 59 +++
xtermcap.c | 32 --
xtermcap.h |4
76 files changed, 4063 insertions(+), 1614 deletions(-)
New commits:
commit 0ab96ae05264dc23c68bb9c89ef436c7b876ae13
Author: Julien Cristau
Date: Tue Dec 29 11:36:10 2009 +
Import xterm 253
diff --git a/Tekproc.c b/Tekproc.c
index 117982b..52dc9f2 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.174 2009/11/28 14:20:28 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.175 2009/12/09 23:25:34 Jochen.Voss Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -1400,7 +1400,7 @@ TekRealize(Widget gw,
unsigned long TEKgcFontMask;
TRACE(("TekRealize\n"));
-memset(tekscr, 0, sizeof(tekscr));
+memset(tekscr, 0, sizeof(*tekscr));
#ifndef NO_ACTIVE_ICON
tekscr->whichTwin = &tekscr->fullTwin;
diff --git a/button.c b/button.c
index 5adcbaf..73b4908 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.361 2009/12/07 01:19:51 tom Exp $ */
+/* $XTermId: button.c,v 1.362 2009/12/09 10:19:43 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -2969,7 +2969,7 @@ do_select_regex(TScreen * screen, CELL * startc, CELL *
endc)
ld.name = GET_LINEDATA(screen, --screen->name.row)
#define MoreRows(name) \
- screen->name.row < screen->max_row
+ (screen->name.row < screen->max_row)
#define isPrevWrapped(name) \
(screen->name.row > 0 \
diff --git a/charproc.c b/charproc.c
index 5cd075d..d4f491e 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1019 2009/12/07 01:43:09 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1020 2009/12/10 09:24:04 tom Exp $ */
/*
@@ -6630,12 +6630,6 @@ VTDestroy(Widget w GCC_UNUSED)
}
#endif
-#if OPT_COLOR_RES
-/* free local copies of resource strings */
-for (n = 0; n < NCOLORS; ++n) {
- FREE_LEAK(screen->Tcolors[n].resource);
-}
-#endif
#if OPT_SELECT_REGEX
for (n = 0; n < NSELECTUNITS; ++n) {
FREE_LEAK(screen->selectExpr[n]);
diff --git a/fontutils.c b/fontutils.c
index b3ca94b..1ff3216 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.325 2009/12/02 10:17:52 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.327 2009/12/10 09:35:41 tom E
xterm: Changes to 'upstream-unstable'
Makefile.in| 10
button.c | 35 ++-
charclass.c|7
charproc.c | 603 ++---
ctlseqs.ms | 26 +-
ctlseqs.txt| 29 +-
fontutils.c|9
main.h |6
menu.c |4
misc.c | 45 ++--
ptyx.h | 53 -
screen.c | 14 -
termcap| 18 -
util.c | 90 +---
version.h |4
xterm.h|4
xterm.log.html | 19 +
xterm.man | 81 +++
xutf8.c| 16 -
19 files changed, 797 insertions(+), 276 deletions(-)
New commits:
commit 348bcb54a657552033bf9840d0aac61f4af6f23d
Author: Julien Cristau
Date: Wed Nov 11 16:29:28 2009 +0100
Import xterm 251
diff --git a/Makefile.in b/Makefile.in
index 671c6e3..9bf2014 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.158 2009/04/27 19:29:31 tom Exp $
+## $XTermId: Makefile.in,v 1.161 2009/11/05 23:06:36 tom Exp $
##
## Copyright 2002-2008,2009 by Thomas E. Dickey
##
@@ -117,7 +117,7 @@ all : $(PROGRAMS)
grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
.man.$(manext) :
- $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man $@
$(appsdir)
+ $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $< $@ $(appsdir)
.$(manext).html :
GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man"
>$@
@@ -316,6 +316,7 @@ 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
-$(RM) ctlseqs.html ctlseqs.$(manext)
realclean : distclean
@@ -332,6 +333,11 @@ ctlseqs.pdf : ctlseqs.ps
ctlseqs.ps : ctlseqs.ms
ctlseqs.txt : ctlseqs.ms
+resize.html : resize.$(manext)
+resize.pdf : resize.ps
+resize.ps : resize.$(manext)
+resize.txt : resize.$(manext)
+
xterm.html : xterm.$(manext)
xterm.pdf : xterm.ps
xterm.ps : xterm.$(manext)
diff --git a/button.c b/button.c
index 6ccd5d5..4c0b1a1 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.356 2009/10/10 23:37:27 tom Exp $ */
+/* $XTermId: button.c,v 1.359 2009/10/28 23:50:23 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -62,6 +62,7 @@ button.c Handles button events in the terminal emulator.
#include
#include
+#include
#include
#include
@@ -2601,6 +2602,7 @@ class_of(LineData * ld, CELL * cell)
}
#endif
+assert(temp.col < ld->lineSize);
return CharacterClass((int) (ld->charData[temp.col]));
}
@@ -2629,9 +2631,11 @@ okPosition(TScreen * screen,
if (cell->row > screen->max_row) {
result = False;
} else if (cell->col > (LastTextCol(screen, *ld, cell->row) + 1)) {
- cell->col = 0;
- *ld = GET_LINEDATA(screen, ++cell->row);
- result = False;
+ if (cell->row < screen->max_row) {
+ cell->col = 0;
+ *ld = GET_LINEDATA(screen, ++cell->row);
+ result = False;
+ }
}
return result;
}
@@ -2733,6 +2737,7 @@ make_indexed_text(TScreen * screen, int row, unsigned
length, int *indexed)
Char *next = last;
unsigned data = ld->charData[col];
+ assert(col < ld->lineSize);
/* some internal points may not be drawn */
if (data == 0)
data = ' ';
@@ -2941,6 +2946,9 @@ do_select_regex(TScreen * screen, CELL * startc, CELL *
endc)
#define PrevRow(name) \
ld.name = GET_LINEDATA(screen, --screen->name.row)
+#define MoreRows(name) \
+ screen->name.row < screen->max_row
+
#define isPrevWrapped(name) \
(screen->name.row > 0 \
&& (ltmp = GET_LINEDATA(screen, screen->name.row - 1)) != 0 \
@@ -2979,7 +2987,7 @@ ComputeSelect(XtermWidget xw,
if (first.col > 1
&& isWideCell(first.row, first.col - 1)
&& XTERM_CELL(first.row, first.col - 0) == HIDDEN_CHAR) {
- fprintf(stderr, "Adjusting start. Changing downwards from %i.\n",
first.col);
+ TRACE(("Adjusting start. Changing downwards from %i.\n", first.col));
first.col -= 1;
if (last.col == (first.col + 1))
last.col--;
@@ -3038,6 +3046,8 @@ ComputeSelect(XtermWidget xw,
++screen->endSel.col;
if (screen->endSel.col > length
&& LineTstWrapped(ld.endSel)) {
+ if (!MoreRows(endSel))
+ break;
screen->endSel.col = 0;
NextRow(endSel);
length = LastTextCol(screen, ld.endSel, screen->endSel.row);
@@ -3048,7 +3058,8 @@ ComputeSelect(XtermWidget xw,
xterm: Changes to 'upstream-unstable'
MANIFEST |3 THANKS| 155 + Tekproc.c |6 button.c |4 charproc.c| 42 -- data.c|6 data.h|6 fontutils.c | 43 +-- input.c | 26 ++-- main.c| 77 +++- main.h|7 - menu.c|4 menu.h|4 misc.c| 48 --- print.c |8 - ptyx.h| 16 +- resize.c | 40 +++--- scrollback.c | 10 - scrollbar.c |4 trace.c |6 trace.h |4 util.c| 26 +--- version.h |4 vttests/256colors2.pl | 22 ++- vttests/88colors2.pl | 22 ++- xstrings.c| 10 - xstrings.h|8 - xterm.h | 15 +- xterm.log.html| 306 -- xterm.man | 15 ++ xtermcap.c| 11 - 31 files changed, 634 insertions(+), 324 deletions(-) New commits: commit e8ec13cdcea0f687aa64c747a8ad790628d16fff Author: Julien Cristau Date: Tue Oct 13 13:28:58 2009 +0200 Import xterm 250 diff --git a/MANIFEST b/MANIFEST index 83163f5..7db856e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-249, version xterm-249 +MANIFEST for xterm-250, version xterm-250 MANIFESTthis file 256colres.h resource-definitions for 256-color mode @@ -13,6 +13,7 @@ Makefile.in configure script template for Makefile README overview & caveats for 'xterm' README.i18n i18n readme: README.os390overview for os390 (EBCDIC) port of 'xterm' +THANKS list of direct contributors TekPrsTbl.c Tek4014 parser state tables Tekparse.deftemplate for generating Tekparse.h Tekparse.h Tek4014 parser-state definitions diff --git a/THANKS b/THANKS new file mode 100644 index 000..ae3dbfc --- /dev/null +++ b/THANKS @@ -0,0 +1,155 @@ +-- $XTermId: THANKS,v 1.1 2009/10/11 17:30:42 tom Exp $ +-- vile:txtmode fk=8bit +There's no AUTHORS file in this distribution; it would be redundant since +I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996. + +There's no reliable history before that point. +For some insight, see + + http://invisible-island.net/xterm/xterm.faq.html#who_did_it + +Here's a list from xterm.log.html of people who have contributed changes. + +Adam Sulmicki +Alan Coopersmith +Alex Hornung +Alexander Pohoyda +Alexander V Lukyanov +Andrea Odetti +Andreas Jaeger +Andrew Sumner +Andrew Tipton +Anton Kovalenko +Ben Yoshino +Bernhard R Link +Bernhard Rosenkraenzer +Bill Nottingham +Bob Maynard +Bradd W Szonye +Bram Moolenaar +Branden Robinson +Bruno Haible +Caetano Jimenez Carezzato +Christian Biere +Christian Weisgerber +Chuck Blake +D Roland Walker +Daniel Colascione +Daniel Jacobowitz +David Dawes +David Krause +David Madore +David Mart�nez Moreno +David Mathog +David Wood +David Yeo +Denis Zaitsev +Dennis Schneider +Dr Werner Fink +Ed Schouten +Eddy De Greef +Edward S Arthur +Egbert Eich +Emanuele Giaquinta +Eugene Konev +Fabrice Bellard +Frank Giessler +Frank Guangxin Liu +Frank Liu +Gael Roualland +George Peter Staplin +Greg Badros +Greg Klanderman +Greg Smith +H Merijn Brand +Hasso Tepper +Holger Veit +Ilya Zakharevich +James Armstrong +Jason Bacon +Jason Vas Dias +Jeff Chua +Jeff Uphoff +Jens Schweikhardt +Jeremy Buhler +Jeroen Ruigrok +Jess Thrysoee +Jim Paris +Joe Allen +Joe Peterson +Johnny Billquist +Julien Cristau +Juliusz Chroboczek +Jungshik Shin +J�rgen Keil +Kean Johnston +Keith Packard +Ken Martin +Kevin Buhr +Kiyokazu Suto +Larry Riedel +Lee Olsen +Marc Bevand +Marc La France +Marius Tolzmann +Mark Waggoner +Markus Kuhn +Martin Pirker +Matthias Baake +Matthias Scheler +Matthieu Herrb +Matthieu Lagouge +Max Mikhanosha +Michael Rohleder +Michael Schroeder +Mike Castle +Mike Fabian +Mike Hopkirk +Min Sik Kim +Miroslav Lichvar +Nam SungHyun +Nelson Beebe +N�meth M�rton +Ovidiu Gheorghioiu +Paul Gilmartin +Paul Giordano +Paul Lampert +Paul Vojta +Paul Williams +Pavel Roskin +Per Hedeland +Peter Berg Larsen +Pierre Lombard +Richard Braakman +Richard Griswold +Rob Braun +Robert Brady +Robert Earl +Robin Cutshaw +Ross Paterson +Scott Sewall +Semen A Ustimenko +Sergei Laskavy +Sergey Vlasov +Slava Semushin +Stefan Dirsch +Steve Wall +Stuart Lissaman +Sven Verdoolaege +Taneli Huuskonen +Ted Phelps +Thomas Wolff +Tim Adye +Tim Pope +Tobias Stoeckmann +Todd Larason +Todd Miller +Tomas Vanhala +Tomasz Cholewo +Tomohiro Kubota +Tor Lillqvist +Torrey Lyons +Victor Stinner +Werner Lemberg +Will D
xterm: Changes to 'upstream-unstable'
MANIFEST |2
XTerm.ad |3 -
button.c | 16 --
charproc.c | 38 +++
fontutils.c| 137 +++--
linedata.c |3 -
main.h |4 -
menu.c | 37 ++-
menu.h |6 ++
ptyx.h |6 +-
screen.c | 33 -
scrollbar.c|5 +-
trace.c|4 -
util.c | 90 +++--
version.h |4 -
xterm.h| 10 +++-
xterm.log.html | 53 +-
xterm.man | 32 -
18 files changed, 407 insertions(+), 76 deletions(-)
New commits:
commit 2ddbf56f023b3133b4b3a6274273747be0fce979
Author: Julien Cristau
Date: Sun Oct 4 15:29:38 2009 +0200
Import xterm 249
diff --git a/MANIFEST b/MANIFEST
index 603e76f..83163f5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-247, version xterm-247
+MANIFEST for xterm-249, version xterm-249
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/XTerm.ad b/XTerm.ad
index f186e66..5670bdb 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.89 2009/08/15 15:58:44 tom Exp $
+! $XTermId: XTerm.ad,v 1.90 2009/09/27 22:02:30 tom Exp $
*saveLines: 1024
@@ -88,6 +88,7 @@
*fontMenu*font-linedrawing*Label: Line-Drawing Characters
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
+*fontMenu*font-packed*Label: Packed Font
*fontMenu*render-font*Label: TrueType Fonts
*fontMenu*utf8-mode*Label: UTF-8
*fontMenu*utf8-title*Label:UTF-8 Titles
diff --git a/button.c b/button.c
index 41019b0..877b209 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.352 2009/09/11 09:13:53 tom Exp $ */
+/* $XTermId: button.c,v 1.355 2009/10/01 09:06:20 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -2427,7 +2427,7 @@ ResizeSelection(TScreen * screen GCC_UNUSED, int rows,
int cols)
Bool
iswide(int i)
{
-return (i == HIDDEN_CHAR) || ((i >= FIRST_WIDECHAR) && my_wcwidth(i) == 2);
+return (i == HIDDEN_CHAR) || (WideCells(i) == 2);
}
#define isWideCell(row, col) iswide((int)XTERM_CELL(row, col))
@@ -2624,12 +2624,16 @@ okPosition(TScreen * screen,
LineData ** ld,
CELL * cell)
{
-if (cell->col > (LastTextCol(screen, *ld, cell->row) + 1)) {
+Boolean result = True;
+
+if (cell->row >= screen->max_row) {
+ result = False;
+} else if (cell->col > (LastTextCol(screen, *ld, cell->row) + 1)) {
cell->col = 0;
*ld = GET_LINEDATA(screen, ++cell->row);
- return False;
+ result = False;
}
-return True;
+return result;
}
static void
@@ -2637,7 +2641,7 @@ trimLastLine(TScreen * screen,
LineData ** ld,
CELL * last)
{
-if (screen->cutNewline) {
+if (screen->cutNewline && last->row < screen->max_row) {
last->col = 0;
*ld = GET_LINEDATA(screen, ++last->row);
} else {
diff --git a/charproc.c b/charproc.c
index 79b973f..6e7b7b6 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.972 2009/09/10 09:03:49 tom Exp $ */
+/* $XTermId: charproc.c,v 1.974 2009/09/27 22:37:54 tom Exp $ */
/*
@@ -328,6 +328,7 @@ static XtActionsRec actionsList[] = {
#endif
#if OPT_BOX_CHARS
{ "set-font-linedrawing", HandleFontBoxChars },
+{ "set-font-packed", HandleFontPacked },
#endif
#if OPT_DABBREV
{ "dabbrev-expand",HandleDabbrevExpand },
@@ -532,6 +533,7 @@ static XtResource resources[] =
#if OPT_BOX_CHARS
Bres(XtNforceBoxChars, XtCForceBoxChars, screen.force_box_chars, False),
+Bres(XtNforcePackedFont, XtCForcePackedFont, screen.force_packed, True),
Bres(XtNshowMissingGlyphs, XtCShowMissingGlyphs, screen.force_all_chars,
False),
#endif
@@ -5497,6 +5499,7 @@ VTInitialize(Widget wrequest,
#if OPT_BOX_CHARS
init_Bres(screen.force_box_chars);
+init_Bres(screen.force_packed);
init_Bres(screen.force_all_chars);
#endif
init_Bres(screen.free_bold_box);
@@ -7389,6 +7392,39 @@ HandleBlinking(XtPointer closure, XtIntervalId * id
GCC_UNUSED)
}
#endif /* OPT_BLINK_CURS || OPT_BLINK_TEXT */
+void
+RestartBlinking(TScreen * screen GCC_UNUSED)
+{
+#if OPT_BLINK_CURS || OPT_BLINK_TEXT
+if (screen->blink_timer == 0) {
+ Bool resume = False;
+
+#if OPT_BLINK_CURS
+ if (DoStartBlinking(screen)) {
+ resume = True;
+ }
+#endif
+#if OPT_BLINK_TEXT
+ if (!resume) {
+ int row;
+
+ for (row = screen->max_row; row >= 0; row--) {
+ LineData *ld = getLineData(screen, ROW2INX(screen, row));
+ if (LineTstBlinked(ld)) {
+
xterm: Changes to 'upstream-unstable'
button.c | 26 --
charproc.c |7 ---
fontutils.h|6 +++---
print.c|7 ++-
ptyx.h |4 ++--
testxmc.c |6 +++---
util.c | 34 ++
version.h |4 ++--
xterm.h|4 +---
xterm.log.html | 20 +++-
10 files changed, 66 insertions(+), 52 deletions(-)
New commits:
commit 18fae9e0f86b0ed221f16f6ae842272b726a2065
Author: Julien Cristau
Date: Wed Sep 16 15:41:49 2009 +0200
Import xterm 248
diff --git a/button.c b/button.c
index 526a902..41019b0 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.349 2009/08/07 23:24:10 tom Exp $ */
+/* $XTermId: button.c,v 1.352 2009/09/11 09:13:53 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -2590,12 +2590,10 @@ SetCharacterClassRange(int low, /* in range of [0..255]
*/
}
#endif
-#if OPT_WIDE_CHARS
static int
-class_of(TScreen * screen, LineData * ld, CELL * cell)
+class_of(LineData * ld, CELL * cell)
{
CELL temp = *cell;
-int value;
#if OPT_DEC_CHRSET
if (CSET_DOUBLE(GetLineDblCS(ld))) {
@@ -2603,19 +2601,19 @@ class_of(TScreen * screen, LineData * ld, CELL * cell)
}
#endif
-value = (int) XTERM_CELL(temp.row, temp.col);
-return CharacterClass(value);
+return CharacterClass((int) (ld->charData[temp.col]));
}
+
+#if OPT_WIDE_CHARS
#define CClassSelects(name, cclass) \
(CClassOf(name) == cclass \
|| XTERM_CELL(screen->name.row, screen->name.col) == HIDDEN_CHAR)
#else
-#define class_of(screen, ld, cell) charClass[XTERM_CELL((cell)->row,
(cell)->col)]
#define CClassSelects(name, cclass) \
-(class_of(screen, ld.name, &((screen->name))) == cclass)
+(class_of(ld.name, &((screen->name))) == cclass)
#endif
-#define CClassOf(name) class_of(screen, ld.name, &((screen->name)))
+#define CClassOf(name) class_of(ld.name, &((screen->name)))
/*
* If the given column is past the end of text on the given row, bump to the
@@ -2729,7 +2727,7 @@ make_indexed_text(TScreen * screen, int row, unsigned
length, int *indexed)
while (col <= limit) {
Char *next = last;
- unsigned data = XTERM_CELL(row, col);
+ unsigned data = ld->charData[col];
/* some internal points may not be drawn */
if (data == 0)
@@ -2745,7 +2743,7 @@ make_indexed_text(TScreen * screen, int row, unsigned
length, int *indexed)
if_OPT_WIDE_CHARS(screen, {
size_t off;
for_each_combData(off, ld) {
- data = XTERM_CELLC(row, col, off);
+ data = ld->combData[off][col];
if (data == 0)
break;
next = convertToUTF8(next, data);
@@ -3847,7 +3845,7 @@ SaveText(TScreen * screen,
#endif
*eol = !LineTstWrapped(ld);
for (i = scol; i < ecol; i++) {
- c = E2A(XTERM_CELL(row, i));
+ c = E2A(ld->charData[i]);
#if OPT_WIDE_CHARS
/* We want to strip out every occurrence of HIDDEN_CHAR AFTER a
* wide character.
@@ -3861,7 +3859,7 @@ SaveText(TScreen * screen,
unsigned ch;
size_t off;
for_each_combData(off, ld) {
- ch = XTERM_CELLC(row, i, off);
+ ch = ld->combData[off][i];
if (ch == 0)
break;
lp = convertToUTF8(lp, ch);
@@ -3877,7 +3875,7 @@ SaveText(TScreen * screen,
unsigned ch;
size_t off;
for_each_combData(off, ld) {
- ch = XTERM_CELLC(row, i, off);
+ ch = ld->combData[off][i];
if (ch == 0)
break;
lp = convertToUTF8(lp, ch);
diff --git a/charproc.c b/charproc.c
index 9a93cff..79b973f 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.971 2009/08/09 13:59:06 tom Exp $ */
+/* $XTermId: charproc.c,v 1.972 2009/09/10 09:03:49 tom Exp $ */
/*
@@ -850,7 +850,8 @@ CheckBogusForeground(TScreen * screen, const char *tag)
for (pass = 0; pass < 2; ++pass) {
row = screen->cur_row;
for (; isClear && (row <= screen->max_row); ++row) {
- Char *attribs = getLineData(screen, row)->attribs;
+ LineData *ld = getLineData(screen, row)->;
+ Char *attribs = ld->attribs;
col = (row == screen->cur_row) ? screen->cur_col : 0;
for (; isClear && (col <= screen->max_col); ++col) {
@@ -861,7 +862,7 @@ CheckBogusForeground(TScreen * screen, const char *tag)
} else if ((flags & BG_COLOR)) {
isClear = False;
} else if ((flags & FG_COLOR)) {
- unsigned ch = getXtermC
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
configure |2 +-
configure.in |4 ++--
main.c |6 +++---
print.c|8 +---
ptyx.h |4 ++--
screen.c | 11 ++-
version.h |4 ++--
xterm.log.html | 17 -
9 files changed, 38 insertions(+), 20 deletions(-)
New commits:
commit 89ec563b8565649955aeb036411cc710a3b31395
Author: Julien Cristau
Date: Fri Sep 4 16:00:18 2009 +0200
Import xterm 247
diff --git a/MANIFEST b/MANIFEST
index bcd71a7..603e76f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-246, version xterm-246
+MANIFEST for xterm-247, version xterm-247
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/configure b/configure
index c28534d..eca3e84 100755
--- a/configure
+++ b/configure
@@ -9000,7 +9000,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
# Check for openpty() in -lutil if the UNIX98-style pty functions are not
# available. E.g. for GNU libc 2.0.
case $host_os in #(vi
-freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to
work.
+freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is
known to work.
echo "$as_me:9005: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 53dcf69..3fe3c64 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.252 2009/08/13 19:41:01 tom Exp $
+dnl $XTermId: configure.in,v 1.253 2009/08/30 21:46:21 tom Exp $
dnl
dnl ---
dnl
@@ -285,7 +285,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
# Check for openpty() in -lutil if the UNIX98-style pty functions are not
# available. E.g. for GNU libc 2.0.
case $host_os in #(vi
-freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to
work.
+freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is
known to work.
AC_CHECK_LIB(util,openpty)
;;
*)
diff --git a/main.c b/main.c
index 900a92b..13ad09c 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.593 2009/08/07 23:14:47 tom Exp $ */
+/* $XTermId: main.c,v 1.594 2009/08/30 21:40:45 Alex.Hornung Exp $ */
/*
* W A R N I N G
@@ -380,7 +380,7 @@ extern struct utmp *getutid __((struct utmp * _Id));
#include /* openpty() */
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include/* openpty() */
#endif
@@ -2415,7 +2415,7 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
-#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) ||
defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||
defined(__APPLE__)
+#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) ||
defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__OpenBSD__) || defined(__APPLE__)
#define USE_OPENPTY 1
static int opened_tty = -1;
#endif
diff --git a/print.c b/print.c
index 7ea1c8e..7200e3e 100644
--- a/print.c
+++ b/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.105 2009/08/07 00:25:10 tom Exp $ */
+/* $XTermId: print.c,v 1.107 2009/08/31 00:37:04 tom Exp $ */
/
@@ -279,8 +279,10 @@ xtermPrintEverything(XtermWidget xw)
int bot = screen->max_row;
int was_open = initialized;
-if (!screen->whichBuf)
- top = -screen->savedlines;
+if (!screen->whichBuf) {
+ top = -screen->savedlines - screen->topline;
+ bot -= screen->topline;
+}
TRACE(("xtermPrintEverything, rows %d..%d\n", top, bot));
while (top <= bot)
diff --git a/ptyx.h b/ptyx.h
index 909e9c6..c1e18d9 100644
--- a/ptyx.h
+++ b/ptyx.h
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.625 2009/08/14 23:14:26 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.626 2009/08/30 21:40:45 Alex.Hornung Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -156,7 +156,7 @@
#define USE_PTY_DEVICE 1
#define USE_PTY_SEARCH 1
-#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >=
2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >=
2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__)
|| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
#undef USE_PTY_DEVICE
#undef USE_PTY_SEARCH
#define USE_PTS_DEVICE 1
diff --git a/screen.c b/screen.c
index 26ad604..d1d8363 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.394 2009/08/16 18:16:45 tom Exp $ */
+/* $XTermId: screen.c,v 1.396 200
xterm: Changes to 'upstream-unstable'
MANIFEST |2
XTerm-col.ad |5 -
XTerm.ad |8 +--
configure |4 -
configure.in |4 -
ptyx.h | 11 +++-
screen.c | 146 +++--
util.c | 13 +
version.h |4 -
xterm.log.html | 61 +++
xterm.man |6 +-
11 files changed, 157 insertions(+), 107 deletions(-)
New commits:
commit d61ca8392fc732381c31aa8a02b34471707ffd1d
Author: Julien Cristau
Date: Mon Aug 17 10:22:36 2009 +0200
Import xterm 246
diff --git a/MANIFEST b/MANIFEST
index 6fe78c4..bcd71a7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-245, version xterm-245
+MANIFEST for xterm-246, version xterm-246
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/XTerm-col.ad b/XTerm-col.ad
index a21fee9..9de5098 100644
--- a/XTerm-col.ad
+++ b/XTerm-col.ad
@@ -1,5 +1,4 @@
-! $XTermId: XTerm-col.ad,v 1.20 2006/06/24 14:57:29 tom Exp $
-! $XFree86: xc/programs/xterm/XTerm-col.ad,v 3.7 2005/09/18 23:48:12 dickey
Exp $
+! $XTermId: XTerm-col.ad,v 1.21 2009/08/15 15:56:29 tom Exp $
#include "XTerm"
@@ -20,7 +19,7 @@
! leave the foreground/background colors alone (at the mercy of your desktop
! designer).
-! Color the popup/pulldown menu border to match the text widget's foreground.
+! Color the popup/pulldown menu border to match the text widget foreground.
!*SimpleMenu*borderColor: gray15
! Uncomment this to use color for underline attribute
diff --git a/XTerm.ad b/XTerm.ad
index b5659fc..f186e66 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.88 2009/02/13 00:14:13 tom Exp $
+! $XTermId: XTerm.ad,v 1.89 2009/08/15 15:58:44 tom Exp $
*saveLines: 1024
@@ -148,7 +148,7 @@
! vt100/VT100
! tektronix/TopLevelShell
! shellext/VendorShellExt
-! tek4014/Tek4014
+! tek4014/Tek4014
!
! If built without a toolbar, the widget hierarchy is simpler, because there
! is no form, and the popup menu widgets are created only when they are first
@@ -163,7 +163,7 @@
! vt100/VT100
! tektronix/TopLevelShell
! shellext/VendorShellExt
-! tek4014/Tek4014
+! tek4014/Tek4014
!
! A more complete list of the widget/class names can be obtained using editres
! to dump a file. Some widget names are not available until the corresponding
@@ -193,7 +193,7 @@
! Alternatively,
!*on2Clicks: regex
[[:alpha:]]+://([[:alnum:]!#+,./=...@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
-! vt100's and similar terminals recognize escape sequences and control
+! VT100s and similar terminals recognize escape sequences and control
! characters to which they reply to the host with other escape sequences,
! to provide information. The "resize" program uses this feature.
!
diff --git a/configure b/configure
index 6ee07ab..c28534d 100755
--- a/configure
+++ b/configure
@@ -11948,11 +11948,11 @@ if test "${enable_16bit_chars+set}" = set; then
if test "$enableval" != "no" ; then
enable_16bit_chars=yes
else
-enable_16bit_chars=$no
+enable_16bit_chars=no
fi
else
enableval=no
- enable_16bit_chars=$no
+ enable_16bit_chars=no
fi;
echo "$as_me:11958: result: $enable_16bit_chars" >&5
diff --git a/configure.in b/configure.in
index 622b7c4..53dcf69 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.251 2009/08/06 00:37:38 tom Exp $
+dnl $XTermId: configure.in,v 1.252 2009/08/13 19:41:01 tom Exp $
dnl
dnl ---
dnl
@@ -812,7 +812,7 @@ AC_MSG_CHECKING(if you want only 16-bit character support)
CF_ARG_ENABLE(16bit-chars,
[ --enable-16bit-charsenable 16-bit character support],
[enable_16bit_chars=yes],
- [enable_16bit_chars=$no])
+ [enable_16bit_chars=no])
AC_MSG_RESULT($enable_16bit_chars)
if test "$enable_16bit_chars" = yes ; then
diff --git a/ptyx.h b/ptyx.h
index 28085df..909e9c6 100644
--- a/ptyx.h
+++ b/ptyx.h
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.623 2009/08/08 14:24:27 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.625 2009/08/14 23:14:26 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -1126,7 +1126,7 @@ typedef struct {
#if OPT_ISO_COLORS
#if OPT_256_COLORS || OPT_88_COLORS
#define COLOR_BITS 8
-typedef unsigned CellColor;
+typedef unsigned short CellColor;
#else
#define COLOR_BITS 4
typedef Char CellColor;
@@ -1148,7 +1148,12 @@ typedef Char RowData;/* wrap/blink, and DEC
single-double chars */
#define LINEFLAG_MASK BITS2MASK(LINEFLAG_BITS)
xterm: Changes to 'upstream-unstable'
INSTALL| 15 Imakefile |6 MANIFEST |4 Makefile.in|8 Tekproc.c | 61 - button.c | 328 --- cachedGCs.c| 50 - charproc.c | 607 +++--- configure | 2401 + configure.in | 25 ctlseqs.ms |4 ctlseqs.txt|2 cursor.c | 23 data.c |4 data.h |4 doublechr.c| 72 - error.h| 10 fontutils.c| 125 +- fontutils.h| 30 input.c| 11 linedata.c | 251 + main.c | 32 menu.c | 39 menu.h |3 misc.c | 194 ++-- os2main.c |6 print.c| 217 ++--- ptydata.c | 76 - ptyx.h | 318 --- resize.c | 12 resize.man | 17 screen.c | 1779 +++--- scrollback.c | 118 ++ scrollbar.c| 36 tabs.c | 10 termcap| 27 testxmc.c | 27 trace.c| 192 ++-- trace.h|7 util.c | 658 +++ version.h |4 xterm.h| 130 +-- xterm.log.html | 80 + xterm.man | 663 --- xtermcfg.hin | 12 45 files changed, 5030 insertions(+), 3668 deletions(-) New commits: commit d817c5d758a3bc71ff371662c45e37900b186a8e Author: Julien Cristau Date: Mon Aug 10 10:53:08 2009 +0200 Import xterm 244 diff --git a/INSTALL b/INSTALL index 1485bfb..2f85f3a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.118 2008/12/30 11:43:45 tom Exp $ +-- $XTermId: INSTALL,v 1.121 2009/08/06 00:39:09 tom Exp $ --- -- Copyright 1997-2007,2008 by Thomas E. Dickey -- @@ -146,6 +146,12 @@ The options (in alphabetic order): not shown. This makes it simpler to read a build log and see the actual warning messages. + --disable-fifo-linesenable FIFO-storage for saved-lines + + With patch #244, xterm by default stores saved-lines in a FIFO + (circular buffer), which improves performance when the number of saved + lines is large. Disable this option to revert to the pre-244 layout. + --disable-freetype disable freetype library-support Do not use freetype libraries if they are found. Normally they will @@ -311,6 +317,13 @@ The options (in alphabetic order): Do not compile-in code that modifies the icon's title and sounds a beep when they receive output. + --enable-16bit-charsenable 16-bit characters support + + Enable wide-character support, but store only 16-bits for each wide + character. Unicode values can be larger than 16-bits, up to 21-bits. + This uses less memory, but is less complete. However, most languages + are covered by the 16-bit encoding. + --enable-256-color enable 256-color support Compile-in code that interprets SGR 38 and 48 for 256-colors. diff --git a/Imakefile b/Imakefile index 4646e2b..57a7fd0 100644 --- a/Imakefile +++ b/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.101 2007/03/18 21:06:18 tom Exp $ +XCOMM $XTermId: Imakefile,v 1.102 2009/04/27 19:26:34 tom Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -194,13 +194,13 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c #endif SRCS1 = button.c cachedGCs.c charproc.c charsets.c cursor.c \ data.c doublechr.c fontutils.c input.c \ - menu.c misc.c print.c ptydata.c \ + linedata.c menu.c misc.c print.c ptydata.c scrollback.c \ screen.c scrollbar.c tabs.c util.c xstrings.c xtermcap.c \ TekPrsTbl.c Tekproc.c VTPrsTbl.c \ $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(TRACESRC) OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \ data.o doublechr.o fontutils.o input.o \ - menu.o misc.o print.o ptydata.o \ + linedata.o menu.o misc.o print.o ptydata.o scrollback.o \ screen.o scrollbar.o tabs.o util.o xstrings.o xtermcap.o \ TekPrsTbl.o Tekproc.o VTPrsTbl.o \ $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(TRACEOBJ) diff --git a/MANIFEST b/MANIFEST index 0a8ae68..d311717 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-243, version xterm-243 +MANIFEST for xterm-244, version xterm-244 MANIFESTthis file 256colres.h resource-definitions for 256-color mode @@ -52,6 +52,7 @@ keysym2ucs.clookup-table for UTF-8 to keysyms keysym2ucs.hinterface of keysym2ucs.c koi8rxterm KOI-8 wrapper from Debian (originally me) koi8rxterm.man
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Tekproc.c | 55 +++--
button.c | 336 +++--
cachedGCs.c|6 -
charproc.c | 27 +++-
input.c| 80 +
main.h | 18 ++-
menu.c | 32 ++---
minstall.sh| 14 +-
misc.c | 33 ++---
ptyx.h | 11 +
trace.c| 27
trace.h| 15 ++
util.c |8 -
version.h |4
xterm.h| 17 ++
xterm.log.html | 54 -
xterm.man | 127 -
xtermcap.c | 252 +++---
xtermcap.h | 20 +--
20 files changed, 818 insertions(+), 320 deletions(-)
New commits:
commit 5cc6c9ac6341aa3b67f68c5980c6d0349b5cfef0
Author: Julien Cristau
Date: Mon May 25 19:25:59 2009 +0200
Import xterm 243
diff --git a/MANIFEST b/MANIFEST
index 3aa34db..0a8ae68 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-242, version xterm-242
+MANIFEST for xterm-243, version xterm-243
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index 01ae484..6edcee0 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.163 2009/02/13 20:01:21 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.167 2009/03/28 17:03:35 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -897,8 +897,8 @@ TekClear(TekWidget tw)
static void
TekConfigure(Widget w)
{
-if (IsTekWidget(w)) {
- TekWidget tw = (TekWidget) w;
+TekWidget tw = getTekWidget(w);
+if (tw != 0) {
TekScreen *tekscr = TekScreenOf(tw);
TScreen *screen = TScreenOf(term);
int border = 2 * screen->border;
@@ -922,11 +922,11 @@ TekExpose(Widget w,
XEvent * event GCC_UNUSED,
Region region GCC_UNUSED)
{
-if (IsTekWidget(w)) {
- TekWidget tw = (TekWidget) w;
+TekWidget tw = getTekWidget(w);
+if (tw != 0) {
TekScreen *tekscr = TekScreenOf(tw);
- TRACE(("TekExpose\n"));
+ TRACE(("TekExpose {{\n"));
#ifdef lint
region = region;
@@ -937,8 +937,8 @@ TekExpose(Widget w,
Tpushback = Tpushb;
tekscr->cur_X = 0;
tekscr->cur_Y = TEKHOME;
- TekSetFontSize(tw, tekscr->page.fontsize);
tekscr->cur = tekscr->page;
+ TekSetFontSize(tw, tekscr->cur.fontsize);
tekscr->margin = MARGIN1;
if (tekscr->TekGIN) {
tekscr->TekGIN = NULL;
@@ -952,6 +952,7 @@ TekExpose(Widget w,
first_map_occurred();
if (!tekscr->waitrefresh)
TekRefresh(tw);
+ TRACE(("}} TekExpose\n"));
}
}
@@ -979,6 +980,7 @@ TekRefresh(TekWidget tw)
void
TekRepaint(TekWidget tw)
{
+TRACE(("TekRepaint\n"));
TekClear(tw);
TekExpose((Widget) tw, (XEvent *) NULL, (Region) NULL);
}
@@ -1655,7 +1657,7 @@ TekSetFontSize(TekWidget tw, int newitem)
int newsize = MI2FS(newitem);
Font fid;
- TRACE(("TekSetFontSize(%d)\n", newitem));
+ TRACE(("TekSetFontSize(%d) size %d ->%d\n", newitem, oldsize, newsize));
if (newsize < 0 || newsize >= TEKNUMFONTS) {
Bell(XkbBI_MinorError, 0);
} else if (oldsize != newsize) {
@@ -1663,6 +1665,9 @@ TekSetFontSize(TekWidget tw, int newitem)
TCursorToggle(tw, TOGGLE);
set_tekfont_menu_item(oldsize, False);
+ tekscr->cur.fontsize = newsize;
+ tekscr->page.fontsize = newsize;
+
fid = tw->tek.Tfont[newsize]->fid;
if (fid == DefaultGCID) {
/* we didn't succeed in opening a real font
@@ -1674,10 +1679,15 @@ TekSetFontSize(TekWidget tw, int newitem)
XSetFont(XtDisplay(tw), tekscr->TnormalGC, fid);
}
- tekscr->cur.fontsize = newsize;
set_tekfont_menu_item(newsize, True);
if (!Ttoggled)
TCursorToggle(tw, TOGGLE);
+
+ /* we'll get an exposure event after changing fontsize, so we
+* have to clear the screen to avoid painting over the previous
+* text.
+*/
+ TekClear(tw);
}
}
}
@@ -1794,6 +1804,7 @@ TCursorToggle(TekWidget tw, int toggle) /*
TOGGLE or CLEAR */
if (!TEK4014_SHOWN(term))
return;
+TRACE(("TCursorToggle %s\n", (toggle == TOGGLE) ? "toggle" : "clear"));
c = tekscr->cur.fontsize;
cellwidth = (unsigned) tw->tek.Tfont[c]->max_bounds.width;
cellheight = (unsigned) (tw->tek.Tfont[c]->ascent +
@@ -1891,8 +1902,8 @@ HandleGINInput(Widget w,
String * param_list,
Cardinal *nparamsp)
{
-if (IsTekWidget(w)) {
- TekWidget tw = (TekWidget) w;
+TekWidget tw = getTekWidget(w);
+if (tw != 0) {
TekScreen *tekscr = TekScreenO
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Tekproc.c | 28 +-
XTerm.ad | 25 ++
aclocal.m4 | 22 --
button.c | 23 +-
cachedGCs.c| 32 +--
charproc.c | 235 +-
configure | 588 -
doublechr.c| 15 -
fontutils.c| 182 -
fontutils.h| 10
main.h |6
menu.c | 167 +++-
menu.h | 26 ++
misc.c | 95 ++---
ptyx.h | 19 +
screen.c | 175
scrollbar.c| 23 +-
util.c | 199 +++
version.h |4
wcwidth.c |6
xterm.h| 21 +-
xterm.log.html | 49
xterm.man | 97 +++--
24 files changed, 1282 insertions(+), 767 deletions(-)
New commits:
commit 510d58ae3f6450ce51e2b814e6fb87177d320739
Author: Julien Cristau
Date: Fri Mar 13 20:50:11 2009 +0100
Import xterm 242
diff --git a/MANIFEST b/MANIFEST
index 1d76918..3aa34db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-241, version xterm-241
+MANIFEST for xterm-242, version xterm-242
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index 25eca7c..01ae484 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.161 2009/01/26 00:19:39 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.163 2009/02/13 20:01:21 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -757,7 +757,7 @@ Tekparse(TekWidget tw)
IChar c2;
unsigned len = 0;
while ((c2 = input()) != ANSI_BEL) {
- if (!isprint(c2 & 0x7f)
+ if (!isprint((int) (c2 & 0x7f))
|| len + 2 >= (int) sizeof(buf2))
break;
buf2[len++] = (Char) c2;
@@ -874,7 +874,7 @@ Tinput(TekWidget tw)
Panic("Tinput: malloc error (%d)\n", errno);
tek = tek->next;
tek->next = (TekLink *) 0;
- tek->fontsize = tekscr->cur.fontsize;
+ tek->fontsize = (unsigned short) tekscr->cur.fontsize;
tek->count = 0;
tek->ptr = tek->data;
}
@@ -997,7 +997,7 @@ TekPage(TekWidget tw)
if (tekscr->TekGIN)
TekGINoff(tw);
tek = TekRecord = &Tek0;
-tek->fontsize = tekscr->cur.fontsize;
+tek->fontsize = (unsigned short) tekscr->cur.fontsize;
tek->count = 0;
tek->ptr = tek->data;
tek = tek->next;
@@ -1031,7 +1031,7 @@ getpoint(TekWidget tw)
x = tekscr->cur.x;
y = tekscr->cur.y;
for (;;) {
- if ((c = input()) < ' ') { /* control character */
+ if ((c = (int) input()) < ' ') {/* control character */
unput(c);
return (0);
}
@@ -1162,12 +1162,12 @@ AddToDraw(TekWidget tw, int x1, int y1, int x2, int y2)
TekFlush(tw);
}
lp = line_pt++;
-lp->x1 = x1 = (int) (x1 * TekScale(tekscr) + screen->border);
-lp->y1 = y1 = (int) ((TEKHEIGHT + TEKTOPPAD - y1) * TekScale(tekscr) +
-screen->border);
-lp->x2 = x2 = (int) (x2 * TekScale(tekscr) + screen->border);
-lp->y2 = y2 = (int) ((TEKHEIGHT + TEKTOPPAD - y2) * TekScale(tekscr) +
-screen->border);
+lp->x1 = (short) (x1 * TekScale(tekscr) + screen->border);
+lp->y1 = (short) ((TEKHEIGHT + TEKTOPPAD - y1) * TekScale(tekscr) +
+ screen->border);
+lp->x2 = (short) (x2 * TekScale(tekscr) + screen->border);
+lp->y2 = (short) ((TEKHEIGHT + TEKTOPPAD - y2) * TekScale(tekscr) +
+ screen->border);
nplot++;
TRACE(("...AddToDraw %d points\n", nplot));
}
@@ -1596,10 +1596,10 @@ TekRealize(Widget gw,
args[0].value = (XtArgVal) & icon_name;
args[1].value = (XtArgVal) & title;
XtGetValues(SHELL_OF(tw), args, 2);
- tek_icon_name = XtMalloc(strlen(icon_name) + 7);
+ tek_icon_name = XtMalloc((Cardinal) strlen(icon_name) + 7);
strcpy(tek_icon_name, icon_name);
strcat(tek_icon_name, "(Tek)");
- tek_title = XtMalloc(strlen(title) + 7);
+ tek_title = XtMalloc((Cardinal) strlen(title) + 7);
strcpy(tek_title, title);
strcat(tek_title, "(Tek)");
args[0].value = (XtArgVal) tek_icon_name;
@@ -1611,7 +1611,7 @@ TekRealize(Widget gw,
tek = TekRecord = &Tek0;
tek->next = (TekLink *) 0;
-tek->fontsize = tekscr->cur.fontsize;
+tek->fontsize = (unsigned short) tekscr->cur.fontsize;
tek->count = 0;
tek->ptr = tek->data;
Tpushback = Tpushb;
diff --git a/XTerm.ad b/XTerm.ad
index d914402..b5659fc 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.85 2007/11/26 18:42:37 tom Exp $
+! $XTermId: XTerm.ad,v 1.88 2009/02/13 00:14:13
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Makefile.in| 18
Tekproc.c | 33
aclocal.m4 | 116 +-
button.c | 219 ++--
charproc.c | 22
charsets.c |8
config.guess | 32
config.sub | 18
configure | 2524 +
data.h |7
fontutils.c| 202 +++-
input.c| 32
main.c | 18
menu.c | 60 -
misc.c | 99 +-
os2main.c | 80 +
ptydata.c | 22
ptyx.h |4
scrollbar.c| 84 -
util.c | 52 -
version.h |4
xterm.h| 11
xterm.log.html | 46 -
xterm.man | 64 +
xtermcap.c |6
26 files changed, 2116 insertions(+), 1667 deletions(-)
New commits:
commit bed99c1828bc5d2a8f8638d88da9c18befba53e4
Author: Julien Cristau
Date: Tue Jan 27 23:02:55 2009 +0100
Import xterm 241
diff --git a/MANIFEST b/MANIFEST
index dcfeb17..1d76918 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-240, version xterm-240
+MANIFEST for xterm-241, version xterm-241
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/charproc.c b/charproc.c
index 835a378..8eb9ce8 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.868 2009/01/24 15:39:08 tom Exp $ */
+/* $XTermId: charproc.c,v 1.869 2009/01/26 20:50:58 Jeff.Chua Exp $ */
/*
@@ -4955,9 +4955,8 @@ VTNonMaskableEvent(Widget w GCC_UNUSED,
static void
VTResize(Widget w)
{
-XtermWidget xw;
-
-if ((xw = getXtermWidget(w)) != 0) {
+if (XtIsRealized(w)) {
+ XtermWidget xw = (XtermWidget) w;
ScreenResize(xw, xw->core.width, xw->core.height, &xw->flags);
}
}
diff --git a/fontutils.c b/fontutils.c
index 881533b..3a30a5a 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.283 2009/01/26 00:24:23 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.287 2009/01/27 01:57:22 tom Exp $ */
/
@@ -687,14 +687,21 @@ xtermOpenFont(XtermWidget xw, char *name, XTermFonts *
result)
Bool code = False;
TScreen *screen = TScreenOf(xw);
-if (name != 0
- && (result->fs = XLoadQueryFont(screen->display, name)) != 0) {
- code = True;
- if (EmptyFont(result->fs)) {
- result = xtermCloseFont(xw, result);
- code = False;
- } else {
- result->fn = x_strdup(name);
+if (name != 0) {
+ if ((result->fs = XLoadQueryFont(screen->display, name)) != 0) {
+ code = True;
+ if (EmptyFont(result->fs)) {
+ result = xtermCloseFont(xw, result);
+ code = False;
+ } else {
+ result->fn = x_strdup(name);
+ }
+ } else if (strcmp(name, DEFFONT)) {
+#if OPT_RENDERFONT
+ if (!UsingRenderFont(xw))
+#endif
+ fprintf(stderr, "%s: cannot load font %s\n", ProgramName, name);
+ code = xtermOpenFont(xw, DEFFONT, result);
}
}
return code;
@@ -2352,6 +2359,56 @@ useFaceSizes(XtermWidget xw)
break;
}
}
+ if (!result) {
+ Boolean broken_fonts = True;
+ TScreen *screen = TScreenOf(xw);
+ int first = screen->menu_font_sizes[0];
+
+ lookupFontSizes(xw);
+ for (n = 0; n < NMENUFONTS; n++) {
+ if (screen->menu_font_sizes[n] > 0
+ && screen->menu_font_sizes[n] != first) {
+ broken_fonts = False;
+ break;
+ }
+ }
+
+ /*
+* Workaround for breakage in font-packages - check if all of the
+* bitmap font sizes are the same, and if we're using TrueType
+* fonts.
+*/
+ if (broken_fonts) {
+ float lo_value = (float) 9.0e9;
+ float hi_value = (float) 0.0;
+ float value;
+
+ TRACE(("bitmap fonts are broken - set faceSize resources\n"));
+ for (n = 0; n < NMENUFONTS; n++) {
+ value = xw->misc.face_size[n];
+ if (value > 0.0) {
+ if (lo_value > value)
+ lo_value = value;
+ if (hi_value < value)
+ hi_value = value;
+ }
+ }
+
+ if (hi_value <= 0.0)
+ sscanf(DEFFACESIZE, "%f", &value);
+ else
+ value = (float) ((hi_value + lo_value) / 2.0);
+ if (value <= 0)
+ value = (float) 14.0;
+
+ for (n = 0; n < NMENUFONTS; n++) {
+ TRACE(("setting faceSize%d %.1f\n", n, value));
+ xw
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
button.c | 10 ++
input.c|6 +++---
print.c| 10 +-
testxmc.c | 16
version.h |4 ++--
xterm.log.html | 14 +++---
7 files changed, 36 insertions(+), 26 deletions(-)
New commits:
commit 1ea13e4758104f85f7334ff403850bf754c94a37
Author: Julien Cristau
Date: Sat Jan 10 19:20:28 2009 +0100
Import xterm 239
diff --git a/MANIFEST b/MANIFEST
index f8d132a..9c9105a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-238, version xterm-238
+MANIFEST for xterm-239, version xterm-239
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 6f5f3b1..d9e6dfc 100644
--- a/button.c
+++ b/button.c
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.297 2008/10/05 23:32:52 tom Exp $ */
+/* $XTermId: button.c,v 1.298 2009/01/09 01:29:52 tom Exp $ */
/*
- * Copyright 1999-2007,2008 by Thomas E. Dickey
+ * Copyright 1999-2008,2009 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -334,8 +334,10 @@ SendLocatorPosition(XtermWidget xw, XEvent * event)
*/
state = (event->xbutton.state
& (Button1Mask | Button2Mask | Button3Mask | Button4Mask)) >> 8;
-state ^= 1 << button; /* update mask to "after" state */
-state = (state & ~(4 | 1)) | ((state & 1) ? 4 : 0) | ((state & 4) ? 1 :
0);/* swap Button1 & Button3 */
+/* update mask to "after" state */
+state ^= 1 << button;
+/* swap Button1 & Button3 */
+state = (state & ~(4 | 1)) | ((state & 1) ? 4 : 0) | ((state & 4) ? 1 : 0);
reply.a_param[1] = (ParmType) state;
reply.a_param[2] = (ParmType) row;
diff --git a/input.c b/input.c
index eed8ea6..5603806 100644
--- a/input.c
+++ b/input.c
@@ -1,7 +1,7 @@
-/* $XTermId: input.c,v 1.302 2008/12/30 17:20:39 tom Exp $ */
+/* $XTermId: input.c,v 1.303 2009/01/08 23:28:36 tom Exp $ */
/*
- * Copyright 1999-2007,2008 by Thomas E. Dickey
+ * Copyright 1999-2008,2009 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -984,7 +984,7 @@ Input(XtermWidget xw,
#ifdef XK_KP_Home
if (kd.keysym >= XK_KP_Home && kd.keysym <= XK_KP_Begin) {
TRACE(("...Input keypad before was " KEYSYM_FMT "\n", kd.keysym));
- kd.keysym += (unsigned) (XK_Home - XK_KP_Home);
+ kd.keysym += (KeySym) (XK_Home - XK_KP_Home);
TRACE(("...Input keypad changed to " KEYSYM_FMT "\n", kd.keysym));
}
#endif
diff --git a/print.c b/print.c
index e807fbc..555b41a 100644
--- a/print.c
+++ b/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.80 2007/03/19 23:49:51 tom Exp $ */
+/* $XTermId: print.c,v 1.81 2009/01/09 01:43:01 tom Exp $ */
/*
* $XFree86: xc/programs/xterm/print.c,v 1.24 2006/06/19 00:36:51 dickey Exp $
@@ -6,7 +6,7 @@
/
-Copyright 1997-2006,2007 by Thomas E. Dickey
+Copyright 1997-2007,2009 by Thomas E. Dickey
All Rights Reserved
@@ -193,7 +193,7 @@ printLine(int row, unsigned chr)
#endif
)
&& ch) {
- attr = (a[col] & SGR_MASK);
+ attr = CharOf(a[col] & SGR_MASK);
last_fg = fg;
last_bg = bg;
if (screen->print_attributes)
@@ -556,7 +556,7 @@ xtermPrinterControl(int chr)
case '4':
case '5':
case 'i':
- bfr[length++] = chr;
+ bfr[length++] = CharOf(chr);
for (n = 0; n < sizeof(tbl) / sizeof(tbl[0]); n++) {
size_t len = Strlen(tbl[n].seq);
@@ -580,7 +580,7 @@ xtermPrinterControl(int chr)
default:
for (n = 0; n < length; n++)
charToPrinter(bfr[n]);
- bfr[0] = chr;
+ bfr[0] = CharOf(chr);
length = 1;
return 0;
}
diff --git a/testxmc.c b/testxmc.c
index 747e7bf..1a116bc 100644
--- a/testxmc.c
+++ b/testxmc.c
@@ -1,4 +1,4 @@
-/* $XTermId: testxmc.c,v 1.34 2006/07/23 18:53:12 tom Exp $ */
+/* $XTermId: testxmc.c,v 1.35 2009/01/09 01:40:17 tom Exp $ */
/*
* $XFree86: xc/programs/xterm/testxmc.c,v 3.14 2006/02/13 01:14:59 dickey Exp
$
@@ -6,7 +6,7 @@
/
-Copyright 1997-2005,2006 by Thomas E. Dickey
+Copyright 1997-2006,2009 by Thomas E. Dickey
All Rights Reserved
@@ -92,8 +92,8 @@ authorization.
#include
#include
-#define MARK_ON(a) (my_attrs & a) != 0 && (xw->flags & (whichone = a)) == 0
-#define MARK_OFF(a) (my_attrs & a) != 0 && (xw->flags & (whichone = a)) != 0
+#define MARK_ON(a) (my_attrs & a) != 0 && (xw->flags & (whichone =
CharOf(a))) == 0
+#define MARK_OFF(a) (my_attrs & a) != 0 && (xw->flags & (whichone =
CharOf(a))) != 0
void
Mark_XMC(XtermWidg
xterm: Changes to 'upstream-unstable'
INSTALL | 34 +++---
MANIFEST |2
aclocal.m4 | 15 +-
button.c | 140 +++
cachedGCs.c | 12 +-
charclass.c |4
charproc.c | 261 ---
configure| 52 +-
configure.in | 18 +--
cursor.c | 14 +-
fontutils.c | 23 ++--
input.c | 49 -
misc.c | 97 ++
ptyx.h | 68 -
resize.c | 25 ++--
scrollbar.c | 30 +++--
tabs.c |7 -
util.c | 28 +
version.h|4
vttests/tcapquery.pl |5
xcharmouse.h |6 -
xstrings.c | 34 +-
xstrings.h |5
xterm.h | 23 ++--
xterm.log.html | 50 +
xterm.man| 12 ++
xtermcap.c | 29 -
27 files changed, 618 insertions(+), 429 deletions(-)
New commits:
commit ccdc8f91c087c81a84abe46a77ab5560be9edd6f
Author: Julien Cristau
Date: Sat Jan 3 13:19:34 2009 +0100
Import xterm 238
diff --git a/INSTALL b/INSTALL
index c1a550f..1485bfb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.117 2007/12/12 01:30:43 tom Exp $
+-- $XTermId: INSTALL,v 1.118 2008/12/30 11:43:45 tom Exp $
---
--- Copyright 1997-2006,2007 by Thomas E. Dickey
+-- Copyright 1997-2007,2008 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -221,6 +221,13 @@ The options (in alphabetic order):
(The same ifdef controls the metaSendsEscape support).
+ --disable-paste64 disable support for bracketed paste mode
+
+ Do not compile-in code to support experimental bracketed paste mode,
+ i.e., provide functions for setting/getting the selection data.
+
+ (see ctlseqs.ms description of OSC 52).
+
--disable-pty-handshake disable support for pty handshakes
This feature is used to ensure that the child process's terminal modes
@@ -272,10 +279,17 @@ The options (in alphabetic order):
--disable-tcap-fkeysdisable termcap function-keys
- Compile-in code to support feature which allows xterm to use the
+ Do not compile-in code to support feature which allows xterm to use the
function-key definitions from the termcap/terminfo entry which it used
to set the $TERM variable on startup.
+ --disable-tcap-querydisable termcap query/report
+
+ Do not compile-in code to support DCS '+' control sequence, which
+ allows an application to ask xterm what control sequences it would
+ transmit for specified function keys, given the termcap or terminfo
+ names.
+
--disable-tek4014 disable tek4014 emulation
Do not compile-in code to support Tektronix 4014 emulation.
@@ -399,13 +413,6 @@ The options (in alphabetic order):
configure --disable-imake --disable-narrowproto
- --enable-paste64enable support for bracketed paste mode
-
- Compile-in code to support experimental bracketed paste mode, i.e.,
- provide functions for setting/getting the selection data.
-
- (see ctlseqs.ms description of OSC 52).
-
--enable-readline-mouse enable support for mouse in readline applications
Compile-in code to support experimental bracketed paste mode, i.e.,
@@ -423,13 +430,6 @@ The options (in alphabetic order):
Compile-in code to support Sun-style function keys.
- --enable-tcap-query enable termcap query/report
-
- Compile-in code to support experimental DCS '+' control sequence, which
- allows an application to ask xterm what control sequences it would
- transmit for specified function keys, given the termcap or terminfo
- names.
-
--enable-toolbarenable pulldown menus on toolbar
Compile-in code that builds a toolbar with pulldown menus. The
diff --git a/MANIFEST b/MANIFEST
index 255c8b0..f8d132a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-237, version xterm-237
+MANIFEST for xterm-238, version xterm-238
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index e415299..f75e048 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.253 2008/07/27 15:28:15 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.254 2008/12/30 17:01:41 tom Exp $
dnl
dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.65 2006/06/19 00:36:50 dickey
Exp $
dnl
@@ -276,13 +276,14 @@ AC_TRY_LINK([#include ],[printf("Hello
world");],,
fi
])dnl
dnl ---
xterm: Changes to 'upstream-unstable'
MANIFEST |2
aclocal.m4 | 63 +++-
charproc.c | 64 +++-
configure | 802 +
configure.in |8
ctlseqs.ms | 28 +
ctlseqs.txt| 24 +
cursor.c | 24 +
fontutils.c| 10
input.c| 25 +
misc.c |7
ptydata.c |4
ptyx.h |4
screen.c | 111 ---
scrollbar.c| 40 +-
version.h |4
xterm.h|8
xterm.log.html | 46 +++
xterm.man | 24 +
xtermcfg.hin |3
20 files changed, 831 insertions(+), 470 deletions(-)
New commits:
commit 66ad0b237b0a500b01ec146b01dc04c2aec769a3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Apr 21 02:36:56 2008 +0200
Import xterm 235
diff --git a/MANIFEST b/MANIFEST
index 1351cab..b8d25e5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-233, version xterm-233
+MANIFEST for xterm-235, version xterm-235
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index 7bee0f2..790628e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.247 2008/02/24 19:30:23 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.251 2008/03/26 00:59:57 tom Exp $
dnl
dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.65 2006/06/19 00:36:50 dickey
Exp $
dnl
@@ -219,7 +219,7 @@ ifelse($3,,[:]dnl
])dnl
])])dnl
dnl ---
-dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31
+dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
dnl --
dnl Check if we're accidentally using a cache from a different machine.
dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -250,7 +250,7 @@ test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring
for $cf_cv_system_name
if test ".$system_name" != ".$cf_cv_system_name" ; then
AC_MSG_RESULT(Cached system name ($system_name) does not agree with
actual ($cf_cv_system_name))
- AC_ERROR("Please remove config.cache and try again.")
+ AC_MSG_ERROR("Please remove config.cache and try again.")
fi
])dnl
dnl ---
@@ -783,7 +783,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
[AC_DIVERT_HELP([$1])dnl
])dnl
dnl ---
-dnl CF_IMAKE_CFLAGS version: 29 updated: 2007/05/24 20:53:19
+dnl CF_IMAKE_CFLAGS version: 30 updated: 2008/03/23 15:04:54
dnl ---
dnl Use imake to obtain compiler flags. We could, in principle, write tests to
dnl get these, but if imake is properly configured there is no point in doing
@@ -864,14 +864,14 @@ CF_EOF
esac
done
if test -z "$cf_config" ; then
- AC_WARN(Could not find imake config-directory)
+ AC_MSG_WARN(Could not find imake config-directory)
else
cf_imake_opts="$cf_imake_opts -I$cf_config"
if ( $IMAKE -v $cf_imake_opts 2>&AC_FD_CC)
then
CF_VERBOSE(Using $IMAKE $cf_config)
else
- AC_WARN(Cannot run $IMAKE)
+ AC_MSG_WARN(Cannot run $IMAKE)
fi
fi
fi
@@ -1093,7 +1093,7 @@ if test -n "$cf_path_prog" ; then
fi
])dnl
dnl ---
-dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46
+dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
dnl --
dnl Check the argument to see that it looks like a pathname. Rewrite it if it
dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -1125,7 +1125,7 @@ case ".[$]$1" in #(vi
$1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
+ ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
;;
esac
])dnl
@@ -1809,7 +1809,36 @@ else
fi
])dnl
dnl ---
-dnl CF_TYPE_FD_SET version: 3 updated: 1999/10/16 13:49:00
+dnl CF_TYPE_FD_MASK version: 1 updated: 2008/03/25 20:56:27
+dnl ---
+dnl Check for the declaration of fd_mask, which is like fd_set, associated
+dnl with select(). The check for fd_set should have pulled in this as well,
+dnl but there is a special case for Mac OS X, possibly other BSD-derived
+dnl platforms.
+AC_DEFUN([CF_TYPE_FD_MASK],
+[
+AC_REQUIRE([CF_TYPE_FD_SET])
+
+AC_CACHE_CHECK(for declaration of fd_mask,cf_cv_type_fd_mask,[
+if test x$cf_c
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Tekproc.c |6
aclocal.m4 | 42 -
button.c | 29
cachedGCs.c|6
charproc.c | 30
configure | 1836 +
configure.in |5
fontutils.c| 17
main.c | 32
ptydata.c | 17
ptyx.h |6
scrollbar.c| 11
sinstall.sh| 15
tabs.c | 10
util.c | 31
version.h |4
xterm.log.html | 56 +
xterm.man |4
xtermcfg.hin |6
20 files changed, 1208 insertions(+), 957 deletions(-)
New commits:
commit 455745d8707740c4e09505de734c5d73d7620b3c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Mar 19 01:13:12 2008 +0100
Import xterm 234.
diff --git a/charproc.c b/charproc.c
index c973756..54d6dca 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.835 2008/02/21 20:21:33 tom Exp $ */
+/* $XTermId: charproc.c,v 1.836 2008/02/29 01:55:13 tom Exp $ */
/*
@@ -5941,6 +5941,19 @@ releaseWindowGCs(XtermWidget xw, VTwin * win)
name = 0; \
}
+#ifdef NO_LEAKS
+#if OPT_RENDERFONT
+static void
+xtermCloseXft(TScreen * screen, XftFont ** pub)
+{
+if (*pub != 0) {
+ XftFontClose(screen->display, *pub);
+ *pub = 0;
+}
+}
+#endif
+#endif
+
static void
VTDestroy(Widget w GCC_UNUSED)
{
@@ -5986,6 +5999,17 @@ VTDestroy(Widget w GCC_UNUSED)
xtermCloseFonts(xw, screen->fnts);
noleaks_cachedCgs(xw);
+#if OPT_RENDERFONT
+for (n = 0; n < NMENUFONTS; ++n) {
+ xtermCloseXft(screen, &(screen->renderFontNorm[n]));
+ xtermCloseXft(screen, &(screen->renderFontBold[n]));
+ xtermCloseXft(screen, &(screen->renderFontItal[n]));
+ xtermCloseXft(screen, &(screen->renderWideNorm[n]));
+ xtermCloseXft(screen, &(screen->renderWideBold[n]));
+ xtermCloseXft(screen, &(screen->renderWideItal[n]));
+}
+#endif
+
#if 0 /* some strings may be owned by X libraries */
for (n = 0; n <= fontMenu_lastBuiltin; ++n) {
int k;
diff --git a/fontutils.c b/fontutils.c
index f782523..d66933b 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.269 2008/02/21 20:21:15 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.270 2008/02/29 00:25:16 Andrea.Odetti Exp $ */
/
@@ -699,6 +699,9 @@ xtermOpenFont(XtermWidget xw, char *name, XTermFonts *
result)
return code;
}
+/*
+ * Close the font and Free the font info
+ */
XTermFonts *
xtermCloseFont(XtermWidget xw, XTermFonts * fnt)
{
@@ -712,18 +715,6 @@ xtermCloseFont(XtermWidget xw, XTermFonts * fnt)
return 0;
}
-static XTermFonts *
-xtermCloseFont2(XtermWidget xw, XTermFonts * fnt)
-{
-if (fnt != 0 && fnt->fs != 0) {
- TScreen *screen = TScreenOf(xw);
-
- clrCgsFonts(xw, WhichVWin(screen), fnt);
- XFreeFont(screen->display, fnt->fs);
-}
-return 0;
-}
-
/*
* Close the listed fonts, noting that some may use copies of the pointer.
*/
@@ -733,13 +724,16 @@ xtermCloseFonts(XtermWidget xw, XTermFonts * fnts)
int j, k;
for (j = 0; j < fMAX; ++j) {
- if (fnts[j].fs != 0) {
- xtermCloseFont2(xw, &fnts[j]);
+ /*
+* Need to save the pointer since xtermCloseFont zeroes it
+*/
+ XFontStruct *thisFont = fnts[j].fs;
+ if (thisFont != 0) {
+ xtermCloseFont(xw, &fnts[j]);
for (k = j + 1; k < fMAX; ++k) {
- if (fnts[j].fs == fnts[k].fs)
+ if (thisFont == fnts[k].fs)
xtermFreeFontInfo(&fnts[k]);
}
- xtermFreeFontInfo(&fnts[j]);
}
}
}
diff --git a/main.c b/main.c
index bbf8f19..f9019d1 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.585 2008/02/24 21:49:36 tom Exp $ */
+/* $XTermId: main.c,v 1.586 2008/02/28 00:28:00 Matthieu.Herrb Exp $ */
/*
* W A R N I N G
@@ -1873,10 +1873,6 @@ main(int argc, char *argv[]ENVP_ARG)
#ifndef USE_TERMIOS/* { */
d_tio.c_line = 0;
#endif /* } */
-#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */
-d_tio.c_cc[VMIN] = 1;
-d_tio.c_cc[VTIME] = 0;
-#endif /* } */
#ifdef HAS_LTCHARS /* { */
d_ltc.t_suspc = CSUSP; /* t_suspc */
d_ltc.t_dsuspc = CDSUSP; /* t_dsuspc */
@@ -1939,6 +1935,10 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
}
+#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */
+d_tio.c_cc[VMIN] = 1;
+d_tio.c_cc[VTIME] = 0;
+#endif /* } */
#ifdef HAS_LTCHARS /* { */
d_ltc.t_suspc = CharOf('\000');/* t_suspc */
d_ltc.t_dsuspc = CharOf('\000'); /* t_dsuspc */
diff --git a/scrollbar.c b/scrollbar.c
index 2ab68cf..c82da89 100644
--- a/scrollbar.c
+++ b/scrollbar.c
@@ -1,9 +1,9 @@
-/* $XTermId: scrollbar.c,v 1.132 200
xterm: Changes to 'upstream-unstable'
Tekproc.c |9 -
VTPrsTbl.c |7 -
VTparse.def|5
VTparse.h |6
button.c | 10 +
cachedGCs.c| 143 +---
charclass.c|7 -
charproc.c | 45 +-
ctlseqs.ms | 19 ++
ctlseqs.txt| 13 +
doublechr.c| 21 +--
fontutils.c| 276 ++--
fontutils.h| 16 +-
main.c | 391 +
main.h |8 -
menu.c |6
minstall.sh|7 -
misc.c | 83 ++--
ptyx.h | 35 +++--
screen.c | 60 +++-
tabs.c | 18 +-
util.c | 14 --
version.h |4
xterm.h| 13 +
xterm.log.html | 75 ++
xterm.man | 23 ++-
26 files changed, 769 insertions(+), 545 deletions(-)
New commits:
commit a18a5b3f13d9355f885b7e67b37e355d57028f03
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Feb 9 02:04:30 2008 +0100
Import xterm 232.
diff --git a/Tekproc.c b/Tekproc.c
index d7dd80e..8b1b89a 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.157 2007/07/10 19:53:11 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.158 2008/01/26 01:21:10 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -7,7 +7,7 @@
/*
-Copyright 2001-2006,2007 by Thomas E. Dickey
+Copyright 2001-2007,2008 by Thomas E. Dickey
All Rights Reserved
@@ -729,13 +729,16 @@ Tekparse(TekWidget tw)
1);
} else
#endif
+ {
+ char ch2 = (char) ch;
XDrawString(XtDisplay(tw),
TWindow(tekscr),
tekscr->TnormalGC,
x,
y,
- (char *) &ch,
+ &ch2,
1);
+ }
TCursorForward(tw);
break;
case CASE_OSC:
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index 38b04fa..47a2441 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,9 +1,8 @@
-/* $XTermId: VTPrsTbl.c,v 1.48 2006/07/31 22:14:03 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.49 2008/01/27 17:41:05 tom Exp $ */
-/* $XFree86: xc/programs/xterm/VTPrsTbl.c,v 3.31 2006/02/13 01:14:58 dickey
Exp $ */
/*
*
- * Copyright 1999-2005,2006 by Thomas E. Dickey
+ * Copyright 1999-2006,2008 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -3141,7 +3140,7 @@ CASE_SET_MOD_FKEYS,
CASE_SET_MOD_FKEYS0,
CASE_GROUND_STATE,
/* p q r s */
-CASE_GROUND_STATE,
+CASE_HIDE_POINTER,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
diff --git a/VTparse.def b/VTparse.def
index be2c1cd..6c8751d 100644
--- a/VTparse.def
+++ b/VTparse.def
@@ -1,6 +1,6 @@
-# $XTermId: VTparse.def,v 1.30 2007/12/04 21:14:30 tom Exp $
+# $XTermId: VTparse.def,v 1.31 2008/01/27 17:08:54 tom Exp $
#
-# vile:txtmode rs=lf
+# vile:confmode rs=lf
#
# List of symbols that need to be defined for VTparse.h. If you need to
# change any of the CASE_ macros, make the change here and rerun the command
@@ -140,3 +140,4 @@ CASE_DECRARA
CASE_CSI_STAR_STATE
CASE_SET_MOD_FKEYS
CASE_SET_MOD_FKEYS0
+CASE_HIDE_POINTER
diff --git a/VTparse.h b/VTparse.h
index 0bbb399..db2fd07 100644
--- a/VTparse.h
+++ b/VTparse.h
@@ -1,8 +1,7 @@
-/* $XTermId: VTparse.h,v 1.42 2006/07/31 22:17:40 tom Exp $ */
+/* $XTermId: VTparse.h,v 1.43 2008/01/27 17:11:37 tom Exp $ */
-/* $XFree86: xc/programs/xterm/VTparse.h,v 3.24 2006/02/13 01:14:58 dickey Exp
$ */
/*
- * Copyright 2002-2005,2006 by Thomas E. Dickey
+ * Copyright 2002-2006,2008 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -242,5 +241,6 @@ extern Const PARSE_T esc_pct_table[];
#define CASE_CSI_STAR_STATE 130
#define CASE_SET_MOD_FKEYS 131
#define CASE_SET_MOD_FKEYS0 132
+#define CASE_HIDE_POINTER 133
#endif /* included_VTparse_h */
diff --git a/button.c b/button.c
index 63a0e33..3e63306 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.281 2007/12/31 21:11:05 tom Exp $ */
+/* $XTermId: button.c,v 1.283 2008/01/07 22:56:37 tom Exp $ */
/*
* Copyright 1999-2006,2007 by Thomas E. Dickey
@@ -3154,6 +3154,7 @@ ConvertSelection(Widget w,
return False; /* can this happen? */
if (*target == XA_TARGETS(dpy)) {
+ Atom *allocP;
Atom *targetP;
Atom *std_targets;
XPointer std_return = 0;
@@ -3165,8 +3166,12 @@ ConvertSelection(Widget w,
&std_length, format)) {
std_targets = (Atom *) (std_return);
*length = std_length + 6;
+
targetP = (Atom *) XtMalloc(sizeof(Atom) * (*length));
+ allocP = targetP;
+
*value = (XtPointer) targetP;
+
*targetP++ = XA_STRING;
*tar
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
Makefile.in|5 -
configure |2 +-
configure.in |4 ++--
util.c | 10 ++
version.h |4 ++--
xterm.log.html | 17 +++--
7 files changed, 31 insertions(+), 13 deletions(-)
New commits:
commit 74606566b9ef5f4355eadb58c822c9f38728c70a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Jan 6 10:12:18 2008 +0100
Import xterm-231.
diff --git a/MANIFEST b/MANIFEST
index d6339d4..6e491e5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-229o, version xterm-230
+MANIFEST for xterm-231, version xterm-231
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index ff90a4a..f15ad49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.154 2007/12/30 16:39:48 tom Exp $
+## $XTermId: Makefile.in,v 1.155 2008/01/05 14:26:52 tom Exp $
##
## Copyright 2002-2006,2007 by Thomas E. Dickey
##
@@ -221,6 +221,9 @@ install-full :: $(MANDIR)
@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
[EMAIL PROTECTED]@ @echo installing $(APPSDIR)/KOI8RXTerm
[EMAIL PROTECTED]@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/KOI8RXTerm.ad
>XTerm.tmp
[EMAIL PROTECTED]@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/KOI8RXTerm
@no_appsdir@ @rm -f XTerm.tmp
@no_icondir@ @echo "... installed app-defaults"
diff --git a/configure b/configure
index 6c3d984..5c43852 100755
--- a/configure
+++ b/configure
@@ -743,7 +743,7 @@ Optional Features:
--disable-rightbar disable right-scrollbar support
--disable-samename disable check for redundant name-change
--disable-session-mgt disable support for session management
- --enable-tcap-fkeys disable termcap function-keys support
+ --disable-tcap-fkeysdisable termcap function-keys support
--enable-tcap-query compile-in termcap-query support
--disable-tek4014 disable tek4014 emulation
--enable-toolbarcompile-in toolbar for pulldown menus
diff --git a/configure.in b/configure.in
index b1fe245..693355c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.239 2007/12/31 17:21:31 tom Exp $
+dnl $XTermId: configure.in,v 1.240 2008/01/05 14:26:52 tom Exp $
dnl
dnl ---
dnl
@@ -722,7 +722,7 @@ test "$enable_session_mgt" = no &&
AC_DEFINE(OPT_SESSION_MGT,0)
AC_MSG_CHECKING(if you want to use termcap function-keys)
CF_ARG_DISABLE(tcap-fkeys,
- [ --enable-tcap-fkeys disable termcap function-keys support],
+ [ --disable-tcap-fkeysdisable termcap function-keys support],
[enable_tcap_fkeys=no],
[enable_tcap_fkeys=yes])
AC_MSG_RESULT($enable_tcap_fkeys)
diff --git a/util.c b/util.c
index c6f2f95..03da20b 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.403 2007/12/31 15:41:19 tom Exp $ */
+/* $XTermId: util.c,v 1.404 2008/01/05 14:26:52 tom Exp $ */
/*
* Copyright 1999-2006,2007 by Thomas E. Dickey
@@ -3497,9 +3497,11 @@ ClearCurBackground(XtermWidget xw,
unsigned
getXtermCell(TScreen * screen, int row, int col)
{
-return PACK_PAIR(SCRN_BUF_CHARS(screen, row),
-SCRN_BUF_WIDEC(screen, row),
-col);
+unsigned ch = SCRN_BUF_CHARS(screen, row)[col];
+if_OPT_WIDE_CHARS(screen, {
+ ch |= (SCRN_BUF_WIDEC(screen, row)[col] << 8);
+});
+return ch;
}
/*
diff --git a/version.h b/version.h
index b30ee58..6c19c76 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.286 2007/11/10 01:36:34 tom Exp $ */
+/* $XTermId: version.h,v 1.287 2008/01/05 14:26:52 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -6,7 +6,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 230
+#define XTERM_PATCH 231
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index d19c2ac..70ff93d 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -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.log.html,v 1.630 2007/12/31 23:03:01 tom Exp $
+ $XTermId: xterm.log.html,v 1.632 2008/01/06 01:53:25 tom Exp $
-->
@@ -45,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version
xterm: Changes to 'upstream-unstable'
INSTALL | 23 +- KOI8RXTerm.ad| 20 ++ MANIFEST |6 Makefile.in | 33 ++- VTparse.def |6 XTerm.ad |4 button.c | 39 +++- charproc.c | 116 configure| 169 -- configure.in | 23 +- ctlseqs.ms | 25 +- ctlseqs.txt | 16 + doublechr.c | 139 +-- fontutils.c | 84 +++-- fontutils.h | 11 - gen-pc-fkeys.pl | 50 +++-- input.c | 64 +- koi8rxterm | 84 + koi8rxterm.man | 97 ++ main.c | 15 - main.h |6 menu.c | 255 +-- menu.h |6 misc.c | 108 ++- os2main.c| 15 - ptyx.h | 123 +++-- resize.c | 14 - screen.c | 172 +++--- termcap | 26 +- terminfo | 321 -- trace.c | 32 ++- trace.h | 11 - util.c | 468 +++ uxterm | 12 - uxterm.desktop |4 uxterm.man | 91 + version.h|4 vttests/tcapquery.pl | 98 -- xterm.desktop|4 xterm.h | 29 ++- xterm.log.html | 119 xterm.man| 110 +++ xtermcap.c | 288 ++- xtermcap.h | 13 + xtermcfg.hin |3 45 files changed, 2498 insertions(+), 858 deletions(-) New commits: commit ddd58d3dddabcdc86ed00c39dfd716fae1a3eeba Author: Julien Cristau <[EMAIL PROTECTED]> Date: Wed Jan 2 19:58:27 2008 +0100 Import xterm-230. diff --git a/INSTALL b/INSTALL index 70c89c8..c1a550f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,4 @@ --- $XTermId: INSTALL,v 1.115 2007/06/17 13:44:39 tom Exp $ --- $XFree86: xc/programs/xterm/INSTALL,v 3.42 2006/02/13 01:14:57 dickey Exp $ +-- $XTermId: INSTALL,v 1.117 2007/12/12 01:30:43 tom Exp $ --- -- Copyright 1997-2006,2007 by Thomas E. Dickey -- @@ -228,6 +227,10 @@ The options (in alphabetic order): match the parent's. In particular, it addresses a problem where the terminal size is not defined in the stty settings. + --disable-rectanglesdisable VT420 rectangle support + + Do not compile-in code to support VT420 rectangle control-sequences. + --disable-regex disable regular-expression selections Do not compile-in code to support the "regex" option for multiple @@ -267,6 +270,12 @@ The options (in alphabetic order): Do not compile-in code to support Sun-style function keys. + --disable-tcap-fkeysdisable termcap function-keys + + Compile-in code to support feature which allows xterm to use the + function-key definitions from the termcap/terminfo entry which it used + to set the $TERM variable on startup. + --disable-tek4014 disable tek4014 emulation Do not compile-in code to support Tektronix 4014 emulation. @@ -406,10 +415,6 @@ The options (in alphabetic order): (See --enable-paste64, which fits xterm's protocol better). - --enable-rectangles enable VT420 rectangle support - - Compile-in code to support VT420 rectangle control-sequences. - --enable-sco-fkeys enable support for SCO-style function keys Compile-in code to support SCO-style function keys. @@ -418,12 +423,6 @@ The options (in alphabetic order): Compile-in code to support Sun-style function keys. - --enable-tcap-fkeys enable termcap function-keys - - Compile-in code to support experimental feature which directs xterm - to use the function-key definitions from the termcap/terminfo entry - which it used to set the $TERM variable on startup. - --enable-tcap-query enable termcap query/report Compile-in code to support experimental DCS '+' control sequence, which diff --git a/KOI8RXTerm.ad b/KOI8RXTerm.ad new file mode 100644 index 000..aa21f26 --- /dev/null +++ b/KOI8RXTerm.ad @@ -0,0 +1,20 @@ +! $XTermId: KOI8RXTerm.ad,v 1.2 2007/12/30 15:49:14 tom Exp $ + +! This is based on the UXTerm app-defaults file. + +! Use +! xterm -class KOI8RXTerm +! to set resources for KOI8-R mode with corresponding fonts. + +#include "XTerm-color" + +*fontMenu.Label: KOI8-R Fonts +*VT100*allowC1Printable: true + +! Use Cyrillic instead of Latin fonts. +*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +*VT100.font4: -misc-fixed-me
xterm: Changes to 'upstream-unstable'
MANIFEST |2 +-
fontutils.c|7 +--
minstall.sh|9 -
version.h |5 ++---
xterm.log.html | 14 --
5 files changed, 24 insertions(+), 13 deletions(-)
New commits:
commit dbdf13b65a972064129c00623e5b5adc999c6961
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 01:55:24 2007 +0200
Import xterm 229.
diff --git a/MANIFEST b/MANIFEST
index cc11697..ba5965c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-228, version xterm-228
+MANIFEST for xterm-229, version xterm-229
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/fontutils.c b/fontutils.c
index db8839c..d03dbab 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,8 +1,4 @@
-/* $XTermId: fontutils.c,v 1.249 2007/06/17 12:50:22 tom Exp $ */
-
-/*
- * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey
Exp $
- */
+/* $XTermId: fontutils.c,v 1.251 2007/08/05 00:11:55 tom Exp $ */
/
@@ -850,7 +846,6 @@ xtermLoadFont(XtermWidget xw,
fnts[fWBold] = xtermCloseFont(xw, fnts[fWBold]);
}
if (fnts[fWBold] == 0) {
- free(myfonts.f_wb);
myfonts.f_wb = myfonts.f_w;
fnts[fWBold] = fnts[fWide];
TRACE(("...cannot load wide-bold, use wide %s\n",
NonNull(myfonts.f_w)));
diff --git a/minstall.sh b/minstall.sh
index dd9635e..89e17da 100755
--- a/minstall.sh
+++ b/minstall.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XTermId: minstall.sh,v 1.11 2007/05/24 22:10:42 tom Exp $
+# $XTermId: minstall.sh,v 1.12 2007/08/12 15:29:02 tom Exp $
#
# Install manpages, substituting a reasonable section value since XFree86 4.x
# and derived imakes do not use constants...
@@ -11,6 +11,13 @@
# $4 = app-defaults directory
#
+# override locale...
+LANG=C;export LANG
+LANGUAGE=C;export LANGUAGE
+LC_ALL=C; export LC_ALL
+LC_CTYPE=C;export LC_CTYPE
+
+# get parameters
MINSTALL="$1"
OLD_FILE="$2"
END_FILE="$3"
diff --git a/version.h b/version.h
index 5b35cf6..3a608a0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,4 @@
-/* $XTermId: version.h,v 1.283 2007/07/07 15:29:25 tom Exp $ */
-/* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey
Exp $ */
+/* $XTermId: version.h,v 1.285 2007/08/12 15:37:19 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -7,7 +6,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 228
+#define XTERM_PATCH 229
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index bb3204e..83fd700 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -20,8 +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.log.html,v 1.596 2007/07/22 23:12:38 tom Exp $
- $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38
dickey Exp $
+ $XTermId: xterm.log.html,v 1.600 2007/08/12 17:32:04 tom Exp $
-->
@@ -46,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
+Patch #229 - 2008/8/12
Patch #228 - 2007/7/22
Patch #227 - 2007/6/27
Patch #226 - 2007/6/17
@@ -277,6 +277,16 @@ is the latest version of this file.
Patch #1 - 1996/1/6
+Patch #229 - 2008/8/12
+
+ override locale in minstall.sh;
+ change in patch #226
+ does not work in UTF-8 locale (report by Zdenek Sekera).
+
+ undo an incorrect fix for a memory leak
+ in patch #209 (Debian #435858).
+
+
Patch #228 - 2007/7/22
modify configure script to permit combining
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xterm: Changes to 'upstream-unstable'
MANIFEST |2
Tekproc.c |5
aclocal.m4|6
button.c | 25 -
charclass.c | 108 ++--
charproc.c| 328 -
config.guess | 22
config.sub| 17
configure | 1192 +-
configure.in | 15
cursor.c |9
data.c|6
data.h| 19
input.c | 242 +++---
main.c| 191 +---
main.h| 38 +
menu.c|7
misc.c| 161 +++---
os2main.c | 18
ptyx.h| 25 -
resize.c | 20
screen.c | 254 ++
trace.c | 136 +
util.c| 548 --
version.h |6
vttests/256colors2.pl | 33 +
vttests/88colors2.pl | 35 +
xterm.h | 61 +-
xterm.log.html| 80 +++
xterm.man | 26 +
xtermcfg.hin |4
31 files changed, 2209 insertions(+), 1430 deletions(-)
New commits:
commit dbf47d2b550d25dbf7bb9b0960c162073b2c96d0
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Jul 23 02:48:18 2007 +0200
Import xterm 228.
diff --git a/MANIFEST b/MANIFEST
index b02176e..cc11697 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-227, version xterm-227
+MANIFEST for xterm-228, version xterm-228
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index 8d2a97b..d7dd80e 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.156 2007/05/28 19:08:33 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.157 2007/07/10 19:53:11 tom Exp $ */
/*
* Warning, there be crufty dragons here.
@@ -946,8 +946,7 @@ TekExpose(Widget w,
rcnt = tekRefreshList->count;
Tparsestate = curstate = Talptable;
TRACE(("TekExpose resets data to replay %d bytes\n", rcnt));
- if (resource.wait_for_map)
- first_map_occurred();
+ first_map_occurred();
if (!tekscr->waitrefresh)
TekRefresh(tw);
}
diff --git a/button.c b/button.c
index 9a951c8..2ff5fd6 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.275 2007/06/26 22:57:19 tom Exp $ */
+/* $XTermId: button.c,v 1.277 2007/07/22 20:37:11 tom Exp $ */
/*
* Copyright 1999-2006,2007 by Thomas E. Dickey
@@ -51,7 +51,6 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/xterm/button.c,v 3.88 2006/06/19 00:36:50 dickey Exp
$ */
/*
button.c Handles button events in the terminal emulator.
@@ -2613,22 +2612,23 @@ do_select_regex(TScreen * screen, CELL * startc, CELL *
endc)
}
}
if (best_col >= 0) {
+ int best_nxt = best_col + best_len;
columnToCell(screen, firstRow, best_col, startc);
- columnToCell(screen, firstRow, best_col + best_len,
endc);
+ columnToCell(screen, firstRow, best_nxt, endc);
TRACE(("search::%s\n", search));
TRACE(("indexed:%d..%d -> %d..%d\n",
- best_col, best_col + best_len,
+ best_col, best_nxt,
indexed[best_col],
- indexed[best_col + best_len]));
+ indexed[best_nxt]));
TRACE(("matched:%d:%s\n",
- indexed[best_col + best_len] + 1 -
+ indexed[best_nxt] + 1 -
indexed[best_col],
visibleChars(PAIRED_CHARS((Char *) (search +
indexed[best_col]),
0),
- indexed[best_col + best_len] +
- 1 -
- indexed[best_col])));
+ (unsigned) (indexed[best_nxt] +
+ 1 -
+ indexed[best_col];
}
free(search);
}
@@ -2997,7 +2997,7 @@ SaltTextAway(XtermWidget xw,
*lp = '\0';/* make sure we have end marked */
TRACE(("Salted TEXT:%d:%s\n", lp - line,
- visibleChars(PAIRED_CHARS(line, 0), lp - line)));
+ visibleChars(PAIRED_CHARS(line, 0), (unsi
xterm: Changes to 'upstream-unstable'
256colres.h |2 256colres.pl|9 88colres.h |2 88colres.pl | 10 INSTALL | 31 MANIFEST| 13 Makefile.in | 31 README |4 Tekproc.c | 89 - aclocal.m4 | 19 button.c| 15 cachedGCs.c | 45 charproc.c | 160 ++- configure | 2343 +++- configure.in| 35 data.c |6 data.h |4 fontutils.c | 80 - gen-pc-fkeys.pl | 308 - icons/xterm-color_32x32.xcf |binary icons/xterm-color_32x32.xpm | 46 icons/xterm-color_48x48.xcf |binary icons/xterm-color_48x48.xpm | 61 + icons/xterm_32x32.xcf |binary icons/xterm_32x32.xpm | 95 + icons/xterm_48x48.xcf |binary icons/xterm_48x48.xpm | 53 input.c | 32 keysym2ucs.c| 54 - main.c | 126 +- menu.c |7 minstall.sh | 17 misc.c | 126 +- mkdirs.sh | 19 os2main.c | 100 - ptydata.c |4 ptyx.h | 19 resize.c| 23 resize.man |4 run-tic.sh |6 terminfo| 70 + trace.c |7 unicode/convmap.pl | 63 - unicode/keysym.map | 2110 +++ util.c | 236 ++-- uxterm.desktop | 10 version.h |4 wcwidth.c | 90 + xstrings.c | 29 xstrings.h | 22 xterm.desktop | 10 xterm.h | 37 xterm.log.html | 126 ++ xterm.man | 82 + xtermcfg.hin|3 55 files changed, 4145 insertions(+), 2752 deletions(-) New commits: commit f4b276156792bf4cefdf71406ec0f3935957071a Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jun 17 22:12:37 2007 +0100 Import xterm 226. diff --git a/256colres.h b/256colres.h index a84acd5..4b98391 100644 --- a/256colres.h +++ b/256colres.h @@ -1,7 +1,7 @@ /* * This header file was generated by ./256colres.pl */ -/* $XFree86: xc/programs/xterm/256colres.h,v 1.5 2002/10/05 17:57:11 dickey Exp $ */ +/* $XTermId: 256colres.h,v 1.11 2007/06/12 00:44:23 tom Exp $ */ #ifndef included_256colres_h #define included_256colres_h diff --git a/256colres.pl b/256colres.pl index a6b995e..a943af5 100755 --- a/256colres.pl +++ b/256colres.pl @@ -1,5 +1,6 @@ #! /usr/bin/perl # Author: Thomas E. Dickey +# $XTermId: 256colres.pl,v 1.15 2007/06/08 23:58:37 tom Exp $ # $XFree86: xc/programs/xterm/256colres.pl,v 1.8 2002/10/05 17:57:11 dickey Exp $ # Construct a header file defining default resources for the 256-color model @@ -9,11 +10,17 @@ # reproduction of the standard ANSI colors, but possibly more # pleasing shades +use strict; + +our ( $line1, $line2, $line3 ); +our ( $red, $green, $blue, $gray ); +our ( $level, $code, @steps ); + print
xterm: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
