X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/00381fc7bed1aaf2008172c0f4b9e5a53e465bc7..6c13524378a7fa7571c0585a37efc8c635a82dab:/config.c

diff --git a/config.c b/config.c
index 25c6f474..146fb58b 100644
--- a/config.c
+++ b/config.c
@@ -358,6 +358,7 @@ static void sessionsaver_handler(union control *ctrl, void *dlg,
 		/* If at this point we have a valid session, go! */
 		if (*cfg2.host) {
 		    *cfg = cfg2;       /* structure copy */
+		    cfg->remote_cmd_ptr = cfg->remote_cmd; /* nasty */
 		    dlg_end(dlg, 1);
 		} else
 		    dlg_beep(dlg);
@@ -1036,6 +1037,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
     ctrl_checkbox(s, "Disable remote-controlled character set configuration",
 		  'r', HELPCTX(features_charset), dlg_stdcheckbox_handler,
 		  I(offsetof(Config,no_remote_charset)));
+    ctrl_checkbox(s, "Disable Arabic text shaping",
+		  'l', HELPCTX(features_arabicshaping), dlg_stdcheckbox_handler,
+		  I(offsetof(Config, arabicshaping)));
+    ctrl_checkbox(s, "Disable bidirectional text display",
+		  'd', HELPCTX(features_bidi), dlg_stdcheckbox_handler,
+		  I(offsetof(Config, bidi)));
 
     /*
      * The Window panel.
@@ -1261,6 +1268,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			 HELPCTX(connection_termtype),
 			 dlg_stdeditbox_handler, I(offsetof(Config,termtype)),
 			 I(sizeof(((Config *)0)->termtype)));
+	    ctrl_editbox(s, "Terminal speeds", 's', 50,
+			 HELPCTX(connection_termspeed),
+			 dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
+			 I(sizeof(((Config *)0)->termspeed)));
 	    ctrl_editbox(s, "Auto-login username", 'u', 50,
 			 HELPCTX(connection_username),
 			 dlg_stdeditbox_handler, I(offsetof(Config,username)),
@@ -1281,6 +1292,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			  'n', HELPCTX(connection_nodelay),
 			  dlg_stdcheckbox_handler,
 			  I(offsetof(Config,tcp_nodelay)));
+	    ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
+			  'p', HELPCTX(connection_tcpkeepalive),
+			  dlg_stdcheckbox_handler,
+			  I(offsetof(Config,tcp_keepalives)));
 	}
 
     }
@@ -1365,10 +1380,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	if (!midsession) {
 	    s = ctrl_getset(b, "Connection/Telnet", "data",
 			    "Data to send to the server");
-	    ctrl_editbox(s, "Terminal-speed string", 's', 50,
-			 HELPCTX(telnet_termspeed),
-			 dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
-			 I(sizeof(((Config *)0)->termspeed)));
 	    ctrl_text(s, "Environment variables:", HELPCTX(telnet_environ));
 	    ctrl_columns(s, 2, 80, 20);
 	    ed = (struct environ_data *)
@@ -1417,12 +1428,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			      I(offsetof(Config, passive_telnet)),
 			      "Passive", I(1), "Active", I(0), NULL);
 	}
-	ctrl_checkbox(s, "Keyboard sends telnet Backspace and Interrupt", 'k',
+	ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
 		      HELPCTX(telnet_specialkeys),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,telnet_keyboard)));
-	ctrl_checkbox(s, "Return key sends telnet New Line instead of ^M",
-		      NO_SHORTCUT, HELPCTX(telnet_newline),
+	ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
+		      'm', HELPCTX(telnet_newline),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,telnet_newline)));
     }
@@ -1437,10 +1448,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 
 	s = ctrl_getset(b, "Connection/Rlogin", "data",
 			"Data to send to the server");
-	ctrl_editbox(s, "Terminal-speed string", 's', 50,
-		     HELPCTX(rlogin_termspeed),
-		     dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
-		     I(sizeof(((Config *)0)->termspeed)));
 	ctrl_editbox(s, "Local username:", 'l', 50,
 		     HELPCTX(rlogin_localuser),
 		     dlg_stdeditbox_handler, I(offsetof(Config,localusername)),