X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0a4aa9846f76ae9aeb34ea1a33862890b1797a75..676c055670214ebd4ef78460f1f9d9f63e1e8ce8:/window.c

diff --git a/window.c b/window.c
index 4adb682b..8c82af9a 100644
--- a/window.c
+++ b/window.c
@@ -7,31 +7,32 @@
 #define PUTTY_DO_GLOBALS		       /* actually _define_ globals */
 #include "putty.h"
 #include "win_res.h"
-
-#define IDM_SHOWLOG   501
-#define IDM_NEWSESS   502
-#define IDM_DUPSESS   503
-#define IDM_RECONF    504
-#define IDM_CLRSB     505
-#define IDM_RESET     506
-#define IDM_TEL_AYT   507
-#define IDM_TEL_BRK   508
-#define IDM_TEL_SYNCH 509
-#define IDM_TEL_EC    510
-#define IDM_TEL_EL    511
-#define IDM_TEL_GA    512
-#define IDM_TEL_NOP   513
-#define IDM_TEL_ABORT 514
-#define IDM_TEL_AO    515
-#define IDM_TEL_IP    516
-#define IDM_TEL_SUSP  517
-#define IDM_TEL_EOR   518
-#define IDM_TEL_EOF   519
-#define IDM_ABOUT     520
-#define IDM_SAVEDSESS 521
-
-#define IDM_SAVED_MIN 4096
-#define IDM_SAVED_MAX 8192
+#include "sizetip.h"
+
+#define IDM_SHOWLOG   0x0010
+#define IDM_NEWSESS   0x0020
+#define IDM_DUPSESS   0x0030
+#define IDM_RECONF    0x0040
+#define IDM_CLRSB     0x0050
+#define IDM_RESET     0x0060
+#define IDM_TEL_AYT   0x0070
+#define IDM_TEL_BRK   0x0080
+#define IDM_TEL_SYNCH 0x0090
+#define IDM_TEL_EC    0x00a0
+#define IDM_TEL_EL    0x00b0
+#define IDM_TEL_GA    0x00c0
+#define IDM_TEL_NOP   0x00d0
+#define IDM_TEL_ABORT 0x00e0
+#define IDM_TEL_AO    0x00f0
+#define IDM_TEL_IP    0x0100
+#define IDM_TEL_SUSP  0x0110
+#define IDM_TEL_EOR   0x0120
+#define IDM_TEL_EOF   0x0130
+#define IDM_ABOUT     0x0140
+#define IDM_SAVEDSESS 0x0150
+
+#define IDM_SAVED_MIN 0x1000
+#define IDM_SAVED_MAX 0x2000
 
 #define WM_IGNORE_SIZE (WM_USER + 2)
 #define WM_IGNORE_CLIP (WM_USER + 3)
@@ -82,6 +83,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     MSG msg;
     int guess_width, guess_height;
 
+    putty_inst = inst;
+
     winsock_ver = MAKEWORD(1, 1);
     if (WSAStartup(winsock_ver, &wsadata)) {
 	MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
@@ -178,7 +181,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	}
     }
 
-    back = (cfg.protocol == PROT_SSH ? &ssh_backend : &telnet_backend);
+    back = (cfg.protocol == PROT_SSH ? &ssh_backend : 
+			cfg.protocol == PROT_TELNET ? &telnet_backend : &raw_backend );
 
     if (!prev) {
 	wndclass.style         = 0;
@@ -615,17 +619,18 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
       case WM_DESTROY:
 	PostQuitMessage (0);
 	return 0;
-    case WM_SYSCOMMAND:
-	switch (wParam) {
+      case WM_SYSCOMMAND:
+	switch (wParam & ~0xF) {       /* low 4 bits reserved to Windows */
 	  case IDM_SHOWLOG:
 	    shownegot(hwnd);
 	    break;
 	  case IDM_NEWSESS:
 	  case IDM_DUPSESS:
-	case IDM_SAVEDSESS:
+	  case IDM_SAVEDSESS:
 	    {
 		char b[2048];
 		char c[30], *cl;
+		int freecl = FALSE;
 		STARTUPINFO si;
 		PROCESS_INFORMATION pi;
 		HANDLE filemap = NULL;
@@ -659,10 +664,14 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 		    sprintf(c, "putty &%08x", filemap);
 		    cl = c;
 		} else if (wParam == IDM_SAVEDSESS) {
-		  sprintf(c, "putty @%s", sessions[(lParam - IDM_SAVED_MIN) / 16]);
-		  cl = c;
+		    char *session = sessions[(lParam - IDM_SAVED_MIN) / 16];
+		    cl = malloc(16 + strlen(session)); /* 8, but play safe */
+		    if (!cl)
+			cl = NULL;     /* not a very important failure mode */
+		    sprintf(cl, "putty @%s", session);
+		    freecl = TRUE;
 		} else
-		  cl = NULL;
+		    cl = NULL;
 
 		GetModuleFileName (NULL, b, sizeof(b)-1);
 		si.cb = sizeof(si);
@@ -677,6 +686,8 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 
 		if (filemap)
 		    CloseHandle(filemap);
+		if (freecl)
+		    free(cl);
 	    }
 	    break;
 	  case IDM_RECONF:
@@ -863,6 +874,12 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
       case WM_IGNORE_SIZE:
 	ignore_size = TRUE;	       /* don't panic on next WM_SIZE msg */
 	break;
+      case WM_ENTERSIZEMOVE:
+          EnableSizeTip(1);
+          break;
+      case WM_EXITSIZEMOVE:
+          EnableSizeTip(0);
+          break;
       case WM_SIZING:
 	{
 	    int width, height, w, h, ew, eh;
@@ -872,6 +889,7 @@ static int WINAPI WndProc (HWND hwnd, UINT message,
 	    height = r->bottom - r->top - extra_height;
 	    w = (width + font_width/2) / font_width; if (w < 1) w = 1;
 	    h = (height + font_height/2) / font_height; if (h < 1) h = 1;
+        UpdateSizeTip(hwnd, w, h);
 	    ew = width - w * font_width;
 	    eh = height - h * font_height;
 	    if (ew != 0) {