From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 26 Oct 2011 05:24:17 +0000 (+0000)
Subject: Update Win32 ShlProc
X-Git-Url: http://pileus.org/git/?p=wmpus;a=commitdiff_plain;h=230e1caa3e7adc71ae88ce9d5be0c5f49577d20f

Update Win32 ShlProc

- Support HSHELL_WINDOWREPLACED
- Fake button click on HSHELL_WINDOWACTIVATED
---

diff --git a/sys-win32.c b/sys-win32.c
index c42f889..6d57bb6 100644
--- a/sys-win32.c
+++ b/sys-win32.c
@@ -19,7 +19,7 @@
 #include <search.h>
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <winbase.h>
 #include <winuser.h>
@@ -239,24 +239,30 @@ LRESULT CALLBACK ShlProc(int msg, WPARAM wParam, LPARAM lParam)
 	HWND hwnd = (HWND)wParam;
 	win_t *win = NULL;
 	switch (msg) {
-	case HSHELL_WINDOWCREATED:
 	case HSHELL_REDRAW:
+	case HSHELL_WINDOWCREATED:
 		printf("ShlProc: %p - %s\n", hwnd, msg == HSHELL_REDRAW ?
 				"redraw" : "window created");
 		if (!(win = win_find(hwnd,0)))
 			if ((win = win_find(hwnd,1)))
 				wm_insert(win);
 		return 1;
+	case HSHELL_WINDOWREPLACED:
 	case HSHELL_WINDOWDESTROYED:
-		printf("ShlProc: %p - window destroyed\n", hwnd);
+		printf("ShlProc: %p - %s\n", hwnd, msg == HSHELL_WINDOWREPLACED ?
+				"window replaced" : "window destroyed");
 		if ((win = win_find(hwnd,0)) &&
-		    win->state == st_show) {
+		    (win->state == st_show ||
+		     win->state == st_shade)) {
 			wm_remove(win);
 			win_remove(win);
 		}
 		return 1;
 	case HSHELL_WINDOWACTIVATED:
 		printf("ShlProc: %p - window activated\n", hwnd);
+		// Fake button-click
+		if ((win = win_find(hwnd,0)))
+			wm_handle_key(win, key_mouse1, MOD(), getptr());
 		return 0;
 	default:
 		printf("ShlProc: %p - unknown msg, %d\n", hwnd, msg);