X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/acb796a268236409eaf814ac22e329a008632c3a..d6dcf6c6407692f1f138f6151e6b24681e103807:/windlg.c

diff --git a/windlg.c b/windlg.c
index c7530f25..25b84450 100644
--- a/windlg.c
+++ b/windlg.c
@@ -354,9 +354,12 @@ enum { IDCX_ABOUT =
     IDC_ROWSEDIT,
     IDC_COLSSTATIC,
     IDC_COLSEDIT,
-    IDC_LOCKSIZE,
-    IDC_LOCKFONT,
+    IDC_RESIZESTATIC,
+    IDC_RESIZETERM,
+    IDC_RESIZEFONT,
+    IDC_RESIZENONE,
     IDC_SCROLLBAR,
+    IDC_SCROLLBARFULLSCREEN,
     IDC_CLOSEWARN,
     IDC_SAVESTATIC,
     IDC_SAVEEDIT,
@@ -673,8 +676,11 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
 		     cfg.cursor_type == 1 ? IDC_CURUNDER : IDC_CURVERT);
     CheckDlgButton(hwnd, IDC_BLINKCUR, cfg.blink_cur);
     CheckDlgButton(hwnd, IDC_SCROLLBAR, cfg.scrollbar);
-    CheckDlgButton(hwnd, IDC_LOCKSIZE, cfg.locksize);
-    CheckDlgButton(hwnd, IDC_LOCKFONT, cfg.lockfont);
+    CheckDlgButton(hwnd, IDC_SCROLLBARFULLSCREEN, cfg.scrollbar_in_fullscreen);
+    CheckRadioButton(hwnd, IDC_RESIZETERM, IDC_RESIZENONE,
+		     cfg.resize_action == RESIZE_TERM ? IDC_RESIZETERM :
+		     cfg.resize_action == RESIZE_FONT ? IDC_RESIZEFONT :
+		     IDC_RESIZENONE);
     CheckRadioButton(hwnd, IDC_COEALWAYS, IDC_COENORMAL,
 		     cfg.close_on_exit == COE_NORMAL ? IDC_COENORMAL :
 		     cfg.close_on_exit ==
@@ -1036,7 +1042,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
     }
 
     if (panel == windowpanelstart) {
-	/* The Window panel. Accelerators used: [acgo] rmz sdkp w4ylt f */
+	/* The Window panel. Accelerators used: [acgo] rmz sdikp w4ylt f */
 	struct ctlpos cp;
 	ctlposinit(&cp, hwnd, 80, 3, 13);
 	bartitle(&cp, "Options controlling PuTTY's window",
@@ -1045,14 +1051,17 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
 	multiedit(&cp,
 		  "&Rows", IDC_ROWSSTATIC, IDC_ROWSEDIT, 50,
 		  "Colu&mns", IDC_COLSSTATIC, IDC_COLSEDIT, 50, NULL);
-	checkbox(&cp, "Lock terminal size against resi&zing", IDC_LOCKSIZE);
-	checkbox(&cp, "Lock font size against resi&zing", IDC_LOCKFONT);
+	radioline(&cp, "Action when the window is resized:", IDC_RESIZESTATIC,
+		  3, "Resi&ze terminal", IDC_RESIZETERM,
+		  "Change fo&nt", IDC_RESIZEFONT,
+		  "Forb&id resizing", IDC_RESIZENONE, NULL);
 	endbox(&cp);
 	beginbox(&cp, "Control the scrollback in the window",
 		 IDC_BOX_WINDOW2);
 	staticedit(&cp, "Lines of &scrollback",
 		   IDC_SAVESTATIC, IDC_SAVEEDIT, 50);
 	checkbox(&cp, "&Display scrollbar", IDC_SCROLLBAR);
+	checkbox(&cp, "D&isplay scrollbar in full screen mode", IDC_SCROLLBARFULLSCREEN);
 	checkbox(&cp, "Reset scrollback on &keypress", IDC_SCROLLKEY);
 	checkbox(&cp, "Reset scrollback on dis&play activity",
 		 IDC_SCROLLDISP);
@@ -1426,7 +1435,7 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
 	    r.left = 3;
 	    r.right = r.left + 75;
 	    r.top = 13;
-	    r.bottom = r.top + 206;
+	    r.bottom = r.top + 219;
 	    MapDialogRect(hwnd, &r);
 	    treeview = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, "",
 				      WS_CHILD | WS_VISIBLE |
@@ -2108,17 +2117,24 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
 			cfg.scrollbar =
 			IsDlgButtonChecked(hwnd, IDC_SCROLLBAR);
 		break;
-	      case IDC_LOCKSIZE:
+	      case IDC_SCROLLBARFULLSCREEN:
 		if (HIWORD(wParam) == BN_CLICKED ||
 		    HIWORD(wParam) == BN_DOUBLECLICKED)
-			cfg.locksize =
-			IsDlgButtonChecked(hwnd, IDC_LOCKSIZE);
+		    cfg.scrollbar_in_fullscreen =
+		    IsDlgButtonChecked(hwnd, IDC_SCROLLBARFULLSCREEN);
 		break;
-	      case IDC_LOCKFONT:
+	      case IDC_RESIZETERM:
+	      case IDC_RESIZEFONT:
+	      case IDC_RESIZENONE:
 		if (HIWORD(wParam) == BN_CLICKED ||
-		    HIWORD(wParam) == BN_DOUBLECLICKED)
-			cfg.lockfont =
-			IsDlgButtonChecked(hwnd, IDC_LOCKFONT);
+		    HIWORD(wParam) == BN_DOUBLECLICKED) {
+		    cfg.resize_action =
+			IsDlgButtonChecked(hwnd,
+					   IDC_RESIZETERM) ? RESIZE_TERM :
+			IsDlgButtonChecked(hwnd,
+					   IDC_RESIZEFONT) ? RESIZE_FONT :
+			RESIZE_DISABLED;
+		}
 		break;
 	      case IDC_WINEDIT:
 		if (HIWORD(wParam) == EN_CHANGE)
@@ -2377,7 +2393,7 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
 		of.nMaxFile = sizeof(filename);
 		of.lpstrFileTitle = NULL;
 		of.lpstrInitialDir = NULL;
-		of.lpstrTitle = "Select Public Key File";
+		of.lpstrTitle = "Select Private Key File";
 		of.Flags = 0;
 		if (GetOpenFileName(&of)) {
 		    strcpy(cfg.keyfile, filename);