Attachment 183341 Details for Bug 219800 – fix for the bold/widebold resource bug

[patch] fix for the bold/widebold resource bug

xterm-328d.patch (text/plain), 2.77 KB, created by Thomas E. Dickey on 2017-06-09 00:33:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas E. Dickey

Created: 2017-06-09 00:33:22 UTC

Size: 2.77 KB

patch

obsolete

>Index: charproc.c
>--- xterm-328c+/charproc.c	2017-06-06 23:34:31.000000000 +0000
>+++ xterm-328d/charproc.c	2017-06-08 23:48:53.000000000 +0000
>@@ -1,4 +1,4 @@
>-/* $XTermId: charproc.c,v 1.1482 2017/06/06 23:34:31 tom Exp $ */
>+/* $XTermId: charproc.c,v 1.1483 2017/06/08 23:48:53 tom Exp $ */
> 
> /*
>  * Copyright 1999-2016,2017 by Thomas E. Dickey
>@@ -9244,7 +9244,7 @@
>     TabReset(xw->tabs);
> 
>     if (screen->menu_font_number == fontMenu_default) {
>-	myfont = xtermFontName(DefaultFontN(xw));
>+	myfont = defaultVTFontNames(xw);
>     } else {
> 	myfont = xtermFontName(screen->MenuFontName(screen->menu_font_number));
>     }
>Index: fontutils.c
>--- xterm-328c+/fontutils.c	2017-06-04 20:57:48.000000000 +0000
>+++ xterm-328d/fontutils.c	2017-06-08 23:53:31.000000000 +0000
>@@ -1,4 +1,4 @@
>-/* $XTermId: fontutils.c,v 1.527 2017/06/04 20:57:48 tom Exp $ */
>+/* $XTermId: fontutils.c,v 1.528 2017/06/08 23:53:31 tom Exp $ */
> 
> /*
>  * Copyright 1998-2016,2017 by Thomas E. Dickey
>@@ -794,6 +794,20 @@
>     return &data;
> }
> 
>+const VTFontNames *
>+defaultVTFontNames(XtermWidget xw)
>+{
>+    static VTFontNames data;
>+    memset(&data, 0, sizeof(data));
>+    data.f_n = DefaultFontN(xw);
>+    data.f_b = DefaultFontB(xw);
>+#if OPT_WIDE_CHARS
>+    data.f_w = DefaultFontW(xw);
>+    data.f_wb = DefaultFontWB(xw);
>+#endif
>+    return &data;
>+}
>+
> static void
> cache_menu_font_name(TScreen *screen, int fontnum, int which, const char *name)
> {
>@@ -2083,14 +2097,7 @@
> 			screen->menu_font_sizes[n] = 0;
> 		    }
> 		    if (font_number == fontMenu_default) {
>-			VTFontNames myfonts;
>-			myfonts.f_n = DefaultFontN(xw);
>-			myfonts.f_b = DefaultFontB(xw);
>-#if OPT_WIDE_CHARS
>-			myfonts.f_w = DefaultFontW(xw);
>-			myfonts.f_wb = DefaultFontWB(xw);
>-#endif
>-			SetVTFont(xw, font_number, True, &myfonts);
>+			SetVTFont(xw, font_number, True, defaultVTFontNames(xw));
> 		    } else {
> 			SetVTFont(xw, font_number, True, NULL);
> 		    }
>Index: fontutils.h
>--- xterm-328c+/fontutils.h	2017-05-31 01:08:06.000000000 +0000
>+++ xterm-328d/fontutils.h	2017-06-08 23:52:08.000000000 +0000
>@@ -1,4 +1,4 @@
>-/* $XTermId: fontutils.h,v 1.117 2017/05/31 01:08:06 tom Exp $ */
>+/* $XTermId: fontutils.h,v 1.118 2017/06/08 23:52:08 tom Exp $ */
> 
> /*
>  * Copyright 1998-2016,2017 by Thomas E. Dickey
>@@ -41,6 +41,7 @@
> extern XTermFonts * getDoubleFont (TScreen * /* screen */, int /* which */);
> extern XTermFonts * getItalicFont (TScreen * /* screen */, VTFontEnum /* which */);
> extern XTermFonts * getNormalFont (TScreen * /* screen */, VTFontEnum /* which */);
>+extern const VTFontNames * defaultVTFontNames(XtermWidget /* xw */);
> extern const VTFontNames * xtermFontName (const char */* normal */);
> extern const char * whichFontEnum (VTFontEnum /* value */);
> extern const char * whichFontList (XtermWidget /* xw */, VTFontList * /* value */);

Actions: View | Diff

Attachments on bug 219800: 183269 | 183270 | 183341 | 183511 | 183559 | 183574