Bump version number prior to tagging 0.61 release.

[u/mdw/putty] / windows / wincfg.c

diff --git a/windows/wincfg.c b/windows/wincfg.c
index ff5739b..1cf56c8 100644 (file)
--- a/windows/wincfg.c
+++ b/windows/wincfg.c
@@ -30,8 +30,18 @@ static void help_handler(union control *ctrl, void *dlg,
     }
 }
 
+static void variable_pitch_handler(union control *ctrl, void *dlg,
+                                   void *data, int event)
+{
+    if (event == EVENT_REFRESH) {
+       dlg_checkbox_set(ctrl, dlg, !dlg_get_fixed_pitch_flag(dlg));
+    } else if (event == EVENT_VALCHANGE) {
+       dlg_set_fixed_pitch_flag(dlg, !dlg_checkbox_get(ctrl, dlg));
+    }
+}
+
 void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
-                         int midsession)
+                         int midsession, int protocol)
 {
     struct controlset *s;
     union control *c;
@@ -177,6 +187,8 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
      */
     s = ctrl_getset(b, "Window/Appearance", "font",
                    "Font settings");
+    ctrl_checkbox(s, "Allow selection of variable-pitch fonts", NO_SHORTCUT,
+                  HELPCTX(appearance_font), variable_pitch_handler, I(0));
     ctrl_radiobuttons(s, "Font quality:", 'q', 2,
                      HELPCTX(appearance_font),
                      dlg_stdradiobutton_handler,
@@ -375,5 +387,18 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
     /*
      * Serial back end is available on Windows.
      */
-    ser_setup_config_box(b, midsession);
+    if (!midsession || (protocol == PROT_SERIAL))
+        ser_setup_config_box(b, midsession, 0x1F, 0x0F);
+
+    /*
+     * $XAUTHORITY is not reliable on Windows, so we provide a
+     * means to override it.
+     */
+    if (!midsession && backend_from_proto(PROT_SSH)) {
+       s = ctrl_getset(b, "Connection/SSH/X11", "x11", "X11 forwarding");
+       ctrl_filesel(s, "X authority file for local display", 't',
+                    NULL, FALSE, "Select X authority file",
+                    HELPCTX(ssh_tunnels_xauthority),
+                    dlg_stdfilesel_handler, I(offsetof(Config, xauthfile)));
+    }
 }