X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b0faa571fcf0bdc556bf5fca5a0f81681d2c1d66..8df7a775f6f8b0f81f84eafe28cd0bb8d4c6d1f4:/settings.c

diff --git a/settings.c b/settings.c
index 181708e3..e762abaf 100644
--- a/settings.c
+++ b/settings.c
@@ -3,13 +3,6 @@
  */
 
 #include <windows.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"
@@ -78,6 +71,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
                              cfg->cipher == CIPHER_DES ? "des" : "3des");
     write_setting_i (sesskey, "AuthTIS", cfg->try_tis_auth);
     write_setting_i (sesskey, "SshProt", cfg->sshprot);
+    write_setting_i (sesskey, "BuggyMAC", cfg->buggymac);
     write_setting_s (sesskey, "PublicKeyFile", cfg->keyfile);
     write_setting_s (sesskey, "RemoteCommand", cfg->remote_cmd);
     write_setting_i (sesskey, "RFCEnviron", cfg->rfc_environ);
@@ -89,6 +83,8 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "NetHackKeypad", cfg->nethack_keypad);
     write_setting_i (sesskey, "AltF4", cfg->alt_f4);
     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, "BlinkCur", cfg->blink_cur);
     write_setting_i (sesskey, "Beep", cfg->beep);
@@ -132,6 +128,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "CapsLockCyr", cfg->xlat_capslockcyr);
     write_setting_i (sesskey, "ScrollBar", cfg->scrollbar);
     write_setting_i (sesskey, "ScrollOnKey", cfg->scroll_on_key);
+    write_setting_i (sesskey, "ScrollOnDisp", cfg->scroll_on_disp);
     write_setting_i (sesskey, "LockSize", cfg->locksize);
     write_setting_i (sesskey, "BCE", cfg->bce);
     write_setting_i (sesskey, "BlinkText", cfg->blinktext);
@@ -198,6 +195,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
 	    cfg->cipher = CIPHER_3DES;
     }
     gppi (sesskey, "SshProt", 1, &cfg->sshprot);
+    gppi (sesskey, "BuggyMAC", 0, &cfg->buggymac);
     gppi (sesskey, "AuthTIS", 0, &cfg->try_tis_auth);
     gpps (sesskey, "PublicKeyFile", "", cfg->keyfile, sizeof(cfg->keyfile));
     gpps (sesskey, "RemoteCommand", "", cfg->remote_cmd,
@@ -211,6 +209,8 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "NetHackKeypad", 0, &cfg->nethack_keypad);
     gppi (sesskey, "AltF4", 1, &cfg->alt_f4);
     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, "BlinkCur", 0, &cfg->blink_cur);
     gppi (sesskey, "Beep", 1, &cfg->beep);
@@ -277,6 +277,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "CapsLockCyr", 0, &cfg->xlat_capslockcyr);
     gppi (sesskey, "ScrollBar", 1, &cfg->scrollbar);
     gppi (sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);
+    gppi (sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp);
     gppi (sesskey, "LockSize", 0, &cfg->locksize);
     gppi (sesskey, "BCE", 0, &cfg->bce);
     gppi (sesskey, "BlinkText", 0, &cfg->blinktext);
@@ -336,19 +337,28 @@ void get_sesslist(int allocate) {
 	buffer = srealloc(buffer, buflen+1);
 	buffer[buflen] = '\0';
 
+	/*
+	 * Now set up the list of sessions. Note that "Default
+	 * Settings" must always be claimed to exist, even if it
+	 * doesn't really.
+	 */
+
 	p = buffer;
-	nsessions = 0;
+	nsessions = 1;		       /* "Default Settings" counts as one */
 	while (*p) {
-            nsessions++;
+            if (strcmp(p, "Default Settings"))
+		nsessions++;
 	    while (*p) p++;
 	    p++;
 	}
 
-	sessions = smalloc(nsessions * sizeof(char *));
+	sessions = smalloc((nsessions+1) * sizeof(char *));
+	sessions[0] = "Default Settings";
 	p = buffer;
-	i = 0;
+	i = 1;
 	while (*p) {
-            sessions[i++] = p;
+            if (strcmp(p, "Default Settings"))
+		sessions[i++] = p;
 	    while (*p) p++;
 	    p++;
 	}