Re: xterm-265

To: Cyril Brulebois <kibi@debian.org>
Cc: Thomas Dickey <dickey@his.com>, debian-x@lists.debian.org
Subject: Re: xterm-265
From: Thomas Dickey <dickey@his.com>
Date: Fri, 22 Oct 2010 21:11:26 -0400
Message-id: <[🔎] 20101023011126.GA1827@invisible-island.net>
Reply-to: dickey@his.com
In-reply-to: <[🔎] 20101022213346.GC9048@debian.org>
References: <[🔎] 20101022105635.GA22053@invisible-island.net> <[🔎] 20101022213346.GC9048@debian.org>

On Fri, Oct 22, 2010 at 11:33:46PM +0200, Cyril Brulebois wrote:
> Thomas Dickey <dickey@his.com> (22/10/2010):
> >                             Patch #265 - 2010/10/22
> > 
> >      * fix  a regression in fontname logic from patch #263 changes (Debian
> >        #600707, reported by Vincent Lefevre).
> >      * revert  modification  of  any-event/any-button  protocol from patch
> >        #263  changes.  It  interferes with selection using a shifted mouse
> >        button (reports by Neil Bird, Bram Moolenaar).
> 
> Hi,
> 
> I now get that at startup (from within a full X session):

Here's a patch which fixes the issues I was able to find with valgrind
after reproducing your report.

-- 
Thomas E. Dickey <dickey@invisible-island.net>
http://invisible-island.net
ftp://invisible-island.net

# ftp://invisible-island.net/xterm/patches/temp/xterm-265a.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Sat Oct 23 01:08:22 UTC 2010
# ------------------------------------------------------------------------------
# MANIFEST       |    2 +-
# charproc.c     |   10 +++++-----
# fontutils.c    |   16 ++++++++--------
# version.h      |    4 ++--
# xterm.log.html |    8 +++++++-
# 5 files changed, 23 insertions(+), 17 deletions(-)
# ------------------------------------------------------------------------------
Index: MANIFEST
--- xterm-265+/MANIFEST	2010-10-22 01:04:23.000000000 +0000
+++ xterm-265a/MANIFEST	2010-10-22 20:48:25.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-265, version xterm-265
+MANIFEST for xterm-266, version xterm-266
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
Index: charproc.c
--- xterm-265+/charproc.c	2010-10-13 23:04:01.000000000 +0000
+++ xterm-265a/charproc.c	2010-10-22 23:04:58.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1086 2010/10/13 23:04:01 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1087 2010/10/22 23:04:58 tom Exp $ */
 
 /*
 
@@ -6383,13 +6383,13 @@
 #define DefaultFontNames TScreenOf(wnew)->menu_font_names[fontMenu_default]
     init_Sres(misc.default_font.f_n);
     init_Sres(misc.default_font.f_b);
-    DefaultFontNames[fNorm] = wnew->misc.default_font.f_n;
-    DefaultFontNames[fBold] = wnew->misc.default_font.f_b;
+    DefaultFontNames[fNorm] = x_strdup(wnew->misc.default_font.f_n);
+    DefaultFontNames[fBold] = x_strdup(wnew->misc.default_font.f_b);
 #if OPT_WIDE_CHARS
     init_Sres(misc.default_font.f_w);
     init_Sres(misc.default_font.f_wb);
-    DefaultFontNames[fWide] = wnew->misc.default_font.f_w;
-    DefaultFontNames[fWBold] = wnew->misc.default_font.f_wb;
+    DefaultFontNames[fWide] = x_strdup(wnew->misc.default_font.f_w);
+    DefaultFontNames[fWBold] = x_strdup(wnew->misc.default_font.f_wb);
 #endif
     TScreenOf(wnew)->MenuFontName(fontMenu_fontescape) = NULL;
     TScreenOf(wnew)->MenuFontName(fontMenu_fontsel) = NULL;
Index: fontutils.c
--- xterm-265+/fontutils.c	2010-10-22 09:02:10.000000000 +0000
+++ xterm-265a/fontutils.c	2010-10-23 00:27:22.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.351 2010/10/22 09:02:10 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.353 2010/10/23 00:27:22 tom Exp $ */
 
 /************************************************************
 
@@ -911,7 +911,7 @@
     TRACE(("xtermLoadFont #%d "name" %s%s\n", \
     	   fontnum, \
 	   (warn[index] == fwResource) ? "*" : " ", \
-	   NonNull(myfonts.field)));
+	   NonNull(myfonts.field)))
     DbgResource("normal", f_n, fNorm);
     DbgResource("bold  ", f_b, fBold);
 #if OPT_WIDE_CHARS
@@ -1249,7 +1249,7 @@
 	TRACE(("COPY_MENU_FONTS " #src " to " #dst "\n")); \
 	for (n = fontMenu_default; n <= fontMenu_lastBuiltin; ++n) { \
 	    for (m = 0; m < fMAX; ++m) { \
-		dst.menu_font_names[n][m] = src.menu_font_names[n][m]; \
+		dst.menu_font_names[n][m] = x_strdup(src.menu_font_names[n][m]); \
 	    } \
 	}
 
@@ -1329,11 +1329,11 @@
 	     */
 	    xw->misc.default_font = subresourceRec.default_font;
 	    COPY_MENU_FONTS(subresourceRec, xw->screen);
