Changeset 2663 for trunk/src

Timestamp:

Feb 5, 2000, 5:25:00 PM (26 years ago)

Author:

sandervl

Message:

WM_ERASEBKGND changes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (5 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (3 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.41 2000-01-31 22:30:51 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.42 2000-02-05 16:24:57 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include <limits.h>
 #include "oslibwin.h"
-#include "dcdata.h"
+#include <dcdata.h>
 
 #define INCLUDED_BY_DC
@@ -70 +70 @@
 
 HWND WIN32API GetDesktopWindow(void);
+INT  WIN32API GetUpdateRgn(HWND, HRGN, BOOL);
 
 //******************************************************************************
@@ -463 +464 @@
         }
    }
+
+   //SvL: Get update region for WM_ERASEBACKGROUND handling in the def wndproc
+   GetUpdateRgn(hWnd, wnd->GetUpdateRegion(), FALSE);
 
    HWND hwndClient = wnd->getOS2WindowHandle();
@@ -884 +888 @@
 {
    Win32BaseWindow *wnd;
+
+   if(pRect) {
+          dprintf(("RedrawWindow %x (%d,%d)(%d,%d) %x %x", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom, hrgn, redraw));
+   }
+   else   dprintf(("RedrawWindow %x %x %x %x", hwnd, pRect, hrgn, redraw));
 
    if (redraw & (RDW_FRAME_W | RDW_NOFRAME_W))

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.41 2000-01-18 20:10:52 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.42 2000-02-05 16:24:58 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -23 +23 @@
 #include "win32wdesktop.h"
 #include "controls.h"
+#include "syscolor.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -696 +697 @@
       RECT rect;
       int rc;
-        /*  Since WM_ERASEBKGND may receive either a window dc or a    */
-        /*  client dc, the area to be erased has to be retrieved from  */
-        /*  the device context.                    */
-        rc = GetClipBox( (HDC)wParam, &rect );
+
+        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
+
+//        rc = GetClipBox( (HDC)wParam, &rect );
+        rc = GetRgnBox(hUpdateRegion, &rect);
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
-            FillRect( (HDC)wParam, &rect, windowClass->getBackgroundBrush());
+        {
+            HBRUSH hBrush = windowClass->getBackgroundBrush();
+
+            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
+                hBrush = GetSysColorBrush(hBrush-1);
+
+//          FillRect( (HDC)wParam, &rect, hBrush);
+                FillRgn((HDC)wParam, hUpdateRegion, hBrush);
+        }
+
         return 1;
     }
+
     case WM_NCDESTROY:
           /* Free dialog heap (if created) */

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.152 2000-02-05 14:08:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.153 2000-02-05 16:24:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -145 +145 @@
   ownDC              = 0;
   hWindowRegion      = 0;
+  hUpdateRegion      = CreateRectRgn(0, 0, 0, 0);
 
   if(currentProcessId == -1)
@@ -178 +179 @@
     }
 
-    if (isOwnDC())
-        releaseOwnDC (ownDC);
+    if(hUpdateRegion) {
+        DeleteObject(hUpdateRegion);
+        hUpdateRegion = 0;
+    }
+
+    if(isOwnDC())
+        releaseOwnDC(ownDC);
 
     if(Win32Hwnd)
@@ -186 +192 @@
     if(userWindowLong)
         free(userWindowLong);
+
     if(windowNameA) {
         free(windowNameA);
@@ -1433 +1440 @@
         if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
 
-        rc = GetClipBox( (HDC)wParam, &rect );
+//        rc = GetClipBox( (HDC)wParam, &rect );
+        rc = GetRgnBox(hUpdateRegion, &rect);
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
         {
-          HBRUSH hBrush = windowClass->getBackgroundBrush();
-
-          if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1)) hBrush = GetSysColorBrush(hBrush-1);
-
-          FillRect( (HDC)wParam, &rect, hBrush);
+            HBRUSH hBrush = windowClass->getBackgroundBrush();
+
+            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
+                hBrush = GetSysColorBrush(hBrush-1);
+
+//          FillRect( (HDC)wParam, &rect, hBrush);
+                FillRgn((HDC)wParam, hUpdateRegion, hBrush);
         }
 
@@ -2724 +2734 @@
                     return value;
 
-                        value &= ~(WS_VISIBLE | WS_CHILD);      /* Some bits can't be changed this way (WINE) */
+                value &= ~(WS_VISIBLE | WS_CHILD);      /* Some bits can't be changed this way (WINE) */
                 ss.styleOld = getStyle();
-                        ss.styleNew = value | (ss.styleOld & (WS_VISIBLE | WS_CHILD));
+                ss.styleNew = value | (ss.styleOld & (WS_VISIBLE | WS_CHILD));
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
-                                    windowClass->getStyle() & CS_SAVEBITS);
+////                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
+////                                    windowClass->getStyle() & CS_SAVEBITS);
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.79 2000-02-05 14:08:54 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.80 2000-02-05 16:25:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -198 +198 @@
          void   SetWindowRegion(HRGN hRegion)       { hWindowRegion = hRegion; };
          HRGN   GetWindowRegion()                   { return hWindowRegion; };
+         HRGN   GetUpdateRegion()                   { return hUpdateRegion; };
 
          BOOL   ShowWindow(ULONG nCmdShow);
@@ -341 +342 @@
 
         HRGN    hWindowRegion;
+        HRGN    hUpdateRegion;
 
         DWORD   dwThreadId;             //id of thread that created this window