X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/9c964e8579f6597d1bfdacd6dcf8d531bfece511..9275ca8aed9b69e7b62eab751342833eb637ff1d:/settings.c

diff --git a/settings.c b/settings.c
index eba645cf..a5050501 100644
--- a/settings.c
+++ b/settings.c
@@ -42,7 +42,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
             }
         write_setting_s (sesskey, "Protocol", p);
     }
-    write_setting_i (sesskey, "CloseOnExit", !!cfg->close_on_exit);
+    write_setting_i (sesskey, "CloseOnExit", cfg->close_on_exit);
     write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
     write_setting_i (sesskey, "PingInterval", cfg->ping_interval / 60);     /* minutes */
     write_setting_i (sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */
@@ -72,9 +72,11 @@ 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" : "3des");
+    write_setting_s (sesskey, "Cipher",
+                     cfg->cipher == CIPHER_BLOWFISH ? "blowfish" :
+                     cfg->cipher == CIPHER_DES ? "des" :
+                     cfg->cipher == CIPHER_AES ? "aes" :
+                     "3des");
     write_setting_i (sesskey, "AuthTIS", cfg->try_tis_auth);
     write_setting_i (sesskey, "SshProt", cfg->sshprot);
     write_setting_i (sesskey, "BuggyMAC", cfg->buggymac);
@@ -93,8 +95,10 @@ 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, "LdiscTerm", cfg->ldisc_term);
+    write_setting_i (sesskey, "LocalEcho", cfg->localecho);
+    write_setting_i (sesskey, "LocalEdit", cfg->localedit);
     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);
@@ -155,6 +159,9 @@ 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",
@@ -169,7 +176,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
             break;
         }
 
-    gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
+    gppi (sesskey, "CloseOnExit", COE_NORMAL, &cfg->close_on_exit);
     gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
     {
       /* This is two values for backward compatibility with 0.50/0.51 */
@@ -206,7 +213,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);
@@ -214,6 +220,8 @@ void load_settings (char *section, int do_host, Config *cfg) {
 	    cfg->cipher = CIPHER_BLOWFISH;
 	else if (!strcmp(cipher, "des"))
 	    cfg->cipher = CIPHER_DES;
+	else if (!strcmp(cipher, "aes"))
+	    cfg->cipher = CIPHER_AES;
 	else
 	    cfg->cipher = CIPHER_3DES;
     }
@@ -236,8 +244,10 @@ 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, "LdiscTerm", 0, &cfg->ldisc_term);
+    gppi (sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho);
+    gppi (sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit);
     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);
@@ -253,6 +263,18 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "FontIsBold", 0, &cfg->fontisbold);
     gppi (sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset);
     gppi (sesskey, "FontHeight", 10, &cfg->fontheight);
+    if (cfg->fontheight < 0) {
+        int oldh, newh;
+        HDC hdc = GetDC(NULL);
+        int logpix = GetDeviceCaps(hdc, LOGPIXELSY);
+        ReleaseDC(NULL, hdc);
+
+        oldh = -cfg->fontheight;
+        newh = MulDiv(oldh, 72, logpix) + 1;
+        if (MulDiv(newh, logpix, 72) > oldh)
+            newh--;
+        cfg->fontheight = newh;
+    }
     gppi (sesskey, "FontVTMode", VT_OEMANSI, (int *)&cfg->vtmode);
     gppi (sesskey, "TryPalette", 0, &cfg->try_palette);
     gppi (sesskey, "BoldAsColour", 1, &cfg->bold_colour);