From 1e4519976164bd5e379db92611a9e2e29e09ec79 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 26 Dec 2024 11:40:38 +0000 Subject: [PATCH 1/5] Treat SOS and PM terminal escape sequences like APC This is a cherry-pick of Stefan Tauner's patch from main, but without my followup refactoring, since the refactoring seemed to me to have a (small but easily avoidable) chance of introducing a bug in 0.83. The only downside of the original patch is that it contains a variable name telling a lie: 'osc_is_apc' should really read 'this isn't an OSC but one of APC, SOS and PM'. But we don't actually treat those three things differently, so the functionality is fine. (cherry picked from commit b6b95f23e563211437e51322edc9118b63a3ca40) --- terminal/terminal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/terminal/terminal.c b/terminal/terminal.c index 2db81c9a..ad309436 100644 --- a/terminal/terminal.c +++ b/terminal/terminal.c @@ -4127,9 +4127,11 @@ static void term_out(Terminal *term, bool called_from_term_data) term->esc_args[0] = 0; term->esc_nargs = 1; break; + case 'X': /* SOS: Start of String */ + case '^': /* PM: privacy message */ case '_': /* APC: application program command */ - /* APC sequences are just a string, terminated by - * ST or (I've observed in practice) ^G. That is, + /* SOS, PM, and APC sequences are just a string, terminated by + * ST or (I've observed in practice for APC) ^G. That is, * they have the same termination convention as * OSC. So we handle them by going straight into * OSC_STRING state and setting a flag indicating From 457eb6127f1849bee503ae7edf67ed6cafc3b2ac Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Tue, 7 Jan 2025 21:04:43 +0000 Subject: [PATCH 2/5] It's a new year. (cherry picked from commit e3272f19e0f3340e854c8aaaf0351a901de0e7be) --- LICENCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENCE b/LICENCE index fda9c062..09155657 100644 --- a/LICENCE +++ b/LICENCE @@ -1,4 +1,4 @@ -PuTTY is copyright 1997-2024 Simon Tatham. +PuTTY is copyright 1997-2025 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, From f58ddf26fe4edbd5793815cbc43f5b91f7a11e69 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Tue, 7 Jan 2025 21:04:54 +0000 Subject: [PATCH 3/5] Windows: fix leak of a Filename. Introduced in f8e1a2b3a9. (cherry picked from commit 6ec424059cf3a140ea5f128cb858cd566551aa96) --- windows/controls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/controls.c b/windows/controls.c index e1fcc589..b6f559c5 100644 --- a/windows/controls.c +++ b/windows/controls.c @@ -2014,6 +2014,7 @@ bool winctrl_handle_command(struct dlgparam *dp, UINT msg, ctrl->handler(ctrl, dp, dp->data, EVENT_ACTION); c->data = NULL; } + filename_free(fn); } } break; From 293be04298e91b0b0a86230df60e72346da9987f Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 13 Jan 2025 20:47:01 +0000 Subject: [PATCH 4/5] GTK: cherry-pick font defaults and fallbacks from main. This is a combined cherry-pick of three consecutive commits from main: b088d77d580b8f7 GTK: hard-code some last-ditch fallback fonts. 7f4cccde2ae53c0 GTK: fixes to the previous font fallback patch. 6155365076c47a8 GTK: switch the default to client-side fonts. The combined effect is that now PuTTY's built-in default font is client-side rather than server-side (advantaging Wayland and disadvantaging legacy GTK1 builds, which seems like a sensible tradeoff these days), and also, if the configured main font can't be found, we'll try falling back to either the client- or server-side default (whichever is available) before giving up completely and whinging on standard error. --- unix/platform.h | 22 ++++++++++++----- unix/window.c | 65 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 65 insertions(+), 22 deletions(-) diff --git a/unix/platform.h b/unix/platform.h index 670febd7..fb3629ee 100644 --- a/unix/platform.h +++ b/unix/platform.h @@ -394,13 +394,23 @@ void setup_fd_socket(Socket *s, int infd, int outfd, int inerrfd); void fd_socket_set_psb_prefix(Socket *s, const char *prefix); /* - * Default font setting, which can vary depending on NOT_X_WINDOWS. + * Default font settings. We have a default font for each of + * client-side and server-side, so that we can use one of each as a + * fallback, and we also have a single overall default which goes into + * Conf to populate the initial state of Default Settings. + * + * In the past, this default varied with NOT_X_WINDOWS. But these days + * non-X11 environments like Wayland with only client-side fonts are + * common, and even an X11-capable _build_ of PuTTY is quite likely to + * find out at run time that X11 and its bitmap fonts aren't + * available. Also, a fixed-size bitmap font doesn't play nicely with + * high-DPI displays. And the GTK1 build of PuTTY, which can _only_ + * handle server-side fonts, is legacy. So the default font is + * unconditionally the client-side one. */ -#ifdef NOT_X_WINDOWS -#define DEFAULT_GTK_FONT "client:Monospace 12" -#else -#define DEFAULT_GTK_FONT "server:fixed" -#endif +#define DEFAULT_GTK_CLIENT_FONT "client:Monospace 12" +#define DEFAULT_GTK_SERVER_FONT "server:fixed" +#define DEFAULT_GTK_FONT DEFAULT_GTK_CLIENT_FONT /* * pty.c. diff --git a/unix/window.c b/unix/window.c index 97977c3c..7302dc2c 100644 --- a/unix/window.c +++ b/unix/window.c @@ -4368,22 +4368,22 @@ static bool gtk_seat_get_windowid(Seat *seat, long *id) } #endif -char *setup_fonts_ucs(GtkFrontend *inst) +char *setup_fonts_ucs(GtkFrontend *inst, Conf *conf) { - bool shadowbold = conf_get_bool(inst->conf, CONF_shadowbold); - int shadowboldoffset = conf_get_int(inst->conf, CONF_shadowboldoffset); + bool shadowbold = conf_get_bool(conf, CONF_shadowbold); + int shadowboldoffset = conf_get_int(conf, CONF_shadowboldoffset); FontSpec *fs; unifont *fonts[4]; int i; - fs = conf_get_fontspec(inst->conf, CONF_font); + fs = conf_get_fontspec(conf, CONF_font); fonts[0] = multifont_create(inst->area, fs->name, false, false, shadowboldoffset, shadowbold); if (!fonts[0]) { return dupprintf("unable to load font \"%s\"", fs->name); } - fs = conf_get_fontspec(inst->conf, CONF_boldfont); + fs = conf_get_fontspec(conf, CONF_boldfont); if (shadowbold || !fs->name[0]) { fonts[1] = NULL; } else { @@ -4396,7 +4396,7 @@ char *setup_fonts_ucs(GtkFrontend *inst) } } - fs = conf_get_fontspec(inst->conf, CONF_widefont); + fs = conf_get_fontspec(conf, CONF_widefont); if (fs->name[0]) { fonts[2] = multifont_create(inst->area, fs->name, true, false, shadowboldoffset, shadowbold); @@ -4410,7 +4410,7 @@ char *setup_fonts_ucs(GtkFrontend *inst) fonts[2] = NULL; } - fs = conf_get_fontspec(inst->conf, CONF_wideboldfont); + fs = conf_get_fontspec(conf, CONF_wideboldfont); if (shadowbold || !fs->name[0]) { fonts[3] = NULL; } else { @@ -4861,7 +4861,7 @@ static void after_change_settings_dialog(void *vctx, int retval) conf_get_bool(newconf, CONF_shadowbold) || conf_get_int(oldconf, CONF_shadowboldoffset) != conf_get_int(newconf, CONF_shadowboldoffset)) { - char *errmsg = setup_fonts_ucs(inst); + char *errmsg = setup_fonts_ucs(inst, inst->conf); if (errmsg) { char *msgboxtext = dupprintf("Could not change fonts in terminal window: %s\n", @@ -4950,7 +4950,7 @@ static void change_font_size(GtkFrontend *inst, int increment) } } - errmsg = setup_fonts_ucs(inst); + errmsg = setup_fonts_ucs(inst, inst->conf); if (errmsg) goto cleanup; @@ -5350,15 +5350,48 @@ void new_session_window(Conf *conf, const char *geometry_string) inst->area = gtk_drawing_area_new(); gtk_widget_set_name(GTK_WIDGET(inst->area), "drawing-area"); + /* + * Try to create the fonts for use in the window. If this fails, + * we'll try again with some fallback settings, and only abort + * completely if we can't find any fonts at all. + */ { - char *errmsg = setup_fonts_ucs(inst); - if (errmsg) { - window_setup_error(errmsg); - sfree(errmsg); - gtk_widget_destroy(inst->area); - sfree(inst); - return; + char *errmsg_main = setup_fonts_ucs(inst, inst->conf); + if (!errmsg_main) + goto fonts_ok; + + static const char *const fallbacks[] = { + DEFAULT_GTK_CLIENT_FONT, + DEFAULT_GTK_SERVER_FONT, + }; + for (size_t i = 0; i < lenof(fallbacks); i++) { + Conf *fallback_conf = conf_new(); + do_defaults(NULL, fallback_conf); + + FontSpec *fs = fontspec_new(fallbacks[i]); + conf_set_fontspec(fallback_conf, CONF_font, fs); + fontspec_free(fs); + + char *errmsg_fallback = setup_fonts_ucs(inst, fallback_conf); + conf_free(fallback_conf); + + if (!errmsg_fallback) { + fprintf(stderr, "%s; falling back to default font '%s'\n", + errmsg_main, fallbacks[i]); + sfree(errmsg_main); + goto fonts_ok; + } + + sfree(errmsg_fallback); } + + window_setup_error(errmsg_main); + sfree(errmsg_main); + gtk_widget_destroy(inst->area); + sfree(inst); + return; + + fonts_ok:; } #if GTK_CHECK_VERSION(2,0,0) From e7acb9f6968d48217a4210dd91b742e82f80bc72 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 13 Jan 2025 20:43:22 +0000 Subject: [PATCH 5/5] GetDlgItemTextW_alloc: use the right memchr. When retrieving Unicode text from an edit box in the GUI configurer, we were using plain memchr() to look for a terminating NUL. But of course you have to use wmemchr() to look for a UTF-16 NUL, or else memchr() will generate a false positive on the UTF-16 version of (at least) any ASCII character! (I also have to provide a fallback implementation of wmemchr for the w32old builds, which don't have it in the libc they build against. It's as simple as possible, and we use the libc version where possible.) --- cmake/cmake.h.in | 1 + cmake/platforms/windows.cmake | 1 + defs.h | 5 +++++ windows/CMakeLists.txt | 3 +++ windows/utils/getdlgitemtext_alloc.c | 4 +++- windows/utils/wmemchr.c | 15 +++++++++++++++ 6 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 windows/utils/wmemchr.c diff --git a/cmake/cmake.h.in b/cmake/cmake.h.in index 3d36b3d0..cb389cb6 100644 --- a/cmake/cmake.h.in +++ b/cmake/cmake.h.in @@ -15,6 +15,7 @@ #cmakedefine01 HAVE_GETNAMEDPIPECLIENTPROCESSID #cmakedefine01 HAVE_SETDEFAULTDLLDIRECTORIES #cmakedefine01 HAVE_STRTOUMAX +#cmakedefine01 HAVE_WMEMCHR #cmakedefine01 HAVE_DWMAPI_H #cmakedefine NOT_X_WINDOWS diff --git a/cmake/platforms/windows.cmake b/cmake/platforms/windows.cmake index 481809ec..e87f3380 100644 --- a/cmake/platforms/windows.cmake +++ b/cmake/platforms/windows.cmake @@ -53,6 +53,7 @@ define_negation(NO_HTMLHELP HAVE_HTMLHELP_H) check_include_files("winsock2.h;afunix.h" HAVE_AFUNIX_H) check_symbol_exists(strtoumax "inttypes.h" HAVE_STRTOUMAX) +check_symbol_exists(wmemchr "wchar.h" HAVE_WMEMCHR) check_symbol_exists(AddDllDirectory "windows.h" HAVE_ADDDLLDIRECTORY) check_symbol_exists(SetDefaultDllDirectories "windows.h" HAVE_SETDEFAULTDLLDIRECTORIES) diff --git a/defs.h b/defs.h index 0ac23ee2..0e56eb78 100644 --- a/defs.h +++ b/defs.h @@ -53,6 +53,11 @@ uintmax_t strtoumax(const char *nptr, char **endptr, int base); #define SIZEu "zu" #endif +#if !HAVE_WMEMCHR +/* Work around lack of wmemchr in older MSVC */ +wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n); +#endif + #if defined __GNUC__ || defined __clang__ /* * On MinGW, the correct compiler format checking for vsnprintf() etc diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 960a440d..7d4fcadb 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -42,6 +42,9 @@ add_sources_from_current_dir(utils if(NOT HAVE_STRTOUMAX) add_sources_from_current_dir(utils utils/strtoumax.c) endif() +if(NOT HAVE_WMEMCHR) + add_sources_from_current_dir(utils utils/wmemchr.c) +endif() add_sources_from_current_dir(eventloop cliloop.c handle-wait.c) add_sources_from_current_dir(console diff --git a/windows/utils/getdlgitemtext_alloc.c b/windows/utils/getdlgitemtext_alloc.c index 8db32901..8de62a3b 100644 --- a/windows/utils/getdlgitemtext_alloc.c +++ b/windows/utils/getdlgitemtext_alloc.c @@ -4,6 +4,8 @@ * string is dynamically allocated; caller must free. */ +#include + #include "putty.h" char *GetDlgItemText_alloc(HWND hwnd, int id) @@ -27,7 +29,7 @@ wchar_t *GetDlgItemTextW_alloc(HWND hwnd, int id) do { sgrowarray_nm(ret, size, size); GetDlgItemTextW(hwnd, id, ret, size); - } while (!memchr(ret, '\0', size-1)); + } while (!wmemchr(ret, L'\0', size-1)); return ret; } diff --git a/windows/utils/wmemchr.c b/windows/utils/wmemchr.c new file mode 100644 index 00000000..7ccdfe3c --- /dev/null +++ b/windows/utils/wmemchr.c @@ -0,0 +1,15 @@ +/* + * Work around lack of wmemchr in older MSVC libraries. + */ + +#include + +#include "defs.h" + +wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) +{ + for (; n != 0; s++, n--) + if (*s == c) + return (wchar_t *)s; + return NULL; +}