X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/dda87a288bfdd67b3572a8f219c66382b1045782..c7edb1cca5c2b3f3642034104dcf49656cd8678e:/settings.c

diff --git a/settings.c b/settings.c
index 790b9334..f633d313 100644
--- a/settings.c
+++ b/settings.c
@@ -309,6 +309,7 @@ void save_open_settings(void *sesskey, int do_host, Config *cfg)
     write_setting_i(sesskey, "ScrollBarFullScreen", cfg->scrollbar_in_fullscreen);
     write_setting_i(sesskey, "ScrollOnKey", cfg->scroll_on_key);
     write_setting_i(sesskey, "ScrollOnDisp", cfg->scroll_on_disp);
+    write_setting_i(sesskey, "EraseToScrollback", cfg->erase_to_scrollback);
     write_setting_i(sesskey, "LockSize", cfg->resize_action);
     write_setting_i(sesskey, "BCE", cfg->bce);
     write_setting_i(sesskey, "BlinkText", cfg->blinktext);
@@ -572,6 +573,7 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "ScrollBarFullScreen", 0, &cfg->scrollbar_in_fullscreen);
     gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);
     gppi(sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp);
+    gppi(sesskey, "EraseToScrollback", 1, &cfg->erase_to_scrollback);
     gppi(sesskey, "LockSize", 0, &cfg->resize_action);
     gppi(sesskey, "BCE", 1, &cfg->bce);
     gppi(sesskey, "BlinkText", 0, &cfg->blinktext);
@@ -622,15 +624,14 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "LoginShell", 1, &cfg->login_shell);
     gppi(sesskey, "ScrollbarOnLeft", 0, &cfg->scrollbar_on_left);
     gppfont(sesskey, "BoldFont", &cfg->boldfont);
+    gppfont(sesskey, "WideFont", &cfg->widefont);
+    gppfont(sesskey, "WideBoldFont", &cfg->wideboldfont);
     gppi(sesskey, "ShadowBoldOffset", 1, &cfg->shadowboldoffset);
 }
 
 void do_defaults(char *session, Config * cfg)
 {
-    if (session)
-	load_settings(session, TRUE, cfg);
-    else
-	load_settings("Default Settings", FALSE, cfg);
+    load_settings(session, (session != NULL && *session), cfg);
 }
 
 static int sessioncmp(const void *av, const void *bv)
@@ -671,7 +672,7 @@ void get_sesslist(struct sesslist *list, int allocate)
 		    int len = strlen(otherbuf) + 1;
 		    if (bufsize < buflen + len) {
 			bufsize = buflen + len + 2048;
-			list->buffer = srealloc(list->buffer, bufsize);
+			list->buffer = sresize(list->buffer, bufsize, char);
 		    }
 		    strcpy(list->buffer + buflen, otherbuf);
 		    buflen += strlen(list->buffer + buflen) + 1;
@@ -679,7 +680,7 @@ void get_sesslist(struct sesslist *list, int allocate)
 	    } while (ret);
 	    enum_settings_finish(handle);
 	}
-	list->buffer = srealloc(list->buffer, buflen + 1);
+	list->buffer = sresize(list->buffer, buflen + 1, char);
 	list->buffer[buflen] = '\0';
 
 	/*
@@ -698,7 +699,7 @@ void get_sesslist(struct sesslist *list, int allocate)
 	    p++;
 	}
 
-	list->sessions = smalloc((list->nsessions + 1) * sizeof(char *));
+	list->sessions = snewn(list->nsessions + 1, char *);
 	list->sessions[0] = "Default Settings";
 	p = list->buffer;
 	i = 1;