From 750d897b89dea213411ad3eb9db36497d1fcfe3f Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Tue, 27 May 2008 23:24:43 +0000
Subject: [PATCH] accelerators in main window

---
 src/drivers/win/main.cpp     | 16 +++++++++++-----
 src/drivers/win/memwatch.cpp |  1 +
 src/drivers/win/res.rc       |  2 +-
 src/drivers/win/resource.h   |  3 ++-
 src/drivers/win/window.cpp   |  5 +++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 43236650..9ca929b5 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -303,13 +303,19 @@ int BlockingCheck()
 				if(IsChild(hwndMemWatch,msg.hwnd))
 					handled = TranslateAccelerator(hwndMemWatch,fceu_hAccel,&msg);
 				if(!handled)
-				{
-					int resylt = IsDialogMessage(hwndMemWatch,&msg);
-					handled = resylt;
-				}
+					handled = IsDialogMessage(hwndMemWatch,&msg);
 			}
 
-
+			if(!handled)
+				if(msg.hwnd == hAppWnd)
+				{
+					handled = TranslateAccelerator(hAppWnd,fceu_hAccel,&msg);
+					if(handled)
+					{
+						int zzz=9;
+					}
+				}
+	
 			if(!handled)
 			{
 				TranslateMessage(&msg);
diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp
index f3451428..a49b3721 100644
--- a/src/drivers/win/memwatch.cpp
+++ b/src/drivers/win/memwatch.cpp
@@ -791,6 +791,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			CloseMemoryWatch();
 			break;
 
+		case ACCEL_CTRL_O:
 		case MEMW_FILE_OPEN:
 			LoadMemWatch();
 			break;
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 55d480de..5dbe78ca 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -1610,7 +1610,7 @@ END
 
 IDR_ACCELERATOR1 ACCELERATORS 
 BEGIN
-    "O",            MEMW_FILE_OPEN,         VIRTKEY, CONTROL, NOINVERT
+    "O",            ACCEL_CTRL_O,           VIRTKEY, CONTROL, NOINVERT
 END
 
 #endif    // English (U.S.) resources
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index 4d4c40d0..fb7a02fb 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -332,6 +332,7 @@
 #define MENU_TASEDIT                    40124
 #define ID_CONFIG_PAUSEAFTERPLAYBACK    40125
 #define MENU_PAUSEAFTERPLAYBACK         40126
+#define ACCEL_CTRL_O                    40130
 #define MW_ValueLabel2                  65423
 #define MW_ValueLabel1                  65426
 #define GUI_BOT_DEBUG                   65436
@@ -343,7 +344,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        110
-#define _APS_NEXT_COMMAND_VALUE         40127
+#define _APS_NEXT_COMMAND_VALUE         40131
 #define _APS_NEXT_CONTROL_VALUE         1131
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 126c4a17..80d1c300 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -697,7 +697,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 
     case WM_COMMAND:
 
-		if(!(wParam>>16))
+		if(HIWORD(wParam) == 0 || HIWORD(wParam) == 1)
 		{
 			wParam &= 0xFFFF;
 
@@ -715,7 +715,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 				if(recent_directories[wParam-700])
 					LoadNewGamey(hWnd, recent_directories[wParam - 700]);
 			}
-			switch(wParam)
+			switch(LOWORD(wParam))
 			{
 				//-------
 				//mbg merge 7/18/06 added XD tools
@@ -1025,6 +1025,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 				CreateMemWatch();
 				break;
 
+			case ACCEL_CTRL_O:
 			case MENU_OPEN_FILE:
 				// User selected the Open File menu => Show the file selection dialog
 				LoadNewGamey(hWnd, 0);