Changeset 8105 for trunk/src

Timestamp:

Mar 20, 2002, 11:30:08 AM (23 years ago)

Author:

sandervl

Message:

Changes & fixes for minimized windows

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (6 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)
• win32wbasepos.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.115 2001-12-30 10:47:43 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.116 2002-03-20 10:30:06 sandervl Exp $ */
 
 /*
@@ -660 +660 @@
  RECTL    rectlClient;
  RECTL    rectlClip;
+ BOOL     bIcon;
 
     if(lpps == NULL) {
@@ -675 +676 @@
         return (HDC)0;
     }
-    HWND hwndClient = wnd->getOS2WindowHandle();
-
-    if(hwnd != HWND_DESKTOP && wnd->isOwnDC())
+//    bIcon = (IsIconic(hwnd) && GetClassLongA(hWnd, GCL_HICON_W));
+    bIcon = IsIconic(hwnd);
+
+    HWND hwndClient = (bIcon) ? wnd->getOS2FrameWindowHandle() : wnd->getOS2WindowHandle();
+
+    if(hwnd != HWND_DESKTOP && !bIcon && wnd->isOwnDC())
     {
         hPS_ownDC = wnd->getOwnDC();
@@ -694 +698 @@
     }
     if(!hpsPaint) {
-        hpsPaint = GetDCEx(hwnd, 0, (DCX_CACHE_W|DCX_USESTYLE_W));
+        hpsPaint = GetDCEx(hwnd, 0, (DCX_CACHE_W|DCX_USESTYLE_W | ((bIcon) ? DCX_WINDOW_W : 0)));
         pHps = (pDCData)GpiQueryDCData(hpsPaint);
         if (!pHps)
@@ -710 +714 @@
         dprintf (("USER32: WARNING: WinQueryUpdateRect failed (error or no update rectangle)!!"));
 
+        if(bIcon) {
+            //WinBeginPaint messes this up for icon windows; this isn't
+            //a good solution, but it does the job
+            //Use the entire frame window as clip region
+            rectl.xRight = wnd->getWindowWidth();
+            rectl.yTop   = wnd->getWindowHeight();
+        }
+
         HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
         GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
@@ -717 +729 @@
         //save old clip region (restored for CS_OWNDC windows in EndPaint)
         wnd->SetClipRegion(hrgnOldClip);
-        lComplexity = RGN_NULL;
+        if(bIcon) {
+              lComplexity = RGN_RECT;
+        }
+        else  lComplexity = RGN_NULL;
     }
     else {

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.169 2002-02-18 10:14:57 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.170 2002-03-20 10:30:06 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -987 +987 @@
         }
 
+        //@@PF all commands from minimized window viewer or from Ctrl-Esc
+        //are 'pure' and should be handled only by DeFrameProc - this is weird
+        //but without them we will not have results. Pure = plain flag of restore/minimize/maximize
+        if((pswp->fl == SWP_MINIMIZE) || (pswp->fl & SWP_RESTORE)) {
+          // note the purity of SWP no other SWP_FLAGS allowed
+           goto RunDefFrameWndProc;
+        }
+
         if(pswp->fl & SWP_NOADJUST) {
             //ignore weird messages (TODO: why are they sent?)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.317 2002-03-18 15:26:30 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.318 2002-03-20 10:30:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1280 +1280 @@
        (pUpdateRect->right >= client.left) && (pUpdateRect->right < client.right) &&
        (pUpdateRect->top  >= client.top) && (pUpdateRect->top < client.bottom) &&
-       (pUpdateRect->bottom >= client.top) && (pUpdateRect->bottom < client.bottom))
+       (pUpdateRect->bottom >= client.top) && (pUpdateRect->bottom < client.bottom)
+       && (!(getStyle() & WS_MINIMIZE)))
     {
         return 0;
@@ -1289 +1290 @@
 
     rc = SendMessageA(getWindowHandle(),WM_NCPAINT, hrgn, 0);
+    //Send WM_PAINTICON here if minimized, because client window will
+    //not receive a (valid) WM_PAINT message
+    if (getStyle() & WS_MINIMIZE) 
+    {
+        rc = SendMessageA(getWindowHandle(),WM_PAINTICON, 1, 0);
+    }
 
     DeleteObject(hrgn);
@@ -1788 +1795 @@
     case WM_PRINT:
         return DefWndPrint(wParam,lParam);
+
+    case WM_SYNCPAINT:
+        RedrawWindow(getWindowHandle(), NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN);
+        return 0;
 
     case WM_PAINTICON:
@@ -2277 +2288 @@
     case SW_RESTORE:
          dprintf(("ShowWindow:restoring window"));
-         //Set client rectangle to 0 (contains negative values)
-         setClientRect(0,0,0,0);
 
          swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
@@ -2300 +2309 @@
         swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 
-    SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
+    dprintf(("ShowWindow : SetWindowPos now"));   
+    if (!(getStyle() & WS_MINIMIZE)) {
+         SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
+    }
+    else OSLibWinMinimizeWindow(getOS2FrameWindowHandle());
 
     if(!(swp & SWP_NOACTIVATE)) {

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.38 2002-02-05 17:59:01 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.39 2002-03-20 10:30:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -439 +439 @@
             winRect->right = winRect->left;
     }
-
+    else {
+        //must return empty rectangle in parent coordinates (converted to
+        //(0,0)(0,0) in NCCALCSIZE handler
+        winRect->right  = winRect->left;
+        winRect->bottom = winRect->top;
+    }
     return result;
 }

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.28 2002-03-07 19:41:18 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.29 2002-03-20 10:30:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -315 +315 @@
             if(getParent() == NULL) {
 // @@PF : for now disable windows style - it messes with WV minimize - will fix it soon
-                 SetRect(lpRect, -32000, -32000, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
+//                SetRect(lpRect, -32000, -32000, getWindowWidth(), getWindowHeight());
 //                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
-                CloseWindow(); 
             }
             else {