Changeset 5258 for trunk/src

Timestamp:

Feb 23, 2001, 3:52:42 PM (25 years ago)

Author:

sandervl

Message:

mdi, setcursor, min/max/restore, dlglist changes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (8 diffs)
• win32wbase.h (modified) (4 diffs)
• win32wbasepos.cpp (modified) (3 diffs)
• win32wmdiclient.cpp (modified) (2 diffs)
• windlg.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.119 2001-02-22 18:18:59 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.120 2001-02-23 14:52:41 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -472 +472 @@
                 else redrawAll = TRUE;
 
+                if(win32wnd->IsMixMaxStateChanging()) {
+                    dprintf(("WM_CALCVALIDRECT: window changed min/max/restore state, invalidate entire window"));
+                    redrawAll = TRUE;
+                }
+
                 if (redrawAll)
                 {
@@ -581 +586 @@
         SWP       swpOld;
         WINDOWPOS wp;
-        RECTL     newClientrect, oldClientRect;
+        RECTL     newClientRect, oldClientRect;
         ULONG     nccalcret;
 //        UINT      res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
@@ -616 +621 @@
 
         //Get new client rectangle
-        mapWin32ToOS2Rect(pswp->cy, win32wnd->getClientRectPtr(), (PRECTLOS2)&newClientrect);
+        mapWin32ToOS2Rect(pswp->cy, win32wnd->getClientRectPtr(), (PRECTLOS2)&newClientRect);
 
         if(nccalcret == 0) {
@@ -647 +652 @@
             }
         }
-        if(res != 0) {
-
+        if(win32wnd->IsMixMaxStateChanging()) {
+            dprintf(("WM_CALCVALIDRECT: window changed min/max/restore state, invalidate entire window"));
+            res |= CVR_REDRAW;
+        }
+        if(res == (CVR_ALIGNTOP|CVR_ALIGNLEFT)) {
+            oldRect->xRight  -= oldClientRect.xLeft;
+            oldRect->yBottom += oldClientRect.yBottom;
+            newRect->xRight  -= newClientRect.xLeft;
+            newRect->yBottom += newClientRect.yBottom;
         }
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.243 2001-02-22 18:18:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.244 2001-02-23 14:52:41 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -105 +105 @@
   fCreateSetWindowPos = FALSE;
   fCreationFinished= FALSE;
+  fMinMaxChange    = FALSE;
 
   windowNameA      = NULL;
@@ -1489 +1490 @@
     {
         dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY))
+        if((getStyle() & WS_CHILD))
         {
             if(getParent()) {
@@ -1496 +1497 @@
             }
         }
-        if (wParam == Win32Hwnd)
+        if (wParam == getWindowHandle())
         {
           HCURSOR hCursor;
@@ -2210 +2211 @@
             if( !(getStyle() & WS_MINIMIZE) ) {
                  swp |= MinMaximize(SW_MINIMIZE, &newPos );
+                 fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
             }
             else swp |= SWP_NOSIZE | SWP_NOMOVE;
@@ -2217 +2219 @@
     case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
         swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
-        if( !(getStyle() & WS_MAXIMIZE) )
+        if( !(getStyle() & WS_MAXIMIZE) ) {
              swp |= MinMaximize(SW_MAXIMIZE, &newPos );
+             fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
+        }
         else swp |= SWP_NOSIZE | SWP_NOMOVE;
         break;
@@ -2251 +2255 @@
          if( getStyle() & (WS_MINIMIZE | WS_MAXIMIZE) ) {
               swp |= MinMaximize(SW_RESTORE, &newPos );
+              fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
          }
          else swp |= SWP_NOSIZE | SWP_NOMOVE;
@@ -2291 +2296 @@
     }
 END:
+    fMinMaxChange = FALSE;
     return wasVisible;
 }

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.110 2001-02-22 10:37:31 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.111 2001-02-23 14:52:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -258 +258 @@
          //Window procedure type
          BOOL   IsWindowUnicode();
+         BOOL   IsMixMaxStateChanging()       { return fMinMaxChange; };
 
          int    GetWindowTextLength();
@@ -333 +334 @@
         HMENU   hSysMenu;
         HWND    Win32Hwnd;
