nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Config box: move legacy protocols to below SSH.

Browse Source 
The contribution of SUPDUP has pushed SSH off the first page in my
default GTK font settings. It probably won't do that the same way for
everyone, but it did make me realise that the [Telnet, Rlogin, SSH]
order was a relic of 1997 when the SSH backend was new and added at
the bottom of the list. These days, SSH ought to be at the top for
easy access!

(And Serial ought to be next, but since it's added in a separate file,
that involves a bit more faffing about which I haven't done yet.)
This commit is contained in:
Simon Tatham 2020-03-10 07:06:44 +00:00
parent 103a778148
commit ade10f1304
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
config.c
View File

@ -2315,90 +2315,6 @@ void setup_config_box(struct controlbox *b, bool midsession,
"Only until session starts", I(AUTO), NULL);
}
/*
* The Telnet panel exists in the base config box, and in a
* mid-session reconfig box _if_ we're using Telnet.
*/
if (!midsession || protocol == PROT_TELNET) {
/*
* The Connection/Telnet panel.
*/
ctrl_settitle(b, "Connection/Telnet",
"Options controlling Telnet connections");
s = ctrl_getset(b, "Connection/Telnet", "protocol",
"Telnet protocol adjustments");
if (!midsession) {
ctrl_radiobuttons(s, "Handling of OLD_ENVIRON ambiguity:",
NO_SHORTCUT, 2,
HELPCTX(telnet_oldenviron),
conf_radiobutton_bool_handler,
I(CONF_rfc_environ),
"BSD (commonplace)", 'b', I(false),
"RFC 1408 (unusual)", 'f', I(true), NULL);
ctrl_radiobuttons(s, "Telnet negotiation mode:", 't', 2,
HELPCTX(telnet_passive),
conf_radiobutton_bool_handler,
I(CONF_passive_telnet),
"Passive", I(true), "Active", I(false), NULL);
}
ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
HELPCTX(telnet_specialkeys),
conf_checkbox_handler,
I(CONF_telnet_keyboard));
ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
'm', HELPCTX(telnet_newline),
conf_checkbox_handler,
I(CONF_telnet_newline));
}
if (!midsession) {
/*
* The Connection/Rlogin panel.
*/
ctrl_settitle(b, "Connection/Rlogin",
"Options controlling Rlogin connections");
s = ctrl_getset(b, "Connection/Rlogin", "data",
"Data to send to the server");
ctrl_editbox(s, "Local username:", 'l', 50,
HELPCTX(rlogin_localuser),
conf_editbox_handler, I(CONF_localusername), I(1));
/*
* The Protocol/SUPDUP panel.
*/
ctrl_settitle(b, "Connection/SUPDUP",
"Enabling and disabling SUPDUP user options");
s = ctrl_getset(b, "Connection/SUPDUP", "main", NULL);
ctrl_editbox(s, "Location string", 'l', 70,
HELPCTX(supdup_location),
conf_editbox_handler, I(CONF_supdup_location),
I(1));
ctrl_radiobuttons(s, "Extended ASCII Character set:", 'z', 4,
HELPCTX(supdup_ascii),
conf_radiobutton_handler,
I(CONF_supdup_ascii_set),
"None", I(SUPDUP_CHARSET_ASCII),
"ITS", I(SUPDUP_CHARSET_ITS),
"WAITS", I(SUPDUP_CHARSET_WAITS), NULL);
ctrl_checkbox(s, "**MORE** processing", 'm',
HELPCTX(supdup_more),
conf_checkbox_handler,
I(CONF_supdup_more));
ctrl_checkbox(s, "Terminal scrolling", 's',
HELPCTX(supdup_scroll),
conf_checkbox_handler,
I(CONF_supdup_scroll));
}
/*
* All the SSH stuff is omitted in PuTTYtel, or in a reconfig
* when we're not doing SSH.
@ -2911,4 +2827,88 @@ void setup_config_box(struct controlbox *b, bool midsession,
sshbug_handler, I(CONF_sshbug_rsa1));
}
}
/*
* The Telnet panel exists in the base config box, and in a
* mid-session reconfig box _if_ we're using Telnet.
*/
if (!midsession || protocol == PROT_TELNET) {
/*
* The Connection/Telnet panel.
*/
ctrl_settitle(b, "Connection/Telnet",
"Options controlling Telnet connections");
s = ctrl_getset(b, "Connection/Telnet", "protocol",
"Telnet protocol adjustments");
if (!midsession) {
ctrl_radiobuttons(s, "Handling of OLD_ENVIRON ambiguity:",
NO_SHORTCUT, 2,
HELPCTX(telnet_oldenviron),
conf_radiobutton_bool_handler,
I(CONF_rfc_environ),
"BSD (commonplace)", 'b', I(false),
"RFC 1408 (unusual)", 'f', I(true), NULL);
ctrl_radiobuttons(s, "Telnet negotiation mode:", 't', 2,
HELPCTX(telnet_passive),
conf_radiobutton_bool_handler,
I(CONF_passive_telnet),
"Passive", I(true), "Active", I(false), NULL);
}
ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
HELPCTX(telnet_specialkeys),
conf_checkbox_handler,
I(CONF_telnet_keyboard));
ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
'm', HELPCTX(telnet_newline),
conf_checkbox_handler,
I(CONF_telnet_newline));
}
if (!midsession) {
/*
* The Connection/Rlogin panel.
*/
ctrl_settitle(b, "Connection/Rlogin",
"Options controlling Rlogin connections");
s = ctrl_getset(b, "Connection/Rlogin", "data",
"Data to send to the server");
ctrl_editbox(s, "Local username:", 'l', 50,
HELPCTX(rlogin_localuser),
conf_editbox_handler, I(CONF_localusername), I(1));
/*
* The Protocol/SUPDUP panel.
*/
ctrl_settitle(b, "Connection/SUPDUP",
"Enabling and disabling SUPDUP user options");
s = ctrl_getset(b, "Connection/SUPDUP", "main", NULL);
ctrl_editbox(s, "Location string", 'l', 70,
HELPCTX(supdup_location),
conf_editbox_handler, I(CONF_supdup_location),
I(1));
ctrl_radiobuttons(s, "Extended ASCII Character set:", 'z', 4,
HELPCTX(supdup_ascii),
conf_radiobutton_handler,
I(CONF_supdup_ascii_set),
"None", I(SUPDUP_CHARSET_ASCII),
"ITS", I(SUPDUP_CHARSET_ITS),
"WAITS", I(SUPDUP_CHARSET_WAITS), NULL);
ctrl_checkbox(s, "**MORE** processing", 'm',
HELPCTX(supdup_more),
conf_checkbox_handler,
I(CONF_supdup_more));
ctrl_checkbox(s, "Terminal scrolling", 's',
HELPCTX(supdup_scroll),
conf_checkbox_handler,
I(CONF_supdup_scroll));
}
}