X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0a3f1d48f7f8779690073685f057bc5705d61006..22dcdc3b1a1c7c820fabe3ebaae8be6b09b4408e:/settings.c

diff --git a/settings.c b/settings.c
index ad062dd5..559d4813 100644
--- a/settings.c
+++ b/settings.c
@@ -72,7 +72,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,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, "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);
@@ -125,6 +126,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,6 +163,7 @@ 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);
@@ -213,7 +216,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,8 +247,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, "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);
@@ -264,6 +268,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);
@@ -285,6 +301,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[] = {