Changeset 10485 for trunk/src

Timestamp:

Feb 27, 2004, 3:38:03 PM (21 years ago)

Author:

sandervl

Message:

Reassert open DC transformation and y-inversion after SetWindowPos is called

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (7 diffs)
• pmwindow.h (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.227 2004-01-30 22:10:26 bird Exp $ */
+/* $Id: pmwindow.cpp,v 1.228 2004-02-27 14:38:03 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -705 +705 @@
         dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp1)));
         win32wnd->SetPMUpdateRegionChanged(TRUE);
+
         goto RunDefWndProc;
     }
@@ -725 +726 @@
         //This can result is visible distortions on the screen.
         //Debugging showed that querying the visible region of a DC will cure
-        //this problem (GPI probably recalculates the visible region).
+        //this problem (GPI probably recalculates the visible region). (#334)
+
         int  nrdcs = 0;
         HDC  hdcWindow[MAX_OPENDCS];
@@ -736 +738 @@
             for(int i=0;i<nrdcs;i++) {
                 dprintf(("Recalc visible region of DC %x for window %x", hdcWindow[i], win32wnd->getWindowHandle()));
+
                 hrgnRect = GreCreateRectRegion(hdcWindow[i], &rcl, 1);
                 GreCopyClipRegion(hdcWindow[i], hrgnRect, 0, COPYCRGN_VISRGN);
@@ -741 +744 @@
             }
         }
-
         //Workaround END
 
@@ -2382 +2384 @@
 //******************************************************************************
 //******************************************************************************
+void RecalcVisibleRegion(Win32BaseWindow *win32wnd)
+{
+        //Workaround for PM/GPI bug when moving/sizing a window with open DCs
+        //
+        //Windows applictions often get a DC and keep it open for the duration
+        //of the application. When the DC's window is moved (full window dragging on)
+        //PM/GPI doesn't seem to update the DC properly/in time.
+        //This can result is visible distortions on the screen.
+
+        //We need to reset our DC (transformation & y-inversion) (#945)
+        //Debugging showed that querying the visible region of a DC will cure
+        //this problem (GPI probably recalculates the visible region). (#334)
+
+        int  nrdcs = 0;
+        HDC  hdcWindow[MAX_OPENDCS];
+
+        if(win32wnd->queryOpenDCs(hdcWindow, MAX_OPENDCS, &nrdcs))
+        {
+            for(int i=0;i<nrdcs;i++) 
+            {
+                dprintf(("Recalc visible region of DC %x for window %x", hdcWindow[i], win32wnd->getWindowHandle()));
+
+                pDCData pHps = (pDCData)GpiQueryDCData (hdcWindow[i]);
+
+                if(pHps) setPageXForm (win32wnd, pHps);
+                else     DebugInt3();
+            }
+        }
+        //Workaround END
+}
+//******************************************************************************
+//******************************************************************************
 static char *PMDragExtractFiles(PDRAGINFO pDragInfo, ULONG *pcItems, ULONG *pulBytes)
 {
@@ -2627 +2661 @@
 }
 #endif
+

trunk/src/user32/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.21 2003-10-22 12:43:14 sandervl Exp $ */
+/* $Id: pmwindow.h,v 1.22 2004-02-27 14:38:03 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -47 +47 @@
 VOID FrameTrackFrame(Win32BaseWindow *win32wnd,DWORD flags);
 void Frame_SysCommandSizeMove(Win32BaseWindow *win32wnd, WPARAM wParam);
+void RecalcVisibleRegion(Win32BaseWindow *win32wnd);
 #endif
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.385 2004-01-19 12:39:02 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.386 2004-02-27 14:38:03 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2662 +2662 @@
         InvalidateRect(getWindowHandle(), NULL, TRUE);
     }
+
+    if(!(fuFlags & SWP_NOSIZE)) 
+    {
+        // We must call this function or open DC will get out of sync
+        // (PM will not always send us a WM_VRNENABLED message)
+        RecalcVisibleRegion(this);
+    }
     return (rc);
 }