X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ca20bfcf9f32391ac683100cd3f1bfeb48083236..a9c0245444b7b67e077826089b026d46297fab64:/settings.c diff --git a/settings.c b/settings.c index 53e89591..b81b7c93 100644 --- a/settings.c +++ b/settings.c @@ -14,10 +14,10 @@ struct keyval { char *s; int v; }; static const struct keyval ciphernames[] = { - { "WARN", CIPHER_WARN }, - { "3des", CIPHER_3DES }, - { "blowfish", CIPHER_BLOWFISH }, { "aes", CIPHER_AES }, + { "blowfish", CIPHER_BLOWFISH }, + { "3des", CIPHER_3DES }, + { "WARN", CIPHER_WARN }, { "des", CIPHER_DES } }; @@ -81,7 +81,7 @@ static void gprefs(void *sesskey, char *name, char *def, } while (n < nvals); /* Add any missing values (backward compatibility ect). */ { - int i, j; + int i; for (i = 0; i < nvals; i++) { if (!(seen & 1<nopty); write_setting_i(sesskey, "Compression", cfg->compression); write_setting_i(sesskey, "AgentFwd", cfg->agentfwd); - wprefs(sesskey, "SSHCipherList", ciphernames, CIPHER_MAX, + wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, cfg->ssh_cipherlist); write_setting_i(sesskey, "AuthTIS", cfg->try_tis_auth); write_setting_i(sesskey, "SshProt", cfg->sshprot); @@ -198,8 +198,10 @@ void save_settings(char *section, int do_host, Config * cfg) 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, "FullScreenOnAltEnter", cfg->fullscreenonaltenter); write_setting_i(sesskey, "HideMousePtr", cfg->hide_mouseptr); write_setting_i(sesskey, "SunkenEdge", cfg->sunken_edge); + write_setting_i(sesskey, "WindowBorder", cfg->window_border); write_setting_i(sesskey, "CurType", cfg->cursor_type); write_setting_i(sesskey, "BlinkCur", cfg->blink_cur); write_setting_i(sesskey, "Beep", cfg->beep); @@ -233,6 +235,7 @@ void save_settings(char *section, int do_host, Config * cfg) } write_setting_i(sesskey, "RawCNP", cfg->rawcnp); write_setting_i(sesskey, "MouseIsXterm", cfg->mouse_is_xterm); + write_setting_i(sesskey, "MouseOverride", cfg->mouse_override); for (i = 0; i < 256; i += 32) { char buf[20], buf2[256]; int j; @@ -245,10 +248,12 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_s(sesskey, buf, buf2); } write_setting_s(sesskey, "LineCodePage", cfg->line_codepage); + 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, "LockFont", cfg->lockfont); write_setting_i(sesskey, "BCE", cfg->bce); write_setting_i(sesskey, "BlinkText", cfg->blinktext); write_setting_i(sesskey, "X11Forward", cfg->x11_forward); @@ -287,9 +292,9 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->ssh_subsys = 0; /* FIXME: load this properly */ cfg->remote_cmd_ptr = cfg->remote_cmd; + cfg->remote_cmd_ptr2 = NULL; 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); @@ -297,9 +302,11 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "Protocol", "default", prot, 10); cfg->protocol = default_protocol; + cfg->port = default_port; for (i = 0; backends[i].name != NULL; i++) if (!strcmp(prot, backends[i].name)) { cfg->protocol = backends[i].protocol; + gppi(sesskey, "PortNumber", default_port, &cfg->port); break; } @@ -342,19 +349,8 @@ 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); - { - /* Backwards compatibility: recreate old cipher policy. */ - char defcipherlist[80]; - gpps(sesskey, "Cipher", "3des", defcipherlist, 80); - if (strcmp(defcipherlist, "3des") != 0) { - int l = strlen(defcipherlist); - strncpy(defcipherlist + l, ",3des", 80 - l); - defcipherlist[79] = '\0'; - } - /* Use it as default if no new-style policy. */ - gprefs(sesskey, "SSHCipherList", defcipherlist, - ciphernames, CIPHER_MAX, cfg->ssh_cipherlist); - } + gprefs(sesskey, "Cipher", "\0", + ciphernames, CIPHER_MAX, cfg->ssh_cipherlist); gppi(sesskey, "SshProt", 1, &cfg->sshprot); gppi(sesskey, "BuggyMAC", 0, &cfg->buggymac); gppi(sesskey, "AuthTIS", 0, &cfg->try_tis_auth); @@ -382,8 +378,10 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "Answerback", "PuTTY", cfg->answerback, sizeof(cfg->answerback)); gppi(sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop); + gppi(sesskey, "FullScreenOnAltEnter", 0, &cfg->fullscreenonaltenter); gppi(sesskey, "HideMousePtr", 0, &cfg->hide_mouseptr); gppi(sesskey, "SunkenEdge", 0, &cfg->sunken_edge); + gppi(sesskey, "WindowBorder", 1, &cfg->window_border); gppi(sesskey, "CurType", 0, &cfg->cursor_type); gppi(sesskey, "BlinkCur", 0, &cfg->blink_cur); /* pedantic compiler tells me I can't use &cfg->beep as an int * :-) */ @@ -403,7 +401,7 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "WinTitle", "", cfg->wintitle, sizeof(cfg->wintitle)); gppi(sesskey, "TermWidth", 80, &cfg->width); gppi(sesskey, "TermHeight", 24, &cfg->height); - gpps(sesskey, "Font", "Courier", cfg->font, sizeof(cfg->font)); + gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font)); gppi(sesskey, "FontIsBold", 0, &cfg->fontisbold); gppi(sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset); gppi(sesskey, "FontHeight", 10, &cfg->fontheight); @@ -419,7 +417,7 @@ void load_settings(char *section, int do_host, Config * cfg) newh--; cfg->fontheight = newh; } - gppi(sesskey, "FontVTMode", VT_OEMANSI, (int *) &cfg->vtmode); + gppi(sesskey, "FontVTMode", VT_UNICODE, (int *) &cfg->vtmode); gppi(sesskey, "TryPalette", 0, &cfg->try_palette); gppi(sesskey, "BoldAsColour", 1, &cfg->bold_colour); for (i = 0; i < 22; i++) { @@ -442,6 +440,7 @@ void load_settings(char *section, int do_host, Config * cfg) } gppi(sesskey, "RawCNP", 0, &cfg->rawcnp); gppi(sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm); + gppi(sesskey, "MouseOverride", 1, &cfg->mouse_override); for (i = 0; i < 256; i += 32) { static char *defaults[] = { "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", @@ -467,12 +466,18 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->wordness[j] = atoi(q); } } - gpps(sesskey, "LineCodePage", "ISO-8859-1:1987", cfg->line_codepage, + /* + * The empty default for LineCodePage will be converted later + * into a plausible default for the locale. + */ + gpps(sesskey, "LineCodePage", "", cfg->line_codepage, sizeof(cfg->line_codepage)); + 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, "LockFont", cfg->locksize, &cfg->lockfont); gppi(sesskey, "BCE", 0, &cfg->bce); gppi(sesskey, "BlinkText", 0, &cfg->blinktext); gppi(sesskey, "X11Forward", 0, &cfg->x11_forward);