-        BOOL    isUnicode;
 
         int     posx, posy, width, height;
@@ -353 +353 @@
         LONG    lastHitTestVal;         //Last value returned by WM_NCHITTEST handler
 
-        BOOL    fFirstShow;
-        BOOL    fIsDialog;
-        BOOL    fIsModalDialog;
-        BOOL    fIsModalDialogOwner;
         HWND    OS2HwndModalDialog;
-        BOOL    fInternalMsg;           //Used to distinguish between messages
-                                        //sent by PM and those sent by apps
-        BOOL    fNoSizeMsg;
-        BOOL    fIsDestroyed;
-        BOOL    fDestroyWindowCalled;   //DestroyWindow was called for this window
-        BOOL    fCreated;
-        BOOL    fCreationFinished;      //True when window or dialog has been created successfully
-                                        //Needed to prevent DestroyWindow from deleting the window
-                                        //object during construction
-        BOOL    fTaskList;              //should be listed in PM tasklist or not
-        BOOL    fXDefault;
-        BOOL    fCXDefault;
-        BOOL    fParentDC;
-        BOOL    fComingToTop;
-        BOOL    fCreateSetWindowPos;    //FALSE -> SetWindowPos in Win32BaseWindow::MsgCreate not yet called
+
+        unsigned fFirstShow:1;
+        unsigned fIsDialog:1;
+        unsigned fIsModalDialog:1;
+        unsigned fIsModalDialogOwner:1;
+        unsigned fInternalMsg:1;         //Used to distinguish between messages
+                                         //sent by PM and those sent by apps
+        unsigned fNoSizeMsg:1;
+        unsigned fIsDestroyed:1;
+        unsigned fDestroyWindowCalled:1; //DestroyWindow was called for this window
+        unsigned fCreated:1;
+        unsigned fCreationFinished:1;    //True when window or dialog has been created successfully
+                                         //Needed to prevent DestroyWindow from deleting the window
+                                         //object during construction
+        unsigned fTaskList:1;            //should be listed in PM tasklist or not
+        unsigned fXDefault:1;
+        unsigned fCXDefault:1;
+        unsigned fParentDC:1;
+        unsigned fComingToTop:1;
+        unsigned fCreateSetWindowPos:1;  //FALSE -> SetWindowPos in Win32BaseWindow::MsgCreate not yet called
+        unsigned isUnicode:1;
+        unsigned fMinMaxChange:1;        //set when switching between min/max/restored state
 
         HRGN    hWindowRegion;

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.21 2001-02-22 18:18:59 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.22 2001-02-23 14:52:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -224 +224 @@
     hwndParent = GetParent(hwnd);
     if(hwndParent == 0) {
-        DebugInt3();
+        dprintf(("WINPOS_FindIconPos: no parent found for window %x", hwnd));
         return;
     }
@@ -269 +269 @@
             if (!hwndChild) /* No window was found, so it's OK for us */
             {
-                        pt.x = x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2;
-                        pt.y = y - (yspacing + GetSystemMetrics(SM_CYICON)) / 2;
-                        return;
-            }
-                x += xspacing;
+                pt.x = x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2;
+                pt.y = y - (yspacing + GetSystemMetrics(SM_CYICON)) / 2;
+                return;
+            }
+            x += xspacing;
         } while(x <= rectParent.right-xspacing);
 

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.33 2001-02-20 17:22:06 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.34 2001-02-23 14:52:42 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -1329 +1329 @@
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = 0;
-    wndClass.hCursor       = 0;
+    wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);;
     wndClass.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
     wndClass.lpszClassName = MDICLIENTCLASSNAMEA;

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.21 2001-02-17 14:49:26 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.22 2001-02-23 14:52:42 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -695 +695 @@
         strcpy( temp, "A:\\" );
         temp[0] += drive;
-        lstrcpynA( temp + 3, DRIVE_GetDosCwd(curpath, drive), sizeof(temp)-3 );
+        lstrcpynA( temp + 3, DRIVE_GetDosCwd(curpath, drive, sizeof(curpath)), sizeof(temp)-3 );
         CharLowerA( temp );
         /* Can't use PostMessage() here, because the string is on the stack */