MANIFEST | 2 +- debian/changelog | 8 ++++++++ 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 ++++++++++++++- 9 files changed, 51 insertions(+), 17 deletions(-)
New commits: commit 5160919812031c0d7e2f17df7d33feb7f3dd7ff1 Author: Sven Joachim <svenj...@gmx.de> Date: Fri Jun 20 17:41:05 2014 +0200 Close bug #752047 diff --git a/debian/changelog b/debian/changelog index 0754c8c..8023f3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xterm (308-1) UNRELEASED; urgency=medium * New upstream release. + - Correct font used for clipping double-width bitmap fonts from + xterm 307 changes to work around mis-scaled fonts (Closes: #752047). -- Sven Joachim <svenj...@gmx.de> Fri, 20 Jun 2014 17:34:15 +0200 commit 3d956a83ce01cc98bf057edf27b56621f466b44e Author: Sven Joachim <svenj...@gmx.de> Date: Fri Jun 20 17:40:39 2014 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 350c0f8..0754c8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xterm (308-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Sven Joachim <svenj...@gmx.de> Fri, 20 Jun 2014 17:34:15 +0200 + xterm (307-1) unstable; urgency=medium * New upstream release. commit 4051c2ae6ba3be9f496adc5fc8b9f06e9e028d88 Author: Sven Joachim <svenj...@gmx.de> 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 -------------------------------------------------------------------------------- MANIFEST this 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 <dic...@invisible-island.net> 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) || (draw_flags & DOUBLEWFONT))) +#endif + need_clipping = fixupItalics(xw, draw_flags, gc, curFont, + y, x, font_width, len); #endif if (draw_flags & NOBACKGROUND) { diff --git a/version.h b/version.h index 26947b0..b02099a 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.390 2014/06/18 00:32:21 tom Exp $ */ +/* $XTermId: version.h,v 1.391 2014/06/19 19:58:13 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 307 -#define XTERM_DATE 2014-06-17 +#define XTERM_PATCH 308 +#define XTERM_DATE 2014-06-19 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff --git a/xterm.log.html b/xterm.log.html index b99c6d1..7e525cb 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.1490 2014/06/18 00:32:46 tom Exp $ + $XTermId: xterm.log.html,v 1.1493 2014/06/20 00:05:20 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -72,6 +72,8 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_308">Patch #308 - 2014/06/19</a></li> + <li><a href="#xterm_307">Patch #307 - 2014/06/17</a></li> <li><a href="#xterm_306">Patch #306 - 2014/06/03</a></li> @@ -899,6 +901,17 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_308" id="xterm_308">Patch #308 - + 2014/06/19</a></h1> + + <ul> + <li>corrected font used for clipping double-width bitmap fonts + from <a href="#xterm_307">patch #307</a> changes to work around + mis-scaled fonts (Debian #752947).</li> + + <li>improve wording of a warning message.</li> + </ul> + <h1><a name="xterm_307" id="xterm_307">Patch #307 - 2014/06/17</a></h1> -- 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/e1wy11i-0006yk...@moszumanska.debian.org