~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jeremy Sawicki's fix for the multiple-conflicting-accelerators
[sgt/putty]
/
settings.c
diff --git
a/settings.c
b/settings.c
index
13c6580
..
0a7f211
100644
(file)
--- a/
settings.c
+++ b/
settings.c
@@
-32,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);
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) {
p = "raw";
for (i = 0; backends[i].name != NULL; i++)
if (backends[i].protocol == cfg->protocol) {
@@
-42,7
+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, "CloseOnExit", !!cfg->close_on_exit);
write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
- write_setting_i (sesskey, "PingInterval", cfg->ping_interval);
+ 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);
{
write_setting_s (sesskey, "TerminalType", cfg->termtype);
write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
{
@@
-65,7
+68,9
@@
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, "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, "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" :
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" :
@@
-89,6
+94,9
@@
void save_settings (char *section, int do_host, Config *cfg) {
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, "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, "HideMousePtr", cfg->hide_mouseptr);
+ 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);
write_setting_i (sesskey, "BlinkCur", cfg->blink_cur);
write_setting_i (sesskey, "Beep", cfg->beep);
write_setting_i (sesskey, "ScrollbackLines", cfg->savelines);
@@
-135,6
+143,8
@@
void save_settings (char *section, int do_host, Config *cfg) {
write_setting_i (sesskey, "LockSize", cfg->locksize);
write_setting_i (sesskey, "BCE", cfg->bce);
write_setting_i (sesskey, "BlinkText", cfg->blinktext);
write_setting_i (sesskey, "LockSize", cfg->locksize);
write_setting_i (sesskey, "BCE", cfg->bce);
write_setting_i (sesskey, "BlinkText", cfg->blinktext);
+ write_setting_i (sesskey, "X11Forward", cfg->x11_forward);
+ write_setting_s (sesskey, "X11Display", cfg->x11_display);
close_settings_w(sesskey);
}
close_settings_w(sesskey);
}
@@
-148,6
+158,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, "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;
gpps (sesskey, "Protocol", "default", prot, 10);
cfg->protocol = default_protocol;
@@
-159,7
+172,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);
gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
- gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
+ {
+ /* 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,
gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
sizeof(cfg->termtype));
gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
@@
-184,7
+203,9
@@
void load_settings (char *section, int do_host, Config *cfg) {
*q = '\0';
}
gpps (sesskey, "UserName", "", cfg->username, sizeof(cfg->username));
*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, "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));
{
gppi (sesskey, "AgentFwd", 0, &cfg->agentfwd);
gpps (sesskey, "RemoteCmd", "", cfg->remote_cmd, sizeof(cfg->remote_cmd));
{
@@
-217,6
+238,9
@@
void load_settings (char *section, int do_host, Config *cfg) {
gppi (sesskey, "AltOnly", 0, &cfg->alt_only);
gppi (sesskey, "ComposeKey", 0, &cfg->compose_key);
gppi (sesskey, "LdiscTerm", 0, &cfg->ldisc_term);
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, "HideMousePtr", 0, &cfg->hide_mouseptr);
+ 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);
gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur);
gppi (sesskey, "Beep", 1, &cfg->beep);
gppi (sesskey, "ScrollbackLines", 200, &cfg->savelines);
@@
-286,6
+310,9
@@
void load_settings (char *section, int do_host, Config *cfg) {
gppi (sesskey, "LockSize", 0, &cfg->locksize);
gppi (sesskey, "BCE", 0, &cfg->bce);
gppi (sesskey, "BlinkText", 0, &cfg->blinktext);
gppi (sesskey, "LockSize", 0, &cfg->locksize);
gppi (sesskey, "BCE", 0, &cfg->bce);
gppi (sesskey, "BlinkText", 0, &cfg->blinktext);
+ gppi (sesskey, "X11Forward", 0, &cfg->x11_forward);
+ gpps (sesskey, "X11Display", "localhost:0", cfg->x11_display,
+ sizeof(cfg->x11_display));
close_settings_r(sesskey);
}
close_settings_r(sesskey);
}