Created a shiny new abstraction for the socket handling. Has many

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index de1fb26..e762aba 100644 (file)
--- 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"
@@ -48,6 +41,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     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);
     write_setting_s (sesskey, "TerminalType", cfg->termtype);
     write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
     {
@@ -77,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);
@@ -88,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);
@@ -127,9 +124,11 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     write_setting_i (sesskey, "KoiWinXlat", cfg->xlat_enablekoiwin);
     write_setting_i (sesskey, "88592Xlat", cfg->xlat_88592w1250);
+    write_setting_i (sesskey, "88592-CP852", cfg->xlat_88592cp852);
     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);
@@ -157,6 +156,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
 
     gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
     gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
+    gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
     gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
          sizeof(cfg->termtype));
     gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
@@ -195,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,
@@ -208,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);
@@ -270,9 +273,11 @@ void load_settings (char *section, int do_host, Config *cfg) {
     }
     gppi (sesskey, "KoiWinXlat", 0, &cfg->xlat_enablekoiwin);
     gppi (sesskey, "88592Xlat", 0, &cfg->xlat_88592w1250);
+    gppi (sesskey, "88592-CP852", 0, &cfg->xlat_88592cp852);
     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);
@@ -332,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++;
        }