Changeset 2377 for trunk/src/user32/new/oslibmsgtranslate.cpp

Timestamp:

Jan 8, 2000, 5:47:50 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/new/oslibmsgtranslate.cpp (modified) (8 diffs)

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.6 2000-01-07 17:38:47 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.7 2000-01-08 16:47:46 cbratschi Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -102 +102 @@
 //******************************************************************************
 //******************************************************************************
+ULONG GetMouseKeyState()
+{
+  ULONG keystate;
+
+  if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000)
+    keystate |= MK_LBUTTON_W;
+  if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & 0x8000)
+    keystate |= MK_RBUTTON_W;
+  if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & 0x8000)
+    keystate |= MK_MBUTTON_W;
+  if(WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000)
+    keystate |= MK_SHIFT_W;
+  if(WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000)
+    keystate |= MK_CONTROL_W;
+
+  return keystate;
+}
+//******************************************************************************
+//******************************************************************************
+LONG IsNCMouseMsg(Win32BaseWindow *win32wnd)
+{
+  return ((win32wnd->getLastHitTestVal() != HTCLIENT_W) && (WinQueryCapture(HWND_DESKTOP) != win32wnd->getOS2WindowHandle()));
+}
+//******************************************************************************
+//******************************************************************************
 BOOL OS2ToWinMsgTranslate(void *pThdb, QMSG *os2Msg, MSG *winMsg, BOOL isUnicode, BOOL fMsgRemoved)
 {
@@ -141 +166 @@
       case WM_BUTTON3DBLCLK:
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W) {
+        if (IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
             winMsg->wParam  = win32wnd->lastHitTestVal;
@@ -153 +178 @@
 
             winMsg->message = WINWM_LBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
+            winMsg->wParam  = GetMouseKeyState();
             winMsg->lParam  = MAKELONG(ClientPoint.x, ClientPoint.y); //client coordinates
         }
@@ -171 +197 @@
       case WM_MOUSEMOVE:
       {
-        ULONG keystate = 0, setcursormsg = WINWM_MOUSEMOVE;
-
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000)
-            keystate |= MK_LBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & 0x8000)
-            keystate |= MK_RBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & 0x8000)
-            keystate |= MK_MBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000)
-            keystate |= MK_SHIFT_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000)
-            keystate |= MK_CONTROL_W;
-
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W)
-        {
-          setcursormsg   = WINWM_NCMOUSEMOVE;
-          winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
-          winMsg->lParam = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+        if(IsNCMouseMsg(win32wnd))
+        {
+          winMsg->message = WINWM_NCMOUSEMOVE;
+          winMsg->wParam  = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
         } else
         {
-          winMsg->wParam = (WPARAM)keystate;
+          winMsg->message = WINWM_MOUSEMOVE;
+          winMsg->wParam  = GetMouseKeyState();
           winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1),mapOS2ToWin32Y(win32wnd->getOS2FrameWindowHandle(),win32wnd->getOS2WindowHandle(),SHORT2FROMMP(os2Msg->mp1)));
         }
         //OS/2 Window coordinates -> Win32 Window coordinates
-        winMsg->message = setcursormsg;
         return TRUE;
       }
@@ -332 +345 @@
     case WM_BUTTON3DBLCLK:
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W) {
+        if(IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
             winMsg->wParam  = win32wnd->lastHitTestVal;
@@ -344 +357 @@
 
             winMsg->message = WINWM_LBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
+            winMsg->wParam  = GetMouseKeyState();
             winMsg->lParam  = MAKELONG(ClientPoint.x, ClientPoint.y); //client coordinates
         }
@@ -362 +376 @@
     case WM_MOUSEMOVE:
     {
-        ULONG keystate = 0, setcursormsg = WINWM_MOUSEMOVE;
-
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000)
-            keystate |= MK_LBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & 0x8000)
-            keystate |= MK_RBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & 0x8000)
-            keystate |= MK_MBUTTON_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000)
-            keystate |= MK_SHIFT_W;
-        if(WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000)
-            keystate |= MK_CONTROL_W;
-
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W)
-        {
-          setcursormsg   = WINWM_NCMOUSEMOVE;
-          winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
-          winMsg->lParam = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+        if(IsNCMouseMsg(win32wnd))
+        {
+          winMsg->message = WINWM_NCMOUSEMOVE;
+          winMsg->wParam  = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
         } else
         {
-          winMsg->wParam = (WPARAM)keystate;
+          winMsg->message = WINWM_MOUSEMOVE;
+          winMsg->wParam  = GetMouseKeyState();
           winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1),mapY(win32wnd,SHORT2FROMMP(os2Msg->mp1)));
         }
         //OS/2 Window coordinates -> Win32 Window coordinates
-        winMsg->message = setcursormsg;
         break;
     }