--- np2/wince/np2.cpp	2004/06/20 04:32:18	1.18
+++ np2/wince/np2.cpp	2004/08/16 07:47:18	1.20
@@ -175,7 +175,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			winkbd_keyup(wParam, lParam);
 			break;
 
-#if !defined(_WIN32_WCE)
+#if 1 // !defined(_WIN32_WCE)
 		case WM_SYSKEYDOWN:
 			winkbd_keydown(wParam, lParam);
 			break;
@@ -198,9 +198,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				if (menuvram) {
 					menubase_moving(LOWORD(lParam), HIWORD(lParam), 1);
 				}
-				else {
+				else if (scrnmng_kbdpos(&lParam) == SUCCESS) {
 #if defined(SUPPORT_SOFTKBD)
-					softkbd_down(LOWORD(lParam), HIWORD(lParam) - 200);
+					softkbd_down(LOWORD(lParam), HIWORD(lParam));
 #endif
 				}
 			}
@@ -208,23 +208,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 		case WM_LBUTTONUP:
 			if (scrnmng_mousepos(&lParam) == SUCCESS) {
-
 #if defined(SUPPORT_SOFTKBD)
 				softkbd_up();
+#endif
 				if (menuvram) {
 					menubase_moving(LOWORD(lParam), HIWORD(lParam), 2);
 				}
-				else if ((LOWORD(lParam) < 32) && (HIWORD(lParam) >= 208)) {
-					sysmenu_menuopen(0, LOWORD(lParam), HIWORD(lParam));
-				}
-#else
-				if (menuvram) {
-					menubase_moving(LOWORD(lParam), HIWORD(lParam), 2);
-				}
-				else {
+				else if (scrnmng_ismenu(lParam)) {
 					sysmenu_menuopen(0, LOWORD(lParam), HIWORD(lParam));
 				}
-#endif
 			}
 			break;
 
@@ -483,7 +475,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			if (!GetMessage(&msg, NULL, 0, 0)) {
 				break;
 			}
-#if !defined(_WIN32_WCE)
+#if 1 // !defined(_WIN32_WCE)
 			if ((msg.hwnd != hWnd) ||
 				((msg.message != WM_SYSKEYDOWN) &&
 				(msg.message != WM_SYSKEYUP))) {