X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/62697e04c392ebc56148c4037b79a00dadc777cb..875e0b16f64f7b97171d58fe34ebcd57314eb739:/config.c

diff --git a/config.c b/config.c
index 841c0e6a..185529cf 100644
--- a/config.c
+++ b/config.c
@@ -328,7 +328,7 @@ static void sessionsaver_handler(union control *ctrl, void *dlg,
 	     * there was a session selected in that which had a
 	     * valid host name in it, then load it and go.
 	     */
-	    if (dlg_last_focused(dlg) == ssd->listbox && !*cfg->host) {
+	    if (dlg_last_focused(ctrl, dlg) == ssd->listbox && !*cfg->host) {
 		Config cfg2;
 		if (!load_selected_session(ssd, savedsession, dlg, &cfg2)) {
 		    dlg_beep(dlg);
@@ -596,6 +596,11 @@ static void portfwd_handler(union control *ctrl, void *dlg,
 		p += strlen(p) + 1;
 	    }
 	    dlg_update_done(ctrl, dlg);
+	} else if (ctrl == pfd->direction) {
+	    /*
+	     * Default is Local.
+	     */
+	    dlg_radiobutton_set(ctrl, dlg, 0);
 	}
     } else if (event == EVENT_ACTION) {
 	if (ctrl == pfd->addbutton) {
@@ -700,6 +705,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
     ssd->okbutton->generic.column = 3;
     ssd->cancelbutton = ctrl_pushbutton(s, "Cancel", 'c', HELPCTX(no_help),
 					sessionsaver_handler, P(ssd));
+    ssd->cancelbutton->button.iscancel = TRUE;
     ssd->cancelbutton->generic.column = 4;
     /* We carefully don't close the 5-column part, so that platform-
      * specific add-ons can put extra buttons alongside Open and Cancel. */
@@ -754,6 +760,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	 * than alongside that edit box. */
 	ctrl_columns(s, 1, 100);
 	ctrl_columns(s, 2, 75, 25);
+	ssd->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
+				    HELPCTX(session_saved),
+				    sessionsaver_handler, P(ssd));
+	ssd->listbox->generic.column = 0;
+	ssd->listbox->listbox.height = 7;
 	ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
 					  HELPCTX(session_saved),
 					  sessionsaver_handler, P(ssd));
@@ -766,11 +777,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 					 HELPCTX(session_saved),
 					 sessionsaver_handler, P(ssd));
 	ssd->delbutton->generic.column = 1;
-	ssd->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
-				    HELPCTX(session_saved),
-				    sessionsaver_handler, P(ssd));
-	ssd->listbox->generic.column = 0;
-	ssd->listbox->listbox.height = 7;
 	ctrl_columns(s, 1, 100);
     }
 
@@ -1308,6 +1314,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 				       HELPCTX(telnet_environ),
 				       environ_handler, P(ed));
 	    ed->listbox->listbox.height = 3;
+	    ed->listbox->listbox.ncols = 2;
+	    ed->listbox->listbox.percentages = smalloc(2*sizeof(int));
+	    ed->listbox->listbox.percentages[0] = 30;
+	    ed->listbox->listbox.percentages[1] = 70;
 	}
 
 	s = ctrl_getset(b, "Connection/Telnet", "protocol",
@@ -1484,6 +1494,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 				    HELPCTX(ssh_tunnels_portfwd),
 				    portfwd_handler, P(pfd));
 	pfd->listbox->listbox.height = 3;
+	pfd->listbox->listbox.ncols = 2;
+	pfd->listbox->listbox.percentages = smalloc(2*sizeof(int));
+	pfd->listbox->listbox.percentages[0] = 20;
+	pfd->listbox->listbox.percentages[1] = 80;
 	ctrl_tabdelay(s, pfd->rembutton);
 	ctrl_text(s, "Add new forwarded port:", HELPCTX(ssh_tunnels_portfwd));
 	/* You want to enter source, destination and type, _then_ hit Add.