Changeset 5606 for trunk/src/user32/dc.cpp

Timestamp:

Apr 27, 2001, 7:36:39 PM (24 years ago)

Author:

sandervl

Message:

mouse message translation + dc reset after resize fixes

File:

• trunk/src/user32/dc.cpp (modified) (6 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.96 2001-03-27 20:47:22 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.97 2001-04-27 17:36:36 sandervl Exp $ */
 
 /*
@@ -425 +425 @@
    RECTL rectWindowOS2;
 
-   if(pClient->left == 0 && pClient->top == 0 &&
+   if(!window->isOwnDCDirty() && (pClient->left == 0 && pClient->top == 0 &&
       window->getClientHeight() == window->getWindowHeight() &&
-      window->getClientWidth()  == window->getWindowWidth())
+      window->getClientWidth()  == window->getWindowWidth()))
    {
         //client rectangle = frame rectangle -> no change necessary
@@ -437 +437 @@
 
    mapWin32ToOS2Rect(window->getWindowHeight(), window->getClientRectPtr(), (PRECTLOS2)&rcl);
+
+   GetWindowRect(window->getWindowHandle(), &rectWindow);
+   mapWin32ToOS2Rect(GetScreenHeight(), &rectWindow, (PRECTLOS2)&rectWindowOS2);
+   dprintf2(("frame (%d,%d)(%d,%d) hps height %d", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop, pHps->height));
 
    //convert to screen coordinates
@@ -510 +514 @@
               SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
 
-   pHps->isClientArea = TRUE;
-
    // Destroy the region now we have finished with it.
    GreDestroyRegion(pHps->hps, hrgnRect);
+
+   pHps->isClientArea = TRUE;
+
+   if(pClient->left == 0 && pClient->top == 0 &&
+      window->getClientHeight() == window->getWindowHeight() &&
+      window->getClientWidth()  == window->getWindowWidth())
+   {
+       //client = frame, so no changes are necessary when switching between the two
+       pHps->isClient = FALSE;
+       pHps->isClientArea = FALSE;
+   }
+   if(window->isOwnDCDirty()) {
+       window->validateOwnDC();
+       setPageXForm(window, pHps);
+   }
 
 //testestest
@@ -621 +638 @@
    if(wnd) {
       selectClientArea(wnd, pHps);
+   }
+}
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API checkOrigin(pDCData pHps)
+{
+ Win32BaseWindow *wnd;
+
+   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
+   if(wnd) {
+      dprintfOrigin(pHps->hps);
+      if(pHps->isClient)
+          selectClientArea(wnd, pHps);
    }
 }
@@ -1305 +1335 @@
          pr->yTop = height - pr->yBottom;
          pr->yBottom = height - temp;
-         dprintf2(("Invalid region (%d,%d) (%d,%d)", pr->xLeft, pr->yBottom, pr->xRight, pr->yTop));
+         dprintf2(("RedrawWindow: region (%d,%d) (%d,%d)", pr->xLeft, pr->yBottom, pr->xRight, pr->yTop));
       }