-	    screen->MenuFontName(fontMenu_default) = xw->misc.default_font.f_n;
-	    screen->menu_font_names[0][fBold] = xw->misc.default_font.f_b;
+	    screen->MenuFontName(fontMenu_default) = x_strdup(xw->misc.default_font.f_n);
+	    screen->menu_font_names[0][fBold] = x_strdup(xw->misc.default_font.f_b);
 #if OPT_WIDE_CHARS
-	    screen->menu_font_names[0][fWide] = xw->misc.default_font.f_w;
-	    screen->menu_font_names[0][fWBold] = xw->misc.default_font.f_wb;
+	    screen->menu_font_names[0][fWide] = x_strdup(xw->misc.default_font.f_w);
+	    screen->menu_font_names[0][fWBold] = x_strdup(xw->misc.default_font.f_wb);
 #endif
 	} else {
 	    TRACE(("...no resources found\n"));
@@ -3019,7 +3019,7 @@
 
 #define USE_CACHED(field, name) \
 	    if (myfonts.field == 0) { \
-		myfonts.field = screen->menu_font_names[which][name]; \
+		myfonts.field = x_strdup(screen->menu_font_names[which][name]); \
 		TRACE(("set myfonts." #field " from menu_font_names[%d][" #name "] %s\n", \
 		       which, NonNull(myfonts.field))); \
 	    } else { \
Index: version.h
--- xterm-265+/version.h	2010-10-22 00:54:53.000000000 +0000
+++ xterm-265a/version.h	2010-10-22 20:47:32.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $XTermId: version.h,v 1.323 2010/10/22 00:54:53 tom Exp $
+ * $XTermId: version.h,v 1.324 2010/10/22 20:47:32 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   265
+#define XTERM_PATCH   266
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: xterm.log.html
--- xterm-265+/xterm.log.html	2010-10-22 09:54:49.000000000 +0000
+++ xterm-265a/xterm.log.html	2010-10-22 23:24:37.000000000 +0000
@@ -31,7 +31,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.980 2010/10/22 09:54:49 tom Exp $
+  $XTermId: xterm.log.html,v 1.982 2010/10/22 23:24:37 tom Exp $
   -->
 <HTML>
 <HEAD>
@@ -56,6 +56,7 @@
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_dev">Development</A>
 <LI><A HREF="#xterm_265">Patch #265 - 2010/10/22</A>
 <LI><A HREF="#xterm_264">Patch #264 - 2010/10/14</A>
 <LI><A HREF="#xterm_263">Patch #263 - 2010/10/13</A>
@@ -324,6 +325,11 @@
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_dev">Development</A></H1>
+<ul>
+	<li>more fixes for Debian #600707 (report by  Cyril Brulebois).
+</ul>
+
 <H1><A NAME="xterm_265">Patch #265 - 2010/10/22</A></H1>
 <ul>
 	<li>fix a regression in fontname logic from

Attachment: signature.asc
Description: Digital signature

Reply to:

Follow-Ups:
- Re: xterm-265
  - From: Cyril Brulebois <kibi@debian.org>

References:
- xterm-265
  - From: Thomas Dickey <dickey@his.com>
- Re: xterm-265
  - From: Cyril Brulebois <kibi@debian.org>

Prev by Date: Bug#600829: one display goes out-of-range in dual-monitor setup
Next by Date: Bug#600977: marked as done (in debian squeeze xephyr keybindings are totally broken)
Previous by thread: Re: xterm-265
Next by thread: Re: xterm-265
Index(es):
- Date
- Thread