Changeset 3341 for trunk/src

Timestamp:

Apr 7, 2000, 2:55:16 PM (25 years ago)

Author:

sandervl

Message:

clip fix for WM_NCPAINT

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (4 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.53 2000-04-02 09:27:22 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.54 2000-04-07 12:55:15 sandervl Exp $ */
 
 /*
@@ -936 +936 @@
       else //DCX_INTERSECTRGN_W
       {
+         //SvL: I'm getting paint problems when clipping a dc created in GetDCEx
+         //     with a region that covers the entire window (RealPlayer 7 Update 1)
+         //     Using SelectClipRgn here doesn't make any difference.
          if(ExtSelectClipRgn(pHps->hps, hrgn, RGN_AND_W) == ERROR_W) {
                 dprintf(("ExtSelectClipRgn failed!!"));

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.176 2000-03-31 14:42:48 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.177 2000-04-07 12:55:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1026 +1026 @@
 
 ////    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
-    if ((rect.left >= client.left) && (rect.left < client.right) &&
-        (rect.right >= client.left) && (rect.right < client.right) &&
-        (rect.top  >= client.top) && (rect.top < client.bottom) &&
-        (rect.bottom >= client.top) && (rect.bottom < client.bottom))
-      return 0;
-
-    dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
-    hrgn = CreateRectRgnIndirect(&rect);
-    if (!hrgn) return 0;
-    rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
-    DeleteObject(hrgn);
-
-    return rc;
-  }
-  else return 0;
+        if ((rect.left >= client.left) && (rect.left < client.right) &&
+           (rect.right >= client.left) && (rect.right < client.right) &&
+           (rect.top  >= client.top) && (rect.top < client.bottom) &&
+           (rect.bottom >= client.top) && (rect.bottom < client.bottom))
+        {
+                return 0;
+        }
+
+        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
+        hrgn = CreateRectRgnIndirect(&rect);
+        if (!hrgn) return 0;
+
+        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
+
+        DeleteObject(hrgn);
+
+        return rc;
+  }
+  else  return 0;
 }
 //******************************************************************************
@@ -1295 +1299 @@
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-          HandleNCPaint((HRGN)1);
+//          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.20 2000-04-07 10:01:18 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.21 2000-04-07 12:55:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -972 +972 @@
     DrawTextExA(memDC,buffer,-1,&r,DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT | DT_END_ELLIPSIS,NULL);
     DeleteObject (SelectObject (memDC, hOldFont));
+    IncreaseLogCount();
+    dprintf(("DrawCaption %s %d", buffer, active));
+    DecreaseLogCount();
   }
 
@@ -997 +1000 @@
   DecreaseLogCount();
 
+  rect.top    = rect.left = 0;
+  rect.right  = rectWindow.right - rectWindow.left;
+  rect.bottom = rectWindow.bottom - rectWindow.top;
+
+  if (clip > 1)
+  {
+    //only redraw caption
+    GetRgnBox(clip,&rectClip);
+    //SvL: I'm getting paint problems when clipping a dc created in GetDCEx
+    //     with a region that covers the entire window (RealPlayer 7 Update 1)
+    //     As we don't need to clip anything when that occurs, this workaround
+    //     solves the problem.
+    if(rectClip.right == getWindowWidth() && rectClip.bottom == getWindowHeight()) 
+    {
+        clip = 0;
+        rectClip = rect;
+    }
+  }
+  else
+  {
+    clip = 0;
+    rectClip = rect;
+  }
+
   if (!(hdc = GetDCEx( Win32Hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
                       ((clip > 1) ?(DCX_INTERSECTRGN /*| DCX_KEEPCLIPRGN*/) : 0) ))) return;
-
-  rect.top = rect.left = 0;
-  rect.right  = rectWindow.right - rectWindow.left;
-  rect.bottom = rectWindow.bottom - rectWindow.top;
-
-  if (clip > 1)
-  {
-    //only redraw caption
-    GetRgnBox(clip,&rectClip);
-  }
-  else
-  {
-    clip = 0;
-    rectClip = rect;
-  }
 
   SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
@@ -1044 +1056 @@
       rect.top += GetSystemMetrics(SM_CYCAPTION);
     }
-    if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) )
+    if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) ) 
       DrawCaption(hdc,&r,active);
   }