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

diff --git a/window.c b/window.c
index 437f7dd8..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) {
@@ -3160,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) {
@@ -3168,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();