Changeset 1039 for trunk/src

Timestamp:

Sep 25, 1999, 11:27:08 AM (26 years ago)

Author:

dengert

Message:

fixed ClientToScreen adn ScreenToClient

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.4 1999-09-22 14:58:23 dengert Exp $ */
+/* $Id: oslibwin.cpp,v 1.5 1999-09-25 09:27:07 dengert Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -656 +656 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinMapWindowPoints (HWND hwndFrom, HWND hwndTo, OSLIBPOINT *pptl, ULONG num)
+{
+   return WinMapWindowPoints (hwndFrom, hwndTo, (PPOINTL)pptl, num);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.3 1999-09-21 17:04:27 dengert Exp $ */
+/* $Id: oslibwin.h,v 1.4 1999-09-25 09:27:07 dengert Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -240 +240 @@
 BOOL  OSLibWinEndEnumWindows(HWND hwndEnum);
 BOOL  OSLibWinQueryWindowProcess(HWND hwnd, ULONG *pid, ULONG *tid);
+BOOL  OSLibWinMapWindowPoints (HWND hwndFrom, HWND hwndTo, OSLIBPOINT *pptl, ULONG num);
 
 #endif //__OSLIBWIN_H__

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.5 1999-09-22 08:58:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.6 1999-09-25 09:27:07 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -77 +77 @@
      (PSZ)WIN32_STDCLASS,               /* Window class name            */
      (PFNWP)Win32WindowProc,            /* Address of window procedure  */
-     CS_SIZEREDRAW | CS_HITTEST,
+     CS_SIZEREDRAW | CS_HITTEST | CS_MOVENOTIFY,
      NROF_WIN32WNDBYTES)) {
         dprintf(("WinRegisterClass Win32BaseWindow failed"));
@@ -269 +269 @@
             win32wnd->setEraseBkgnd (!erased, !erased);
         }
+        break;
+    }
+
+    case WM_MOVE:
+    {
+        if (!win32wnd->isFrameWindow()) break;
+
+        HWND      hFrame = win32wnd->getOS2FrameWindowHandle();
+        SWP       swp, swpo;
+        WINDOWPOS wp;
+        ULONG     parentHeight = 0;
+        RECTL     rcl;
+
+        WinQueryWindowRect (hwnd, &rcl);
+        WinMapWindowPoints (hwnd, hFrame, (PPOINTL)&rcl, 2);
+        swp.x  = swpo.x  = rcl.xLeft;
+        swp.y  = swpo.y  = rcl.yBottom;
+        swp.cx = swpo.cx = rcl.xRight - rcl.xLeft;
+        swp.cy = swpo.cy = rcl.yTop   - rcl.yBottom;
+        swp.fl = SWP_MOVE | SWP_NOREDRAW;
+        swp.hwnd             = hwnd;
+        swp.hwndInsertBehind = NULLHANDLE;
+
+        OSLibMapSWPtoWINDOWPOS(&swp, &wp, &swpo, NULLHANDLE, hFrame);
+
+        wp.flags &= ~SWP_NOMOVE_W;
+        wp.hwnd = win32wnd->getWindowHandle();
+        win32wnd->setWindowRect(wp.x, wp.y, wp.x + wp.cx, wp.y + wp.cy);
+        win32wnd->setClientRect(swpo.x, swpo.y, swpo.x + swpo.cx, swpo.y + swpo.cy);
+        win32wnd->MsgPosChanged((LPARAM)&wp);
         break;
     }

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.29 1999-09-24 22:45:27 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.30 1999-09-25 09:27:08 dengert Exp $ */
 
 /*
@@ -1242 +1242 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ScreenToClient( HWND arg1, LPPOINT  arg2)
+BOOL WIN32API ScreenToClient (HWND hwnd, LPPOINT pt)
 {
 #ifdef DEBUG
     WriteLog("USER32:  ScreenToClient\n");
 #endif
-    return O32_ScreenToClient(arg1, arg2);
+    Win32BaseWindow *wnd;
+    PRECT rcl;
+
+    if (!hwnd) return (TRUE);
+    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+    if (!wnd) return (TRUE);
+
+    rcl   = wnd->getClientRect();
+    pt->y = ScreenHeight - pt->y;
+    OSLibWinMapWindowPoints (OSLIB_HWND_DESKTOP, wnd->getOS2WindowHandle(), (OSLIBPOINT *)pt, 1);
+    pt->y = (rcl->bottom - rcl->top) - pt->y;
+    return (TRUE);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.10 1999-09-24 22:45:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.11 1999-09-25 09:27:07 dengert Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1242 +1242 @@
         WPARAM     wp   = SIZE_RESTORED;
 
-        if (!(wpos->flags & SWP_NOCLIENTMOVE))
+        if (!(wpos->flags & SWP_NOMOVE) && !(wpos->flags & SWP_NOCLIENTMOVE))
             SendMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
 
-        if (!(wpos->flags & SWP_NOCLIENTSIZE))
+        if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
         {
             if (dwStyle & WS_MAXIMIZE) wp = SIZE_MAXIMIZED;

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.7 1999-09-24 22:45:28 sandervl Exp $ */
+/* $Id: window.cpp,v 1.8 1999-09-25 09:27:08 dengert Exp $ */
 /*
  * Win32 window apis for OS/2
  *
  * Copyright 1999 Sander van Leeuwen
+ * Copyright 1999 Daniela Engert (dani@ngrt.de)
  *
  * Parts based on Wine Windows code (windows\win.c)
@@ -778 +779 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ClientToScreen( HWND arg1, PPOINT  arg2)
-{
-#ifdef DEBUG
-////    WriteLog("USER32:  ClientToScreen\n");
-#endif
-    return O32_ClientToScreen(arg1, arg2);
+BOOL WIN32API ClientToScreen (HWND hwnd, PPOINT pt)
+{
+#ifdef DEBUG
+   WriteLog("USER32:  ClientToScreen\n");
+#endif
+    Win32BaseWindow *wnd;
+    PRECT rcl;
+
+    if (!hwnd) return (TRUE);
+    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+    if (!wnd) return (TRUE);
+
+    rcl  = wnd->getClientRect();
+    pt->y = (rcl->bottom - rcl->top) - pt->y;
+    OSLibWinMapWindowPoints (wnd->getOS2WindowHandle(), OSLIB_HWND_DESKTOP, (OSLIBPOINT *)pt, 1);
+    pt->y = ScreenHeight - pt->y;
+    return (TRUE);
 }
 //******************************************************************************
@@ -1152 +1164 @@
 //******************************************************************************
 //******************************************************************************
+