Changeset 12118

Timestamp:

Oct 31, 1999, 6:53:55 PM (25 years ago)

Author:

cbratschi

Message:

pmframe, scrollbar fixes. window.cpp compiles again

Location:

tags/trunk/src/user32

Files:

• pmframe.cpp (modified) (4 diffs)
• scroll.cpp (modified) (20 diffs)
• window.cpp (modified) (2 diffs)

tags/trunk/src/user32/pmframe.cpp ¶

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.14 1999-10-30 18:40:44 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.15 1999-10-31 17:53:51 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -281 +281 @@
             return (MRESULT)0xf;
         }
-        break;
+        goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
     }
 
@@ -427 +427 @@
     case WM_ACTIVATE:
       {
-        RestoreOS2TIB();
-        MRESULT rc = OldFrameProc(hwnd,msg,mp1,mp2);
-        //CB: overwrite OS/2's default frame
-        DrawActivate(win32wnd, hwnd);
-        return rc;
+        HWND hwndTitle;
+        USHORT flags = WinQueryWindowUShort(hwnd,QWS_FLAGS);
+
+        //CB: emulate WM_ACTIVATE -> no flickering
+        hwndTitle = WinWindowFromID(hwnd,FID_TITLEBAR);
+        if (hwndTitle) WinSendMsg(hwndTitle,TBM_SETHILITE,mp1,MPVOID);
+
+        WinSendMsg(WinWindowFromID(hwnd,FID_CLIENT),WM_ACTIVATE,mp1,mp2);
+        WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
+
+
+        RestoreOS2TIB();
+        return 0;
       }
 
@@ -488 +496 @@
       if (InSizeBox(win32wnd,(POINTS*)&mp1))
       {
+        WinSetActiveWindow(HWND_DESKTOP,hwnd);
         WinSendMsg(hwnd,WM_TRACKFRAME,(MPARAM)(TF_RIGHT | TF_BOTTOM),(MPARAM)0);
         RestoreOS2TIB();

tags/trunk/src/user32/scroll.cpp ¶

@@ -1 @@
-/* $Id: scroll.cpp,v 1.17 1999-10-30 18:40:45 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.18 1999-10-31 17:53:53 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -225 +225 @@
       INT w = lpRect->right-lpRect->left;
 
-      rect.left  -= w;
-      rect.right += w;
+      rect.left   -= w;
+      rect.right  += w;
+      rect.top    -= w;
+      rect.bottom += w;
     } else
     {
@@ -233 +235 @@
       rect.top    -= h;
       rect.bottom += h;
+      rect.left   -= h;
+      rect.right  += h;
     }
 
@@ -248 +252 @@
     INT arrowSize, thumbSize, thumbPos;
     RECT rect;
+    SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,nBar);
+
+    if (!infoPtr) return SCROLL_NOWHERE;
 
     BOOL vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
@@ -257 +264 @@
     if (vertical)
     {
-        if (pt.y < rect.top + arrowSize) return SCROLL_TOP_ARROW;
-        if (pt.y >= rect.bottom - arrowSize) return SCROLL_BOTTOM_ARROW;
+        if (pt.y < rect.top + arrowSize) return (infoPtr->flags & ESB_DISABLE_LTUP) ? SCROLL_NOWHERE:SCROLL_TOP_ARROW;
+        if (pt.y >= rect.bottom - arrowSize) return (infoPtr->flags & ESB_DISABLE_RTDN) ? SCROLL_NOWHERE:SCROLL_BOTTOM_ARROW;
         if (!thumbPos) return SCROLL_TOP_RECT;
         pt.y -= rect.top;
@@ -266 +273 @@
     else  /* horizontal */
     {
-        if (pt.x < rect.left + arrowSize) return SCROLL_TOP_ARROW;
-        if (pt.x >= rect.right - arrowSize) return SCROLL_BOTTOM_ARROW;
+        if (pt.x < rect.left + arrowSize) return (infoPtr->flags & ESB_DISABLE_LTUP) ? SCROLL_NOWHERE:SCROLL_TOP_ARROW;
+        if (pt.x >= rect.right - arrowSize) return (infoPtr->flags & ESB_DISABLE_RTDN) ? SCROLL_NOWHERE:SCROLL_BOTTOM_ARROW;
         if (!thumbPos) return SCROLL_TOP_RECT;
         pt.x -= rect.left;
@@ -707 +714 @@
     LRESULT res = (msg == WM_MOUSEMOVE) ? 1:0;
 
-    SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr( hwnd, nBar );
+    SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,nBar);
     if (!infoPtr) return res;
 
@@ -758 +765 @@
     }
 
-    if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg == WM_MOUSEMOVE || msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED))
-      return res;
+    if (!SCROLL_Scrolling && msg != WM_LBUTTONDOWN) return res;
 
     vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
@@ -784 +790 @@
         pt.y = (SHORT)HIWORD(lParam);
         SCROLL_trackVertical = vertical;
-        SCROLL_trackHitTest  = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE );
+        SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE );
+        if (SCROLL_trackHitTest == SCROLL_NOWHERE) return res;
         SCROLL_Scrolling = TRUE;
         timerRunning = FALSE;
@@ -809 +816 @@
 
       case WM_LBUTTONUP:
