nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-18 03:28:07 -05:00
Code Issues Projects Releases Wiki Activity

Make the new ^< and ^> keystrokes add the class prefix.

Browse Source 
The new font name configured by the keystrokes was missing its
"client:" or "server:" prefix, which could have led to the selection
of the wrong font in rare situations.
This commit is contained in:
Simon Tatham 2016-11-16 22:02:54 +00:00
parent 1a51771720
commit 5c390fceab
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unix/gtkfont.c
View File

@ -1259,8 +1259,13 @@ static char *x11font_size_increment(unifont *font, int increment)
#undef FLIPPED_SIZE #undef FLIPPED_SIZE
if (xlfd_best) if (xlfd_best) {
returned_name = xlfd_recompose(xlfd_best); char *bare_returned_name = xlfd_recompose(xlfd_best);
returned_name = dupcat(
xfont->u.vt->prefix, ":", bare_returned_name,
(const char *)NULL);
sfree(bare_returned_name);
}
XFreeFontNames(fontnames); XFreeFontNames(fontnames);
sfree(xlfd); sfree(xlfd);
@ -2015,7 +2020,8 @@ static char *pangofont_size_increment(unifont *font, int increment)
} else { } else {
pango_font_description_set_size(desc, size); pango_font_description_set_size(desc, size);
newname = pango_font_description_to_string(desc); newname = pango_font_description_to_string(desc);
retname = dupstr(newname); retname = dupcat(pfont->u.vt->prefix, ":",
newname, (const char *)NULL);
g_free(newname); g_free(newname);
} }