Changeset 3007

Timestamp:

Mar 4, 2000, 8:54:03 PM (25 years ago)

Author:

sandervl

Message:

dinput changes

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (7 diffs)
• winmouse.cpp (modified) (2 diffs)
• winmouse.h (modified) (2 diffs)

trunk/src/user32/oslibmsgtranslate.cpp ¶

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.20 2000-03-03 21:19:13 hugh Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.21 2000-03-04 19:54:03 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -46 +46 @@
                0x09,    // VK_TAB           VK_TAB
                0x00,    // VK_BACKTAB       No equivalent!
-               0x0D,    // VK_NEWLINE       VK_RETURN
+               0x0A,    // VK_NEWLINE       0x0A (no VK_* def)
                0x10,    // VK_SHIFT         VK_SHIFT
                0x11,    // VK_CTRL          VK_CONTROL
@@ -193 +193 @@
             winMsg->lParam  = MAKELONG(ClientPoint.x, ClientPoint.y); //client coordinates
         }
+        if(ISMOUSE_CAPTURED())
+        {
+            if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_BUTTON, winMsg->pt.x, winMsg->pt.y))
+                goto dummymessage; //dinput swallowed message
+        }
 
         return TRUE;
@@ -223 +228 @@
           winMsg->wParam  = GetMouseKeyState();
           winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1),mapOS2ToWin32Y(win32wnd->getOS2FrameWindowHandle(),win32wnd->getOS2WindowHandle(),SHORT2FROMMP(os2Msg->mp1)));
+        }
+        if(ISMOUSE_CAPTURED())
+        {
+            if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_MOVE, winMsg->pt.x, winMsg->pt.y))
+                goto dummymessage; //dinput swallowed message
         }
         //OS/2 Window coordinates -> Win32 Window coordinates
@@ -440 +450 @@
         {
             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_BUTTON, winMsg->pt.x, winMsg->pt.y))
-                goto dummymessage;
+                goto dummymessage; //dinput swallowed message
         }
 
@@ -476 +486 @@
         {
             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_MOVE, winMsg->pt.x, winMsg->pt.y))
-                goto dummymessage;
+                goto dummymessage; //dinput swallowed message
         }
         //OS/2 Window coordinates -> Win32 Window coordinates
@@ -635 +645 @@
         if(ISKDB_CAPTURED())
         {
-            DInputKeyBoardHandler(winMsg);
+            if(DInputKeyBoardHandler(winMsg))
+                goto dummymessage; //dinput swallowed message
         }
         break;

trunk/src/user32/winmouse.cpp ¶

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.6 2000-03-01 13:30:07 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.7 2000-03-04 19:54:03 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -41 +41 @@
 //******************************************************************************
 //******************************************************************************
-void DInputKeyBoardHandler(MSG *msg)
+BOOL DInputKeyBoardHandler(MSG *msg)
 {
-  if(keyboardHandler)
-        keyboardHandler(msg->hwnd, msg->message, msg->wParam, msg->lParam);
+  if(!ISKDB_CAPTURED())
+        return FALSE;
+
+  return keyboardHandler(msg->hwnd, msg->message, msg->wParam, msg->lParam);
 }
 //******************************************************************************

trunk/src/user32/winmouse.h ¶

@@ -1 @@
-/* $Id: winmouse.h,v 1.5 2000-03-01 13:30:07 sandervl Exp $ */
+/* $Id: winmouse.h,v 1.6 2000-03-04 19:54:03 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -22 +22 @@
 
 BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y);
-void DInputKeyBoardHandler(MSG *msg);
+BOOL DInputKeyBoardHandler(MSG *msg);
 
 #endif //__WINMOUSE_H__