X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3b2c664e78d68bafd8a921d3b73104df0ae0d292..260f3dec11d702a907fdaf5aaee143abb01d0eb2:/settings.c

diff --git a/settings.c b/settings.c
index 299ee8e0..5cde21c7 100644
--- a/settings.c
+++ b/settings.c
@@ -34,6 +34,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
 	write_setting_i (sesskey, "PortNumber", cfg->port);
 	write_setting_s (sesskey, "LogFileName", cfg->logfilename);
 	write_setting_i (sesskey, "LogType", cfg->logtype);
+	write_setting_i (sesskey, "LogFileClash", cfg->logxfovr);
         p = "raw";
         for (i = 0; backends[i].name != NULL; i++)
             if (backends[i].protocol == cfg->protocol) {
@@ -72,7 +73,6 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "NoPTY", cfg->nopty);
     write_setting_i (sesskey, "Compression", cfg->compression);
     write_setting_i (sesskey, "AgentFwd", cfg->agentfwd);
-    write_setting_s (sesskey, "RemoteCmd", cfg->remote_cmd);
     write_setting_s (sesskey, "Cipher",
                      cfg->cipher == CIPHER_BLOWFISH ? "blowfish" :
                      cfg->cipher == CIPHER_DES ? "des" :
@@ -96,13 +96,20 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "AltSpace", cfg->alt_space);
     write_setting_i (sesskey, "AltOnly", cfg->alt_only);
     write_setting_i (sesskey, "ComposeKey", cfg->compose_key);
+    write_setting_i (sesskey, "CtrlAltKeys", cfg->ctrlaltkeys);
     write_setting_i (sesskey, "LocalEcho", cfg->localecho);
     write_setting_i (sesskey, "LocalEdit", cfg->localedit);
+    write_setting_s (sesskey, "Answerback", cfg->answerback);
     write_setting_i (sesskey, "AlwaysOnTop", cfg->alwaysontop);
     write_setting_i (sesskey, "HideMousePtr", cfg->hide_mouseptr);
     write_setting_i (sesskey, "CurType", cfg->cursor_type);
     write_setting_i (sesskey, "BlinkCur", cfg->blink_cur);
     write_setting_i (sesskey, "Beep", cfg->beep);
+    write_setting_s (sesskey, "BellWaveFile", cfg->bell_wavefile);
+    write_setting_i (sesskey, "BellOverload", cfg->bellovl);
+    write_setting_i (sesskey, "BellOverloadN", cfg->bellovl_n);
+    write_setting_i (sesskey, "BellOverloadT", cfg->bellovl_t);
+    write_setting_i (sesskey, "BellOverloadS", cfg->bellovl_s);
     write_setting_i (sesskey, "ScrollbackLines", cfg->savelines);
     write_setting_i (sesskey, "DECOriginMode", cfg->dec_om);
     write_setting_i (sesskey, "AutoWrapMode", cfg->wrap_mode);
@@ -125,6 +132,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
 		cfg->colours[i][1], cfg->colours[i][2]);
 	write_setting_s (sesskey, buf, buf2);
     }
+    write_setting_i (sesskey, "RawCNP", cfg->rawcnp);
     write_setting_i (sesskey, "MouseIsXterm", cfg->mouse_is_xterm);
     for (i=0; i<256; i+=32) {
 	char buf[20], buf2[256];
@@ -161,12 +169,14 @@ void load_settings (char *section, int do_host, Config *cfg) {
     sesskey = open_settings_r(section);
 
     cfg->ssh_subsys = 0;               /* FIXME: load this properly */
+    cfg->remote_cmd_ptr = cfg->remote_cmd;
 
     gpps (sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
     gppi (sesskey, "PortNumber", default_port, &cfg->port);
     gpps (sesskey, "LogFileName", "putty.log",
 	  cfg->logfilename, sizeof(cfg->logfilename));
     gppi (sesskey, "LogType", 0, &cfg->logtype);
+    gppi (sesskey, "LogFileClash", LGXF_ASK, &cfg->logxfovr);
 
     gpps (sesskey, "Protocol", "default", prot, 10);
     cfg->protocol = default_protocol;
@@ -213,7 +223,6 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "NoPTY", 0, &cfg->nopty);
     gppi (sesskey, "Compression", 0, &cfg->compression);
     gppi (sesskey, "AgentFwd", 0, &cfg->agentfwd);
-    gpps (sesskey, "RemoteCmd", "", cfg->remote_cmd, sizeof(cfg->remote_cmd));
     {
 	char cipher[10];
 	gpps (sesskey, "Cipher", "3des", cipher, 10);
@@ -245,13 +254,21 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "AltSpace", 0, &cfg->alt_space);
     gppi (sesskey, "AltOnly", 0, &cfg->alt_only);
     gppi (sesskey, "ComposeKey", 0, &cfg->compose_key);
+    gppi (sesskey, "CtrlAltKeys", 1, &cfg->ctrlaltkeys);
     gppi (sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho);
     gppi (sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit);
+    gpps (sesskey, "Answerback", "PuTTY", cfg->answerback, sizeof(cfg->answerback));
     gppi (sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop);
     gppi (sesskey, "HideMousePtr", 0, &cfg->hide_mouseptr);
     gppi (sesskey, "CurType", 0, &cfg->cursor_type);
     gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur);
     gppi (sesskey, "Beep", 1, &cfg->beep);
+    gpps (sesskey, "BellWaveFile", "", cfg->bell_wavefile,
+	  sizeof(cfg->bell_wavefile));
+    gppi (sesskey, "BellOverload", 1, &cfg->bellovl);
+    gppi (sesskey, "BellOverloadN", 5, &cfg->bellovl_n);
+    gppi (sesskey, "BellOverloadT", 2, &cfg->bellovl_t);
+    gppi (sesskey, "BellOverloadS", 5, &cfg->bellovl_s);
     gppi (sesskey, "ScrollbackLines", 200, &cfg->savelines);
     gppi (sesskey, "DECOriginMode", 0, &cfg->dec_om);
     gppi (sesskey, "AutoWrapMode", 1, &cfg->wrap_mode);
@@ -297,6 +314,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
 	    cfg->colours[i][2] = c2;
 	}
     }
+    gppi (sesskey, "RawCNP", 0, &cfg->rawcnp);
     gppi (sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm);
     for (i=0; i<256; i+=32) {
 	static char *defaults[] = {