Changeset 5164 for trunk/src

Timestamp:

Feb 18, 2001, 3:18:39 PM (25 years ago)

Author:

sandervl

Message:

workaround for window origin changes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (6 diffs)
• dc.h (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.85 2001-02-17 19:25:08 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.86 2001-02-18 14:18:38 sandervl Exp $ */
 
 /*
@@ -348 +348 @@
    pHps->isClient = FALSE;
 
-#ifdef DEBUG
-   GreGetDCOrigin(pHps->hps, &point);
-#endif
+   dprintfOrigin(pHps->hps);
 
    if(pHps->isClientArea)
@@ -456 +454 @@
 //******************************************************************************
 //******************************************************************************
+void selectClientArea(Win32BaseWindow *wnd, HDC hdc)
+{
+  pDCData pHps = (pDCData)GpiQueryDCData (wnd->getOwnDC());
+
+  if (pHps != NULLHANDLE)
+      selectClientArea(wnd, pHps);
+}
+//******************************************************************************
+//******************************************************************************
 LONG clientHeight(Win32BaseWindow *wnd, HWND hwnd, pDCData pHps)
 {
@@ -765 +772 @@
    else lpps->fErase = TRUE;
 
-#ifdef DEBUG
-   POINTL point;
-   GreGetDCOrigin(pHps->hps, &point);
-   dprintf(("dc origin (%d,%d)", point.x, point.y));
-#endif
+   dprintfOrigin(pHps->hps);
 
    lpps->hdc    = (HDC)pHps->hps;
@@ -809 +812 @@
    if (pHps && (pHps->hdcType == TYPE_3))
    {
+        dprintfOrigin(pHps->hps);
+
         GpiSetClipRegion(pHps->hps, wnd->GetClipRegion(), &hrgnOld);
         wnd->SetClipRegion(0);
@@ -1791 +1796 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef DEBUG
+void dprintfOrigin(HDC hdc)
+{
+   POINTL point;
+
+    pDCData  pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+    if(!pHps)
+    {
+        return;
+    }
+
+    GreGetDCOrigin(pHps->hps, &point);
+    dprintf(("HDC %x origin (%d,%d) org (%d,%d)", hdc, point.x, point.y, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
+}
+#endif
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/dc.h

@@ -1 @@
-/* $Id: dc.h,v 1.15 2000-06-17 09:45:02 sandervl Exp $ */
+/* $Id: dc.h,v 1.16 2001-02-18 14:18:38 sandervl Exp $ */
 /*
  * public dc functions
@@ -17 +17 @@
 extern void releaseOwnDC (HDC hps);
 
+void selectClientArea(Win32BaseWindow *wnd, HDC hdc);
+
 BOOL GetOS2UpdateRect(Win32BaseWindow *window,LPRECT pRect);
+
+#ifdef DEBUG
+void dprintfOrigin(HDC hdc);
+#else
+#define dprintfOrigin(a)
+#endif
 
 #ifdef INCLUDED_BY_DC

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.115 2001-02-17 17:11:17 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.116 2001-02-18 14:18:38 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -286 +286 @@
         dprintf(("OS2: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
+        if(win32wnd->getParent() && win32wnd->getParent()->isOwnDC()) {
+            dprintfOrigin(win32wnd->getParent()->getOwnDC());
+            selectClientArea(win32wnd->getParent(), win32wnd->getParent()->getOwnDC());
+        }
+
         if(pswp->fl & SWP_NOADJUST) {
             //ignore weird messages (TODO: why are they sent?)
@@ -596 +601 @@
                 win32wnd->setComingToTop(FALSE);
                 break;
+        }
+//test
+        if(win32wnd->isOwnDC()) {
+                dprintfOrigin(win32wnd->getOwnDC());
+                selectClientArea(win32wnd, win32wnd->getOwnDC());
+        }
+//test
+        goto RunDefWndProc;
+
+    case WM_VRNDISABLED:
+        dprintf(("OS2: WM_VRNDISABLED %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        if(win32wnd->isOwnDC()) {
+                dprintfOrigin(win32wnd->getOwnDC());
         }
         goto RunDefWndProc;

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.90 2000-12-29 18:39:59 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.91 2001-02-18 14:18:39 sandervl Exp $ */
 
 /*
@@ -1599 +1599 @@
 int WIN32API FillRect(HDC hDC, const RECT * lprc, HBRUSH hbr)
 {
-    dprintf(("USER32:  FillRect (%d,%d)(%d,%d) brush %X\n", lprc->left, lprc->top, lprc->right, lprc->bottom, hbr));
+    dprintf(("USER32:  FillRect %x (%d,%d)(%d,%d) brush %X\n", hDC, lprc->left, lprc->top, lprc->right, lprc->bottom, hbr));
     return O32_FillRect(hDC,lprc,hbr);
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.235 2001-02-17 14:49:26 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.236 2001-02-18 14:18:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2411 +2411 @@
     }
 
+//testestest
+    if(getParent() && getParent()->isOwnDC()) {
+        dprintfOrigin(getParent()->getOwnDC());
+        selectClientArea(getParent(), getParent()->getOwnDC());
+    }
+//testestest
+
     if((fuFlags & SWP_FRAMECHANGED) && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
     {