Changeset 3708 for trunk/src

Timestamp:

Jun 14, 2000, 4:25:57 PM (25 years ago)

Author:

sandervl

Message:

fix for excessive redrawing in Notes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (5 diffs)
• pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.60 2000-06-08 18:10:09 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.61 2000-06-14 14:25:56 sandervl Exp $ */
 
 /*
@@ -625 +625 @@
    }
    else {
-#if 0
-        HRGN hrgnTmp = GpiCreateRegion(pHps->hps, 1, &rectl);
-
-        WinQueryUpdateRegion(hwndClient, hrgnTmp);
-
-        RGNRECT rgnrect = {0, 12, 0, RECTDIR_LFRT_TOPBOT};
-        RECTL   rectls[12], rcltemp;
-        GpiQueryRegionRects(pHps->hps, hrgnTmp, &rcltemp, &rgnrect, &rectls[0]);
-        GpiDestroyRegion(pHps->hps, hrgnTmp);
-#endif
         WinValidateRect(hwndClient, &rectl, FALSE);
 
@@ -1110 +1100 @@
              wnd->setEraseBkgnd(TRUE);
         }
+        else
+        if (redraw & RDW_NOERASE_W)
+            wnd->setEraseBkgnd(FALSE);
 
         if (!pRect && !hrgn)
@@ -1203 +1196 @@
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
-                          (erase ? RDW_ERASE_W : 0) |
+                          (erase ? RDW_ERASE_W : RDW_NOERASE_W) |
                           (hwnd == NULLHANDLE ? RDW_UPDATENOW_W : 0));
    return (result);
@@ -1216 +1209 @@
    result = RedrawWindow (hwnd, NULL, hrgn,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
-                          (erase ? RDW_ERASE_W : 0) |
+                          (erase ? RDW_ERASE_W : RDW_NOERASE_W) |
                           (hwnd == NULLHANDLE ? RDW_UPDATENOW_W : 0));
    return (result);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.94 2000-06-14 13:15:24 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.95 2000-06-14 14:25:57 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -689 +689 @@
     {
       RECTL rectl;
-
-        WinQueryUpdateRect(hwnd, &rectl);
+      BOOL  rc;
+
+        rc = WinQueryUpdateRect(hwnd, &rectl);
         dprintf(("OS2: WM_PAINT (%d,%d) (%d,%d)", rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
-        if(win32wnd->IsWindowCreated()) 
+        if(rc && win32wnd->IsWindowCreated() && (rectl.xLeft != rectl.xRight &&
+           rectl.yBottom != rectl.yTop)) 
         {
                 PRECT pClient = win32wnd->getClientRectPtr();
@@ -705 +707 @@
                 win32wnd->DispatchMsgA(pWinMsg);
         }
+        else    goto RunDefWndProc;
+
         //SvL: Not calling the default window procedure causes all sorts of
         //     strange problems (redraw & hanging app)
@@ -714 +718 @@
 //      }
 //      dprintf(("Update rectangle (%d,%d)(%d,%d) not empty, msg %x", rectl.xLeft, rectl.yTop, rectl.xRight, rectl.yBottom, pWinMsg->message));
-        goto RunDefWndProc;
-//        break;
+//      goto RunDefWndProc;
+        break;
     }