X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4eeb7d098fc3c6fb29a4ba0da78edbf83f88dce1..2d466ffd08675d26db45e524c2fe6a8cf4628e2b:/window.c

diff --git a/window.c b/window.c
index 37b3a007..ea349bda 100644
--- a/window.c
+++ b/window.c
@@ -57,6 +57,11 @@
 #define VK_PROCESSKEY 0xE5
 #endif
 
+/* Needed for mouse wheel support and not defined in earlier SDKs. */
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL 0x020A
+#endif
+
 static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 			unsigned char *output);
@@ -297,6 +302,14 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    }
 	}
 
+	/*
+	 * Trim leading whitespace off the hostname if it's there.
+	 */
+	{
+	    int space = strspn(cfg.host, " \t");
+	    memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
+	}
+
 	/* See if host is of the form user@host */
 	if (cfg.host[0] != '\0') {
 	    char *atsign = strchr(cfg.host, '@');
@@ -1129,6 +1142,7 @@ Mouse_Button translate_button(Mouse_Button button)
 	return cfg.mouse_is_xterm ? MBT_PASTE : MBT_EXTEND;
     if (button == MBT_RIGHT)
 	return cfg.mouse_is_xterm ? MBT_EXTEND : MBT_PASTE;
+    return 0;			       /* shouldn't happen */
 }
 
 static void show_mouseptr(int show)
@@ -1544,6 +1558,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		button = MBT_RIGHT;
 		press = 0;
 		break;
+	      default:
+		button = press = 0;    /* shouldn't happen */
 	    }
 	    show_mouseptr(1);
 	    if (press) {
@@ -2737,8 +2753,26 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    return p - output;
 	}
 
-	if (cfg.funky_type == 5 && code >= 11 && code <= 24) {
-	    p += sprintf((char *) p, "\x1B[%c", code + 'M' - 11);
+	if (cfg.funky_type == 5 && code >= 11 && code <= 34) {
+	    char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
+	    int index = 0;
+	    switch (wParam) {
+	      case VK_F1: index = 0; break;
+	      case VK_F2: index = 1; break;
+	      case VK_F3: index = 2; break;
+	      case VK_F4: index = 3; break;
+	      case VK_F5: index = 4; break;
+	      case VK_F6: index = 5; break;
+	      case VK_F7: index = 6; break;
+	      case VK_F8: index = 7; break;
+	      case VK_F9: index = 8; break;
+	      case VK_F10: index = 9; break;
+	      case VK_F11: index = 10; break;
+	      case VK_F12: index = 11; break;
+	    }
+	    if (keystate[VK_SHIFT] & 0x80) index += 12;
+	    if (keystate[VK_CONTROL] & 0x80) index += 24;
+	    p += sprintf((char *) p, "\x1B[%c", codes[index]);
 	    return p - output;
 	}
 	if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
@@ -3142,7 +3176,7 @@ void get_clip(wchar_t ** p, int *len)
 	clipdata = NULL;
 	return;
     } else if (OpenClipboard(NULL)) {
-	if (clipdata = GetClipboardData(CF_UNICODETEXT)) {
+	if ((clipdata = GetClipboardData(CF_UNICODETEXT))) {
 	    CloseClipboard();
 	    *p = GlobalLock(clipdata);
 	    if (*p) {
@@ -3150,7 +3184,7 @@ void get_clip(wchar_t ** p, int *len)
 		*len = p2 - *p;
 		return;
 	    }
-	} else if (clipdata = GetClipboardData(CF_TEXT)) {
+	} else if ( (clipdata = GetClipboardData(CF_TEXT)) ) {
 	    char *s;
 	    int i;
 	    CloseClipboard();