X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a9422f39e34f55d1925d1ebef35ace1a0f1c2f6a..c91409da0ac0d3fb4a225ab85e14370514e4094e:/settings.c diff --git a/settings.c b/settings.c index 6204227c..67fd748e 100644 --- a/settings.c +++ b/settings.c @@ -4,6 +4,7 @@ #include #include +#include #include "putty.h" #include "storage.h" @@ -31,6 +32,8 @@ void save_settings (char *section, int do_host, Config *cfg) { if (do_host) { write_setting_s (sesskey, "HostName", cfg->host); write_setting_i (sesskey, "PortNumber", cfg->port); + write_setting_s (sesskey, "LogFileName", cfg->logfilename); + write_setting_i (sesskey, "LogType", cfg->logtype); p = "raw"; for (i = 0; backends[i].name != NULL; i++) if (backends[i].protocol == cfg->protocol) { @@ -41,6 +44,8 @@ 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 / 60); /* minutes */ + write_setting_i (sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */ write_setting_s (sesskey, "TerminalType", cfg->termtype); write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed); { @@ -63,25 +68,34 @@ void save_settings (char *section, int do_host, Config *cfg) { write_setting_s (sesskey, "Environment", buf); } write_setting_s (sesskey, "UserName", cfg->username); + write_setting_s (sesskey, "LocalUserName", cfg->localusername); 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_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); write_setting_i (sesskey, "BackspaceIsDelete", cfg->bksp_is_delete); write_setting_i (sesskey, "RXVTHomeEnd", cfg->rxvt_homeend); write_setting_i (sesskey, "LinuxFunctionKeys", cfg->funky_type); + write_setting_i (sesskey, "NoApplicationKeys", cfg->no_applic_k); + write_setting_i (sesskey, "NoApplicationCursors", cfg->no_applic_c); write_setting_i (sesskey, "ApplicationCursorKeys", cfg->app_cursor); write_setting_i (sesskey, "ApplicationKeypad", cfg->app_keypad); 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, "AlwaysOnTop", cfg->alwaysontop); + 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_i (sesskey, "ScrollbackLines", cfg->savelines); @@ -120,9 +134,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); @@ -139,6 +155,9 @@ void load_settings (char *section, int do_host, Config *cfg) { 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); gpps (sesskey, "Protocol", "default", prot, 10); cfg->protocol = default_protocol; @@ -150,6 +169,13 @@ 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); + { + /* This is two values for backward compatibility with 0.50/0.51 */ + int pingmin, pingsec; + gppi (sesskey, "PingInterval", 0, &pingmin); + gppi (sesskey, "PingIntervalSecs", 0, &pingsec); + cfg->ping_interval = pingmin*60 + pingsec; + } gpps (sesskey, "TerminalType", "xterm", cfg->termtype, sizeof(cfg->termtype)); gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed, @@ -174,7 +200,9 @@ void load_settings (char *section, int do_host, Config *cfg) { *q = '\0'; } gpps (sesskey, "UserName", "", cfg->username, sizeof(cfg->username)); + gpps (sesskey, "LocalUserName", "", cfg->localusername, sizeof(cfg->localusername)); 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)); { @@ -188,6 +216,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, @@ -196,12 +225,18 @@ void load_settings (char *section, int do_host, Config *cfg) { gppi (sesskey, "BackspaceIsDelete", 1, &cfg->bksp_is_delete); gppi (sesskey, "RXVTHomeEnd", 0, &cfg->rxvt_homeend); gppi (sesskey, "LinuxFunctionKeys", 0, &cfg->funky_type); + gppi (sesskey, "NoApplicationKeys", 0, &cfg->no_applic_k); + gppi (sesskey, "NoApplicationCursors", 0, &cfg->no_applic_c); gppi (sesskey, "ApplicationCursorKeys", 0, &cfg->app_cursor); gppi (sesskey, "ApplicationKeypad", 0, &cfg->app_keypad); 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, "AlwaysOnTop", 0, &cfg->alwaysontop); + gppi (sesskey, "CurType", 0, &cfg->cursor_type); gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur); gppi (sesskey, "Beep", 1, &cfg->beep); gppi (sesskey, "ScrollbackLines", 200, &cfg->savelines); @@ -263,9 +298,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); @@ -280,6 +317,21 @@ void do_defaults (char *session, Config *cfg) { load_settings ("Default Settings", FALSE, cfg); } +static int sessioncmp(const void *av, const void *bv) { + const char *a = *(const char *const *)av; + const char *b = *(const char *const *)bv; + + /* + * Alphabetical order, except that "Default Settings" is a + * special case and comes first. + */ + if (!strcmp(a, "Default Settings")) + return -1; /* a comes first */ + if (!strcmp(b, "Default Settings")) + return +1; /* b comes first */ + return strcmp(a, b); /* otherwise, compare normally */ +} + void get_sesslist(int allocate) { static char otherbuf[2048]; static char *buffer; @@ -310,25 +362,33 @@ 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 = 1; /* "Default Settings" counts as one */ while (*p) { - if (strcmp(p, "Default Settings")) + 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 = 1; while (*p) { - if (strcmp(p, "Default Settings")) + if (strcmp(p, "Default Settings")) sessions[i++] = p; while (*p) p++; p++; } + + qsort(sessions, i, sizeof(char *), sessioncmp); } else { sfree (buffer); sfree (sessions);