-        pt.x = (SHORT)LOWORD(lParam);
-        pt.y = (SHORT)HIWORD(lParam);
-        hittest = SCROLL_NOWHERE;
-        ReleaseCapture();
-        SCROLL_Scrolling = FALSE;
+        if (SCROLL_Scrolling)
+        {
+          pt.x = (SHORT)LOWORD(lParam);
+          pt.y = (SHORT)HIWORD(lParam);
+          hittest = SCROLL_NOWHERE;
+          ReleaseCapture();
+          SCROLL_Scrolling = FALSE;
+        } else return res;
         break;
 
       case WM_CAPTURECHANGED:
-        hittest = SCROLL_NOWHERE;
-        SCROLL_Scrolling = FALSE;
+        if (SCROLL_Scrolling)
+        {
+          hittest = SCROLL_NOWHERE;
+          SCROLL_Scrolling = FALSE;
+        } else return res;
         break;
 
@@ -871 +884 @@
     hdc = GetDCEx(hwnd,0,DCX_CACHE | ((nBar == SB_CTL) ? 0:DCX_WINDOW));
 
-    //TRACE("Event: hwnd=%04x bar=%d msg=%x pt=%ld,%ld hit=%d\n",
-    //             hwnd, nBar, msg, pt.x, pt.y, hittest );
-
     switch(SCROLL_trackHitTest)
     {
@@ -880 +890 @@
 
       case SCROLL_TOP_ARROW:
-        if (msg == WM_LBUTTONUP)
+        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
           KillSystemTimer(hwnd,SCROLL_TIMER);
         else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
@@ -901 +911 @@
 
       case SCROLL_TOP_RECT:
-        if (msg == WM_LBUTTONUP)
+        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
           KillSystemTimer(hwnd,SCROLL_TIMER);
         else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
@@ -930 +940 @@
             SCROLL_TrackingBar = nBar;
             SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos;
+            SCROLL_TrackingVal = infoPtr->CurVal;
             SCROLL_MovingThumb = TRUE;
             SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
@@ -939 +950 @@
           SCROLL_MovingThumb = FALSE;
           SCROLL_TrackingWin = 0;
+          SCROLL_trackHitTest = SCROLL_NOWHERE;  /* Terminate tracking */
           val = SCROLL_GetThumbVal( infoPtr, &rect, vertical,
                                     trackThumbPos + lastMousePos - lastClickPos );
-          SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
-                        MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
+
+          if (val != infoPtr->CurVal)
+            SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                          MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
 
           if (oldPos == infoPtr->CurVal)
+          {
+            vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
+                                        &arrowSize, &thumbSize, &thumbPos );
             SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
                                  thumbPos, infoPtr->flags, vertical,
                                  FALSE, FALSE );
+          }
+
+          ReleaseDC(hwnd,hdc);
+          return res;
         } else if (msg == WM_MOUSEMOVE)
         {
@@ -975 +996 @@
 
       case SCROLL_BOTTOM_RECT:
-        if (msg == WM_LBUTTONUP)
+        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
           KillSystemTimer(hwnd,SCROLL_TIMER);
         else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
@@ -999 +1020 @@
 
       case SCROLL_BOTTOM_ARROW:
-        if (msg == WM_LBUTTONUP)
+        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
           KillSystemTimer(hwnd,SCROLL_TIMER);
         else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
@@ -1022 +1043 @@
     if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
     {
-        hittest = SCROLL_trackHitTest;
-        SCROLL_trackHitTest = SCROLL_NOWHERE;  /* Terminate tracking */
-
-        if (hittest != SCROLL_THUMB)
-          SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_ENDSCROLL,hwndCtl);
+      SCROLL_trackHitTest = SCROLL_NOWHERE;  /* Terminate tracking */
+
+      SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_ENDSCROLL,hwndCtl);
     }
 
@@ -1307 +1326 @@
     HWND hwndScroll = SCROLL_GetScrollHandle(hwnd,nBar);
 
+    dprintf(("USER32: SetScrollInfo"));
+
     if (!hwndScroll) return 0;
     if (!(infoPtr = SCROLL_GetInfoPtr(hwndScroll,nBar))) return 0;
@@ -1444 +1465 @@
   SCROLLBAR_INFO *infoPtr;
 
+    dprintf(("USER32: GetScrollInfo"));
+
     if (!(infoPtr = SCROLL_GetInfoPtr(SCROLL_GetScrollHandle(hwnd,nBar),nBar))) return FALSE;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return FALSE;

tags/trunk/src/user32/window.cpp ¶

@@ -1 @@
-/* $Id: window.cpp,v 1.29 1999-10-31 16:44:05 dengert Exp $ */
+/* $Id: window.cpp,v 1.30 1999-10-31 17:53:55 cbratschi Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -189 +189 @@
     else dprintf(("CreateWindowExW: class %d parent %x (%d,%d) (%d,%d), %x %x", className, parent, x, y, width, height, style, exStyle));
 
-    if (!strcmpi(className, L"BUTTON") && ((style & 0x0f) == BS_GROUPBOX))
+    if (!lstrcmpiW(className,(LPCWSTR)L"BUTTON") && ((style & 0x0f) == BS_GROUPBOX))
       style |= WS_CLIPSIBLINGS;