If a new session was saved from Change Settings, a side-effect on Windows was

[u/mdw/putty] / mac / macdlg.c

diff --git a/mac/macdlg.c b/mac/macdlg.c
index 28201d9..0a7aeba 100644 (file)
--- a/mac/macdlg.c
+++ b/mac/macdlg.c
@@ -66,7 +66,6 @@ static void mac_config(int midsession)
 {
     Session *s;
     WinInfo *wi;
-    static struct sesslist sesslist;
     Str255 mactitle;
     char *str;
 
@@ -77,18 +76,23 @@ static void mac_config(int midsession)
         memset(s, 0, sizeof(*s));
         do_defaults(NULL, &s->cfg);
         s->hasfile = FALSE;
+       s->session_closed = FALSE;
     }
 
+    /* Copy the configuration somewhere else in case this is a *
+     * reconfiguration and the user cancels the operation      */
+
+    s->temp_cfg = s->cfg;
+
     if (HAVE_COLOR_QD())
        s->settings_window = GetNewCWindow(wSettings, NULL, (WindowPtr)-1);
     else
        s->settings_window = GetNewWindow(wSettings, NULL, (WindowPtr)-1);
 
-    get_sesslist(&sesslist, TRUE);
     s->ctrlbox = ctrl_new_box();
-    setup_config_box(s->ctrlbox, &sesslist, midsession, 0, 0);
+    setup_config_box(s->ctrlbox, midsession, 0, 0);
 
-    s->settings_ctrls.data = &s->cfg;
+    s->settings_ctrls.data = &s->temp_cfg;
     if (midsession)
         s->settings_ctrls.end = &mac_enddlg_reconfig;
     else
@@ -135,6 +139,7 @@ static void mac_enddlg_config(WindowPtr window, int value)
     if (value == 0)
        mac_closedlg(window);
     else {
+        s->cfg = s->temp_cfg;
        mac_startsession(s);
        mac_closedlg(window);
     }
@@ -147,7 +152,49 @@ static void mac_enddlg_reconfig(WindowPtr window, int value)
     if (value == 0)
        mac_closedlg(window);
     else {
+        Config prev_cfg = s->cfg;
+        s->cfg = s->temp_cfg;
        mac_closedlg(window);
+
+       /* Pass new config data to the logging module */
+       log_reconfig(s->logctx, &s->cfg);
+
+       /*
+        * Flush the line discipline's edit buffer in the
+        * case where local editing has just been disabled.
+        */
+       if (s->ldisc)
+           ldisc_send(s->ldisc, NULL, 0, 0);
+
+       /* Change the palette */
+       palette_reset(s);
+
+       /* Reinitialise line codepage */
+       init_ucs(s);
+
+       /* Pass new config data to the terminal */
+       term_reconfig(s->term, &s->cfg);
+
+       /* Pass new config data to the back end */
+       if (s->back)
+            s->back->reconfig(s->backhandle, &s->cfg);
+
+       /* Screen size changed ? */
+       if (s->cfg.height != prev_cfg.height ||
+           s->cfg.width != prev_cfg.width ||
+           s->cfg.savelines != prev_cfg.savelines) {
+           request_resize(s, s->cfg.width, s->cfg.height);
+       }
+
+       /* Set the window title */
+       if (s->cfg.wintitle[0])
+            set_title(s, s->cfg.wintitle);
+
+       /* Scroll bar */
+       if (s->cfg.scrollbar != prev_cfg.scrollbar)
+           request_resize(s, s->cfg.width, s->cfg.height);
+
+       /* TODO: zoom, font */
     }
 }