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 <svenjoac@gmx.de>
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
--------------------------------------------------------------------------------
MANIFEST this 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 <dickey@invisible-island.net> 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;
}
}
+ last_out = result;
+ } else {
+ result = last_out;
}
}
#endif
diff --git a/version.h b/version.h
index c2f3c4a..5bc7464 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.387 2014/06/03 00:38:52 tom Exp $ */
+/* $XTermId: version.h,v 1.388 2014/06/03 20:25:02 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 305
-#define XTERM_DATE 2014-06-02
+#define XTERM_PATCH 306
+#define XTERM_DATE 2014-06-03
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index cf34482..5151b5a 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.1478 2014/06/03 00:38:22 tom Exp $
+ $XTermId: xterm.log.html,v 1.1481 2014/06/04 00:28:35 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_306">Patch #306 - 2014/06/03</a></li>
+
<li><a href="#xterm_305">Patch #305 - 2014/06/02</a></li>
<li><a href="#xterm_304">Patch #304 - 2014/05/03</a></li>
@@ -895,6 +897,14 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_306" id="xterm_306">Patch #306 -
+ 2014/06/03</a></h1>
+
+ <ul>
+ <li>fixes for display-errors in new SGR codes (report by Egmont
+ Koblinger).</li>
+ </ul>
+
<h1><a name="xterm_305" id="xterm_305">Patch #305 -
2014/06/02</a></h1>
Reply to: