Changeset 728 for trunk/src

Timestamp:

Aug 28, 1999, 7:24:45 PM (26 years ago)

Author:

dengert

Message:

reposition child windows when parent height is changed

Location:

trunk/src/user32/new

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32class.cpp (modified) (7 diffs)
• win32class.h (modified) (3 diffs)
• win32wnd.cpp (modified) (3 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.22 1999-08-27 17:50:56 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.23 1999-08-28 17:24:45 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -212 +212 @@
       ULONG     parentHeight = 0;
       HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
+      LONG      yDelta = pswp->cy - pswpo->cy;
+      ULONG     classStyle;
 
         dprintf(("OS2: WM_WINDOWPOSCHANGED %x %x (%d,%d) (%d,%d)", hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
@@ -234 +236 @@
            wp.hwndInsertAfter = wndAfter->getWindowHandle();
         }
+        classStyle = win32wnd->getClass()->getStyle();
+//        if (yDelta != 0)
+        if ((yDelta != 0) && ((classStyle & CS_VREDRAW_W) ||
+           ((classStyle & CS_HREDRAW_W) && (pswp->cx != pswpo->cx))))
+        {
+            HENUM henum = WinBeginEnumWindows(pswp->hwnd);
+            SWP swp[10];
+            int i = 0;
+            HWND hwnd;
+
+            dprintf(("move children"));
+            while ((hwnd = WinGetNextWindow(henum)) != NULLHANDLE)
+            {
+#if 0
+               /* Do not move MDI clients.  MDI clients are a special case,
+                * even though they are bottom aligned they are always supposed
+                * to be the same size as their parent.  This code is an
+                * optimization and will not work correctly if the this
+                * assumption is incorrect.
+                */
+               WinBase *pBase = (WinBase *)WinQueryDAXData( hwnd );
+               if ( pBase && pBase->typeOf() == mdiClient )
+               {
+                  continue;
+               }
+#endif
+               // We don't know how many children we have so we'll move ten
+               // at a time.  Not very nice, I know.
+               WinQueryWindowPos(hwnd, &(swp[i]));
+
+               // The SWP flags are all set but PM will ignore any
+               // superflous ones, so keep them as they contain useful
+               // minimise and maximise flags.
+               swp[i].y += yDelta;
+
+               if (i == 9)
+               {
+                  WinSetMultWindowPos(GetThreadHAB(), swp, 10);
+                  i = 0;
+               }
+               else
+               {
+                  i++;
+               }
+            }
+
+            WinEndEnumWindows(henum);
+
+            // Any remaining windows?
+            if (i)
+               WinSetMultWindowPos(GetThreadHAB(), swp, i);
+        }
         win32wnd->MsgPosChanged((LPARAM)&wp);
+
         break;
     }
@@ -240 +295 @@
     case WM_ERASEBACKGROUND:
     {
-        return (MRESULT) FALSE;
+        break;
     }
     case WM_SIZE:
     {
-     SWP swp;
-
-        rc = WinQueryWindowPos(hwnd, &swp);
-        if(rc == FALSE) {
-                dprintf(("WM_SIZE: WinQueryWindowPos failed!"));
-                break;
-        }
-        dprintf(("OS2: WM_SIZE %x %x (%d,%d) (%d,%d) (%d,%d)", hwnd, swp.fl, swp.x, swp.y, swp.cx, swp.cy, SHORT1FROMMP(mp2), SHORT2FROMMP(mp2)));
-#if 0
-        if(win32wnd->MsgSize(SHORT1FROMMP(mp2), SHORT2FROMMP(mp2),
-                                (swp.fl & SWP_MINIMIZE) != 0,
-                                (swp.fl & SWP_MAXIMIZE) != 0))
-        {
-                goto RunDefWndProc;
-        }
-#endif
         break;
     }

trunk/src/user32/new/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.8 1999-08-28 14:09:30 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.9 1999-08-28 17:24:45 dengert Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -80 +80 @@
   nrExtraClassWords     = wndclass->cbClsExtra;
   nrExtraWindowWords    = wndclass->cbWndExtra;
-  backgroundBrush       = wndclass->hbrBackground;      //TODO: fErase of PAINSTRUCT in WM_PAINT if == NULL
+  backgroundBrush       = wndclass->hbrBackground;
   hCursor               = wndclass->hCursor;
   hIcon                 = wndclass->hIcon;
@@ -137 +137 @@
 
   if(wndclass == NULL) {
-        leaveMutex(OBJTYPE_CLASS);
-        return(NULL);
+        leaveMutex(OBJTYPE_CLASS);
+        return(NULL);
   }
 
@@ -144 +144 @@
 //CB: read comment below!
         if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
-                leaveMutex(OBJTYPE_CLASS);
+                leaveMutex(OBJTYPE_CLASS);
                 return(wndclass);
         }
