Changeset 9230 for trunk/src

Timestamp:

Sep 12, 2002, 11:30:06 AM (23 years ago)

Author:

sandervl

Message:

Translate PM WM_VSCROLL to WM_MOUSEWHEEL messages

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (3 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.92 2002-09-03 14:03:16 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.93 2002-09-12 09:30:05 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -44 +44 @@
 static BOOL fGenerateDoubleClick = FALSE;
 static MSG  doubleClickMsg = {0};
+
+//For wheel mouse translation
+#define WHEEL_DELTA  120
+#define OS2_WHEEL_CORRECTION 6
+//This happens because OS/2 Wheel scrolling of IBM driver issues 6 WM_VSCROLL
+//messages and they need to transform in 1 WM_MOUSEWHEEL. If however user
+//will tweak driver to produce less or more messages, we will also react
 
 //******************************************************************************
@@ -921 +928 @@
     case WM_HSCROLL:
     case WM_VSCROLL:
-        winMsg->message = (os2Msg->msg == WM_HSCROLL) ? WINWM_HSCROLL : WINWM_VSCROLL;
-        winMsg->lParam  = 0;
-        winMsg->wParam  = 0;
-        switch(SHORT2FROMMP(os2Msg->mp2)) {
-        case SB_LINERIGHT:
-            winMsg->wParam = SB_LINERIGHT_W;
-            break;
-        case SB_LINELEFT:
-            winMsg->wParam = SB_LINELEFT_W;
-            break;
-        case SB_PAGELEFT:
-            winMsg->wParam = SB_PAGELEFT_W;
-            break;
-        case SB_PAGERIGHT:
-            winMsg->wParam = SB_PAGERIGHT_W;
-            break;
-        default:
-            dprintf(("Unsupported WM_H/VSCROLL message %x!!", SHORT2FROMMP(os2Msg->mp2)));
+        //PF For win32 we support only vertical scrolling for WM_MOUSEWHEEL
+        if((os2Msg->msg == WM_VSCROLL) && (fMsgRemoved == MSG_REMOVE))
+        {
+            MSLLHOOKSTRUCT hook;
+
+            //TODO:
+            winMsg->message = WINWM_MOUSEWHEEL;
+            winMsg->lParam  = 0;
+            winMsg->wParam  = 0;
+
+            hook.pt.x       = os2Msg->ptl.x & 0xFFFF;
+            hook.pt.y       = mapScreenY(os2Msg->ptl.y);
+            if (SHORT2FROMMP(os2Msg->mp2) == SB_LINEDOWN)
+                hook.mouseData   = MAKELONG(0, -WHEEL_DELTA/OS2_WHEEL_CORRECTION);  
+            else
+            if (SHORT2FROMMP(os2Msg->mp2) == SB_LINEUP)
+            { 
+                hook.mouseData   = MAKELONG(0, WHEEL_DELTA/OS2_WHEEL_CORRECTION);  
+            }
+            else goto dummymessage; // IBM driver produces other messages as well sometimes
+
+            hook.flags       = LLMHF_INJECTED;
+            hook.time        = winMsg->time;
+            hook.dwExtraInfo = 0;
+            if(HOOK_CallHooksW( WH_MOUSE_LL, HC_ACTION, WINWM_MOUSEWHEEL, (LPARAM)&hook)) {
+                goto dummymessage; //hook swallowed message
+            }
             goto dummymessage;
-        }
+        } 
+        goto dummymessage; //eat this message
+       
         break;
 

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.126 2002-08-27 09:30:50 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.127 2002-09-12 09:30:06 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1211 +1211 @@
 }
 //******************************************************************************
-//******************************************************************************
+//PF This was added for IBM Wheel Mouse driver - it searches for scrollbars and
+//only if they exist sends WM_VSCROLL messages to the window
+//******************************************************************************
+HWND OSLibWinCreateInvisibleScroller(HWND parentHWND, int direction)
+{
+    return WinCreateWindow(parentHWND, WC_SCROLLBAR, NULL, direction,
+                           0, 0, 0, 0, parentHWND, HWND_BOTTOM, 1, NULL, NULL);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.67 2002-08-21 15:40:28 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.68 2002-09-12 09:30:06 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -356 +356 @@
 
 BOOL   OSLibWinShowPointer(BOOL fShow);
-
+HWND OSLibWinCreateInvisibleScroller(HWND parentHWND, int direction);
 
    #define PMSYSCLR_SHADOWHILITEBGND         (-50L)