X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/102b17eb3753c35dcd743c3813f26468fd4e5b6c..df1a3e2cbd2b434ba2f0d2a77ae23de2804d2ceb:/settings.c diff --git a/settings.c b/settings.c index e9053975..28b44c05 100644 --- a/settings.c +++ b/settings.c @@ -309,6 +309,11 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_i(sesskey, "BugDeriveKey2", cfg->sshbug_derivekey2); write_setting_i(sesskey, "BugRSAPad2", cfg->sshbug_rsapad2); write_setting_i(sesskey, "BugDHGEx2", cfg->sshbug_dhgex2); + write_setting_i(sesskey, "StampUtmp", cfg->stamp_utmp); + write_setting_i(sesskey, "LoginShell", cfg->login_shell); + write_setting_i(sesskey, "ScrollbarOnLeft", cfg->scrollbar_on_left); + write_setting_s(sesskey, "BoldFont", cfg->boldfont); + write_setting_i(sesskey, "ShadowBoldOffset", cfg->shadowboldoffset); close_settings_w(sesskey); } @@ -344,7 +349,23 @@ void load_settings(char *section, int do_host, Config * cfg) break; } - gppi(sesskey, "CloseOnExit", COE_NORMAL, &cfg->close_on_exit); + /* + * CloseOnExit defaults to closing only on a clean exit - but + * unfortunately not on Unix (pterm). On Unix, the exit code of + * a shell is the last exit code of one of its child processes, + * even if it's an interactive shell - so some pterms will + * close and some will not for no particularly good reason. The + * mode is still useful for specialist purposes (running a + * single command in its own pterm), but I don't think it's a + * sane default, unfortunately. + */ + gppi(sesskey, "CloseOnExit", +#ifdef _WINDOWS + COE_NORMAL, +#else + COE_ALWAYS, +#endif + &cfg->close_on_exit); gppi(sesskey, "WarnOnClose", 1, &cfg->warn_on_close); { /* This is two values for backward compatibility with 0.50/0.51 */ @@ -362,7 +383,7 @@ void load_settings(char *section, int do_host, Config * cfg) /* proxy settings */ gpps(sesskey, "ProxyExcludeList", "", cfg->proxy_exclude_list, sizeof(cfg->proxy_exclude_list)); - gppi(sesskey, "ProxyType", PROXY_NONE, &cfg->proxy_type); + gppi(sesskey, "ProxyType", PROXY_NONE, &i); cfg->proxy_type = i; gpps(sesskey, "ProxyHost", "proxy", cfg->proxy_host, sizeof(cfg->proxy_host)); gppi(sesskey, "ProxyPort", 80, &cfg->proxy_port); @@ -451,8 +472,8 @@ void load_settings(char *section, int do_host, Config * cfg) sizeof(cfg->bell_wavefile)); gppi(sesskey, "BellOverload", 1, &cfg->bellovl); gppi(sesskey, "BellOverloadN", 5, &cfg->bellovl_n); - gppi(sesskey, "BellOverloadT", 2000, &cfg->bellovl_t); - gppi(sesskey, "BellOverloadS", 5000, &cfg->bellovl_s); + gppi(sesskey, "BellOverloadT", 2*TICKSPERSEC, &cfg->bellovl_t); + gppi(sesskey, "BellOverloadS", 5*TICKSPERSEC, &cfg->bellovl_s); gppi(sesskey, "ScrollbackLines", 200, &cfg->savelines); gppi(sesskey, "DECOriginMode", 0, &cfg->dec_om); gppi(sesskey, "AutoWrapMode", 1, &cfg->wrap_mode); @@ -463,6 +484,8 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "TermHeight", 24, &cfg->height); #ifdef _WINDOWS gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font)); +#elif defined(macintosh) + gpps(sesskey, "Font", "Monaco", cfg->font, sizeof(cfg->font)); #else gpps(sesskey, "Font", "fixed", cfg->font, sizeof(cfg->font)); #endif @@ -470,7 +493,11 @@ void load_settings(char *section, int do_host, Config * cfg) #ifdef _WINDOWS gppi(sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset); #endif +#ifdef macintosh + gppi(sesskey, "FontHeight", 9, &cfg->fontheight); +#else gppi(sesskey, "FontHeight", 10, &cfg->fontheight); +#endif #ifdef _WINDOWS if (cfg->fontheight < 0) { int oldh, newh; @@ -506,7 +533,16 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->colours[i][2] = c2; } } +#ifndef _WINDOWS + /* Non-raw cut and paste of line-drawing chars works badly on the + * current Unix stub implementation of the Unicode functions. + * So I'm going to temporarily set the default to raw mode so + * that the failure mode isn't quite so drastically horrid. + * When Unicode comes in, this can all be put right. */ + gppi(sesskey, "RawCNP", 1, &cfg->rawcnp); +#else gppi(sesskey, "RawCNP", 0, &cfg->rawcnp); +#endif gppi(sesskey, "PasteRTF", 0, &cfg->rtf_paste); gppi(sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm); gppi(sesskey, "RectSelect", 0, &cfg->rect_select); @@ -548,7 +584,7 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "ScrollBarFullScreen", 0, &cfg->scrollbar_in_fullscreen); gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key); gppi(sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp); - gppi(sesskey, "LockSize", 0, &cfg->resize_action); + gppi(sesskey, "LockSize", 0, &i); cfg->resize_action = i; gppi(sesskey, "BCE", 1, &cfg->bce); gppi(sesskey, "BlinkText", 0, &cfg->blinktext); gppi(sesskey, "X11Forward", 0, &cfg->x11_forward); @@ -577,21 +613,26 @@ void load_settings(char *section, int do_host, Config * cfg) } *q = '\0'; } - gppi(sesskey, "BugIgnore1", BUG_AUTO, &cfg->sshbug_ignore1); - gppi(sesskey, "BugPlainPW1", BUG_AUTO, &cfg->sshbug_plainpw1); - gppi(sesskey, "BugRSA1", BUG_AUTO, &cfg->sshbug_rsa1); + gppi(sesskey, "BugIgnore1", BUG_AUTO, &i); cfg->sshbug_ignore1 = i; + gppi(sesskey, "BugPlainPW1", BUG_AUTO, &i); cfg->sshbug_plainpw1 = i; + gppi(sesskey, "BugRSA1", BUG_AUTO, &i); cfg->sshbug_rsa1 = i; { int i; - gppi(sesskey, "BugHMAC2", BUG_AUTO, &cfg->sshbug_hmac2); + gppi(sesskey, "BugHMAC2", BUG_AUTO, &i); cfg->sshbug_hmac2 = i; if (cfg->sshbug_hmac2 == BUG_AUTO) { gppi(sesskey, "BuggyMAC", 0, &i); if (i == 1) cfg->sshbug_hmac2 = BUG_ON; } } - gppi(sesskey, "BugDeriveKey2", BUG_AUTO, &cfg->sshbug_derivekey2); - gppi(sesskey, "BugRSAPad2", BUG_AUTO, &cfg->sshbug_rsapad2); - gppi(sesskey, "BugDHGEx2", BUG_AUTO, &cfg->sshbug_dhgex2); + gppi(sesskey, "BugDeriveKey2", BUG_AUTO, &i); cfg->sshbug_derivekey2 = i; + gppi(sesskey, "BugRSAPad2", BUG_AUTO, &i); cfg->sshbug_rsapad2 = i; + gppi(sesskey, "BugDHGEx2", BUG_AUTO, &i); cfg->sshbug_dhgex2 = i; + gppi(sesskey, "StampUtmp", 1, &cfg->stamp_utmp); + gppi(sesskey, "LoginShell", 1, &cfg->login_shell); + gppi(sesskey, "ScrollbarOnLeft", 0, &cfg->scrollbar_on_left); + gpps(sesskey, "BoldFont", "", cfg->boldfont, sizeof(cfg->boldfont)); + gppi(sesskey, "ShadowBoldOffset", 1, &cfg->shadowboldoffset); close_settings_r(sesskey); } @@ -624,10 +665,9 @@ static int sessioncmp(const void *av, const void *bv) return strcmp(a, b); /* otherwise, compare normally */ } -void get_sesslist(int allocate) +void get_sesslist(struct sesslist *list, int allocate) { - static char otherbuf[2048]; - static char *buffer; + char otherbuf[2048]; int buflen, bufsize, i; char *p, *ret; void *handle; @@ -635,24 +675,24 @@ void get_sesslist(int allocate) if (allocate) { buflen = bufsize = 0; - buffer = NULL; - if ((handle = enum_settings_start())) { + list->buffer = NULL; + if ((handle = enum_settings_start()) != NULL) { do { ret = enum_settings_next(handle, otherbuf, sizeof(otherbuf)); if (ret) { int len = strlen(otherbuf) + 1; if (bufsize < buflen + len) { bufsize = buflen + len + 2048; - buffer = srealloc(buffer, bufsize); + list->buffer = srealloc(list->buffer, bufsize); } - strcpy(buffer + buflen, otherbuf); - buflen += strlen(buffer + buflen) + 1; + strcpy(list->buffer + buflen, otherbuf); + buflen += strlen(list->buffer + buflen) + 1; } } while (ret); enum_settings_finish(handle); } - buffer = srealloc(buffer, buflen + 1); - buffer[buflen] = '\0'; + list->buffer = srealloc(list->buffer, buflen + 1); + list->buffer[buflen] = '\0'; /* * Now set up the list of sessions. Note that "Default @@ -660,31 +700,31 @@ void get_sesslist(int allocate) * doesn't really. */ - p = buffer; - nsessions = 1; /* "Default Settings" counts as one */ + p = list->buffer; + list->nsessions = 1; /* "Default Settings" counts as one */ while (*p) { if (strcmp(p, "Default Settings")) - nsessions++; + list->nsessions++; while (*p) p++; p++; } - sessions = smalloc((nsessions + 1) * sizeof(char *)); - sessions[0] = "Default Settings"; - p = buffer; + list->sessions = smalloc((list->nsessions + 1) * sizeof(char *)); + list->sessions[0] = "Default Settings"; + p = list->buffer; i = 1; while (*p) { if (strcmp(p, "Default Settings")) - sessions[i++] = p; + list->sessions[i++] = p; while (*p) p++; p++; } - qsort(sessions, i, sizeof(char *), sessioncmp); + qsort(list->sessions, i, sizeof(char *), sessioncmp); } else { - sfree(buffer); - sfree(sessions); + sfree(list->buffer); + sfree(list->sessions); } }