@@ -151 +151 @@
                 while(wndclass != NULL) {
                         if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
-                                leaveMutex(OBJTYPE_CLASS);
+                                leaveMutex(OBJTYPE_CLASS);
                                 return(wndclass);
                         }
@@ -162 +162 @@
 //CB: need more code to compare instance; convert 0 to exe module handle
         if(wndclass->classAtom == (DWORD)id /*&& wndclass->hInstance == hInstance*/) {
-                leaveMutex(OBJTYPE_CLASS);
+                leaveMutex(OBJTYPE_CLASS);
                 return(wndclass);
         }
@@ -169 +169 @@
                 while(wndclass != NULL) {
                         if(wndclass->classAtom == (DWORD)id/* && wndclass->hInstance == hInstance*/) {
-                                leaveMutex(OBJTYPE_CLASS);
-                                return(wndclass);
+                                leaveMutex(OBJTYPE_CLASS);
+                                return(wndclass);
                         }
                         wndclass = (Win32WndClass *)wndclass->GetNext();

trunk/src/user32/new/win32class.h

@@ -1 @@
-/* $Id: win32class.h,v 1.5 1999-08-28 14:09:30 sandervl Exp $ */
+/* $Id: win32class.h,v 1.6 1999-08-28 17:24:45 dengert Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -15 +15 @@
 {
 public:
-        Win32WndClass(WNDCLASSEXA *wndclass, BOOL isUnicode = FALSE);
+        Win32WndClass(WNDCLASSEXA *wndclass, BOOL isUnicode = FALSE);
        ~Win32WndClass();
 
-         ULONG  getClassLongA(int index, BOOL isUnicode = FALSE);
-         ULONG  getClassLongW(int index) 
-         { 
-                return getClassLongA(index, TRUE); 
-         };
-         WORD   getClassWord(int index);
+         ULONG  getClassLongA(int index, BOOL isUnicode = FALSE);
+         ULONG  getClassLongW(int index)
+         {
+                return getClassLongA(index, TRUE);
+         };
+         WORD   getClassWord(int index);
 
-         ULONG  setClassLongA(int index, LONG lNewVal, BOOL isUnicode = FALSE);
-         ULONG  setClassLongW(int index, LONG lNewVal) 
-         {
-                return setClassLongA(index, lNewVal, TRUE);
-         }
-         WORD   setClassWord(int index, WORD wNewVal);
+         ULONG  setClassLongA(int index, LONG lNewVal, BOOL isUnicode = FALSE);
+         ULONG  setClassLongW(int index, LONG lNewVal)
+         {
+                return setClassLongA(index, lNewVal, TRUE);
+         }
+         WORD   setClassWord(int index, WORD wNewVal);
 
-         ATOM   getAtom()       { return (ATOM) classAtom; };
-         BOOL   getClassInfo(WNDCLASSEXA *wndclass);
-         BOOL   getClassInfo(WNDCLASSEXW *wndclass);
+         ATOM   getAtom()       { return (ATOM) classAtom; };
+         BOOL   getClassInfo(WNDCLASSEXA *wndclass);
+         BOOL   getClassInfo(WNDCLASSEXW *wndclass);
 
-         ULONG  getClassName(LPSTR  lpszClassName, ULONG cchClassName);
-         ULONG  getClassName(LPWSTR lpszClassName, ULONG cchClassName);
+         ULONG  getClassName(LPSTR  lpszClassName, ULONG cchClassName);
+         ULONG  getClassName(LPWSTR lpszClassName, ULONG cchClassName);
 
-       WNDPROC  getWindowProc()         { return windowProc; };
-         LPSTR  getMenuNameA()          { return menuNameA; };
-         DWORD  getExtraWndWords()      { return nrExtraWindowWords; };
+       WNDPROC  getWindowProc()         { return windowProc; };
+         LPSTR  getMenuNameA()          { return menuNameA; };
+         DWORD  getExtraWndWords()      { return nrExtraWindowWords; };
 
-         HICON  getIcon()               { return hIcon; };
+         HICON  getIcon()               { return hIcon; };
 
         HBRUSH  getBackgroundBrush()    { return backgroundBrush; };
+         ULONG  getStyle()              { return windowStyle; };
 
-          void  setMenuName(LPSTR newMenuName);
+          void  setMenuName(LPSTR newMenuName);
 
-          void  IncreaseWindowCount()   { cWindows++; };
-          void  DecreaseWindowCount()   { cWindows--; };
-          DWORD GetWindowCount()        { return cWindows; };
+          void  IncreaseWindowCount()   { cWindows++; };
+          void  DecreaseWindowCount()   { cWindows--; };
+          DWORD GetWindowCount()        { return cWindows; };
 
           BOOL  hasClassName(LPSTR classname, BOOL fUnicode = 0);
-          
- static  void   UnregisterClassA(HINSTANCE hinst, LPSTR id);
+          
+ static  void   UnregisterClassA(HINSTANCE hinst, LPSTR id);
 
  static Win32WndClass *FindClass(HINSTANCE hinst, LPSTR id);
@@ -63 +64 @@
 
  //Standard class words/longs
- ULONG          nrExtraClassWords;      //GCL_CBCLSEXTRA
- ULONG          nrExtraWindowWords;     //GCL_CBWNDEXTRA
- HBRUSH         backgroundBrush;        //GCL_HBRBACKGROUND
- HCURSOR        hCursor;                //GCL_HCURSOR
- HICON          hIcon;                  //GCL_HICON
- HINSTANCE      hInstance;              //GCL_HMODULE
- PCHAR          menuNameA;              //GCL_MENUNAME
- WCHAR         *menuNameW;              //GCL_MENUNAME
- ULONG          windowStyle;            //GCL_STYLE
- WNDPROC        windowProc;             //GCL_WNDPROC
- ULONG          classAtom;              //GCW_ATOM
+ ULONG          nrExtraClassWords;      //GCL_CBCLSEXTRA
+ ULONG          nrExtraWindowWords;     //GCL_CBWNDEXTRA
+ HBRUSH         backgroundBrush;        //GCL_HBRBACKGROUND
+ HCURSOR        hCursor;                //GCL_HCURSOR
+ HICON          hIcon;                  //GCL_HICON
+ HINSTANCE      hInstance;              //GCL_HMODULE
+ PCHAR          menuNameA;              //GCL_MENUNAME
+ WCHAR         *menuNameW;              //GCL_MENUNAME
+ ULONG          windowStyle;            //GCL_STYLE
+ WNDPROC        windowProc;             //GCL_WNDPROC
+ ULONG          classAtom;              //GCW_ATOM
 
  PCHAR          classNameA;
  WCHAR         *classNameW;
- HICON          hIconSm;
+ HICON          hIconSm;
 
  //User data class words/longs
- ULONG         *userClassLong;
+ ULONG         *userClassLong;
 
  //nr of windows created with this class
  ULONG          cWindows;
- 
+
  static GenericObject *wndclasses;
 };

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.32 1999-08-28 14:09:30 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.33 1999-08-28 17:24:45 dengert Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -972 +972 @@
 ULONG Win32Window::MsgEraseBackGround(HDC hdc)
 {
-    if(isIcon) {
-            return SendInternalMessageA(WM_ICONERASEBKGND, hdc, 0);
-    }
-    else    return SendInternalMessageA(WM_ERASEBKGND, hdc, 0);
+    ULONG rc;
+    HDC   hdcErase = hdc;
+
+    if (hdcErase == 0)
+        hdcErase = O32_GetDC(OS2Hwnd);
+
+    if(isIcon)
+        rc = SendInternalMessageA(WM_ICONERASEBKGND, hdcErase, 0);
+    else
+        rc = SendInternalMessageA(WM_ERASEBKGND, hdcErase, 0);
+    if (hdc == 0)
+        O32_ReleaseDC(OS2Hwnd, hdcErase);
+    return (rc);
 }
 //******************************************************************************
@@ -1658 +1667 @@
     if(OSLibWinQueryUpdateRect(OS2Hwnd, &rect))
     {//update region not empty
-        SendInternalMessageA((isIcon) ? WM_PAINTICON : WM_PAINT, 0, 0);
+        HDC hdc;
+
+        hdc = O32_GetDC(OS2Hwnd);
+        if (isIcon)
+        {
+            SendInternalMessageA(WM_ICONERASEBKGND, (WPARAM)hdc, 0);
+            SendInternalMessageA(WM_PAINTICON, 0, 0);
+        } else
+        {
+            SendInternalMessageA(WM_ERASEBKGND, (WPARAM)hdc, 0);
+            SendInternalMessageA(WM_PAINT, 0, 0);
+        }
+        O32_ReleaseDC(OS2Hwnd, hdc);
     }
     return TRUE;