Changeset 9933

Timestamp:

Mar 22, 2003, 9:27:12 PM (22 years ago)

Author:

sandervl

Message:

Changes for applications that don't validate the update region of a window during WM_PAINT

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (4 diffs)
• dcrgn.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (3 diffs)

trunk/src/user32/dc.cpp ¶

@@ -1 @@
-/* $Id: dc.cpp,v 1.117 2002-06-28 19:45:00 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.118 2003-03-22 20:27:10 sandervl Exp $ */
 
 /*
@@ -679 +679 @@
     bIcon = IsIconic(hwnd);
 
+    //check if the application previously didn't handle a WM_PAINT msg properly
+    wnd->checkForDirtyUpdateRegion();
+
     HWND hwndClient = (bIcon) ? wnd->getOS2FrameWindowHandle() : wnd->getOS2WindowHandle();
 
@@ -1207 +1210 @@
         else hwnd = wnd->getOS2WindowHandle();
     }
+
+    //check if the application previously didn't handle a WM_PAINT msg properly
+    wnd->checkForDirtyUpdateRegion();
 
     BOOL  IncludeChildren = (redraw & RDW_ALLCHILDREN_W) ? TRUE : FALSE;
@@ -1383 +1389 @@
     }
 
+    //check if the application previously didn't handle a WM_PAINT msg properly
+    wnd->checkForDirtyUpdateRegion();
+
 #ifdef DEBUG
     if(WinQueryUpdateRect(wnd->getOS2WindowHandle(), &rectl))

trunk/src/user32/dcrgn.cpp ¶

@@ -1 @@
-/* $Id: dcrgn.cpp,v 1.7 2001-09-30 22:24:41 sandervl Exp $ */
+/* $Id: dcrgn.cpp,v 1.8 2003-03-22 20:27:11 sandervl Exp $ */
 
 /*
@@ -65 +65 @@
     dprintf(("GetUpdateRect %x %x %d", hwnd, pRect, erase));
 
+    //check if the application previously didn't handle a WM_PAINT msg properly
+    wnd->checkForDirtyUpdateRegion();
+
     BOOL updateRegionExists = WinQueryUpdateRect(wnd->getOS2WindowHandle(), pRect ? &rectl : NULL);
     if (!pRect) {
@@ -118 +121 @@
         return ERROR_W;
     }
+    //check if the application previously didn't handle a WM_PAINT msg properly
+    wnd->checkForDirtyUpdateRegion();
+
     lComplexity = WinQueryUpdateRegion(wnd->getOS2WindowHandle(), hrgn);
     if(lComplexity == RGN_ERROR) {

trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.202 2003-03-20 13:20:44 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.203 2003-03-22 20:27:11 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -866 +866 @@
       BOOL  rc;
 
+        win32wnd->checkForDirtyUpdateRegion();
+
         rc = WinQueryUpdateRect(hwnd, &rectl);
         dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d) rc=%d", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop, rc));
@@ -873 +875 @@
         {
                 win32wnd->DispatchMsgA(pWinMsg);
+                if(WinQueryUpdateRect(hwnd, NULL) == TRUE) 
+                {//the application didn't validate the update region; Windows
+                 //will only send a WM_PAINT once until another part of the
+                 //window is invalidated. Unfortunately PM keeps on sending
+                 //WM_PAINT messages until we validate the update region.
+
+                    win32wnd->saveAndValidateUpdateRegion();
+                }
         }
         else    goto RunDefWndProc;

trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.362 2003-03-20 13:20:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.363 2003-03-22 20:27:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -119 +119 @@
   fEraseBkgndFlag  = TRUE;
   fIsDragDropActive= FALSE;
+  fDirtyUpdateRegion = FALSE;
 
   state            = STATE_INIT;
@@ -174 +175 @@
   hWindowRegion      = 0;
   hClipRegion        = 0;
+  hUpdateRegion      = 0;
 
   hTaskList          = 0;
@@ -272 +274 @@
     if(propertyList) {
         removeWindowProps();
+    }
+    if(hUpdateRegion) {
+        DeleteObject(hUpdateRegion);
+        hUpdateRegion = NULL;
     }
 }
@@ -1190 +1196 @@
     else
         return SendMessageA(getWindowHandle(),WM_PAINT, 0, 0);
+}
+//******************************************************************************
+// 
+// Win32BaseWindow::saveAndValidateUpdateRegion
+//
+//   If an application doesn't validate the update region while processing 
+//   WM_PAINT, then we must remember it for the next time. Also validates
+//   the current update region.
+//
+// Parameters:
+// Returns:
+//
+// NOTE:
+//   Windows will only send a WM_PAINT once until another part of the
+//   window is invalidated. Unfortunately PM keeps on sending
+//   WM_PAINT messages until we validate the update region.
+//
+//   This affects UpdateWindow, RedrawWindow, GetUpdateRgn, GetUpdateRect,
+//   BeginPaint and the next WM_PAINT message.
+//
+//******************************************************************************
+void Win32BaseWindow::saveAndValidateUpdateRegion()
+{
+    if(hUpdateRegion == NULL) {
+        hUpdateRegion = ::CreateRectRgn(0, 0, 1, 1);
+    }
+
+    dprintf(("Win32BaseWindow::saveAndValidateUpdateRegion; marked dirty!"));
+
+    //save update region
+    ::GetUpdateRgn(getWindowHandle(), hUpdateRegion, FALSE);
+
+    //and validate it so PM won't bother us again
+    ::ValidateRgn(getWindowHandle(), hUpdateRegion);
+
+    //we just pretend the entire window is invalid. easier this way
+    fDirtyUpdateRegion = TRUE;
+}
+//******************************************************************************
+// 
+// Win32BaseWindow::checkForDirtyUpdateRegion
+//
+//   If an application doesn't validate the update region while processing 
+//   WM_PAINT, then we must remember it for the next time. If the window has
+//   a dirty update region, then invalidate that region.
+//
+// Parameters:
+// Returns:
+//
+// NOTE:
+//
+//******************************************************************************
+void Win32BaseWindow::checkForDirtyUpdateRegion()
+{
+    if(fDirtyUpdateRegion) {
+        dprintf(("Win32BaseWindow::checkForDirtyUpdateRegion; marked dirty -> invalidate whole window!"));
+        fDirtyUpdateRegion = FALSE;
+        ::InvalidateRgn(getWindowHandle(), hUpdateRegion, TRUE);
+    }
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.149 2003-03-20 13:20:46 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.150 2003-03-22 20:27:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -230 +230 @@
          void   SetClipRegion(HRGN hRegion)       { hClipRegion = hRegion; };
 
+         void   saveAndValidateUpdateRegion();
+         void   checkForDirtyUpdateRegion();   
+         BOOL   hasDirtUpdateRegion()             { return fDirtyUpdateRegion; };
+
          BOOL   ShowWindow(ULONG nCmdShow);
 virtual  BOOL   SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags, BOOL fShowWindow = FALSE);
@@ -416 +420 @@
                  fVisibleRegionChanged:1, //set when visible region has changed -> erase background must be sent during next BeginPaint
                  fEraseBkgndFlag:1,
-                 fIsDragDropActive:1;
+                 fIsDragDropActive:1,
+                 fDirtyUpdateRegion:1;
 
         ULONG   state;
         HRGN    hWindowRegion;
         HRGN    hClipRegion;
+        HRGN    hUpdateRegion;
 
         DWORD   dwThreadId;             //id of thread that created this window