Changeset 398 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Jul 26, 1999, 10:03:49 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes: Solitaire now displays cards correctly

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (16 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.23 1999-07-26 09:01:34 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.24 1999-07-26 20:03:49 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -44 +44 @@
     ((style & WS_BORDER) || HAS_THICKFRAME(style) || HAS_DLGFRAME(style,exStyle))
 
+#define IS_OVERLAPPED(style) \
+    !(style & (WS_CHILD | WS_POPUP))
+
 //******************************************************************************
 //******************************************************************************
@@ -65 +68 @@
   isUnicode        = FALSE;
   fCreated         = FALSE;
+  fFirstShow       = TRUE;
 
   memset(windowNameA, 0, MAX_WINDOW_NAMELENGTH);
@@ -431 +435 @@
   maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
 
+  fCreated = TRUE; //Allow WM_SIZE messages now
   if(SendInternalMessage(WM_NCCREATE, 0, (LPARAM)cs) )
   {
-  //doesn't work right, messes up client rectangle
+        //doesn't work right, messes up client rectangle
 #if 0
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
@@ -455 +460 @@
                 HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
 #endif
-            fCreated = TRUE;
             SetLastError(0);
             return TRUE;
         }
   }
+  fCreated = FALSE;
   OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
   OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
@@ -473 +478 @@
  * state.
  */
-UINT Win32Window::MinMaximize(UINT16 cmd, LPRECT16 lpRect )
+UINT Win32Window::MinMaximize(UINT cmd, LPRECT lpRect )
 {
     UINT swpFlags = 0;
@@ -516 +521 @@
 
         case SW_MAXIMIZE:
-                CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
                 WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
-                CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
 
          if( dwStyle & WS_MINIMIZE )
@@ -779 +782 @@
 ULONG Win32Window::MsgActivate(BOOL fActivate, HWND hwnd)
 {
+    if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE)
+    {
+        if(!fActivate) {
+            return 1;
+        }
+    }
     return SendInternalMessageA(WM_ACTIVATE, (fActivate) ? WA_ACTIVE : WA_INACTIVE, hwnd);
 }
@@ -815 +824 @@
 ULONG Win32Window::MsgSetFocus(HWND hwnd)
 {
+    if(hwnd == 0) {
+        //other app lost focus
+        SendInternalMessageA(WM_ACTIVATEAPP, TRUE, 0); //TODO: Need thread id from hwnd app
+    }
     return SendInternalMessageA(WM_SETFOCUS, hwnd, 0);
 }
@@ -821 +834 @@
 ULONG Win32Window::MsgKillFocus(HWND hwnd)
 {
+    if(hwnd == 0) {
+        //other app lost focus
+        SendInternalMessageA(WM_ACTIVATEAPP, FALSE, 0); //TODO: Need thread id from hwnd app
+    }
     return SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
 }
@@ -872 +889 @@
                 return 1;
     }
+    if(win32msg == WM_MBUTTONDBLCLK || win32msg == WM_RBUTTONDBLCLK || win32msg == WM_LBUTTONDBLCLK) {
+        if(!(windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)) {
+            return 1;
+        }
+    }
     SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(x, y)); //TODO:
     return SendInternalMessageA(win32msg, 0, MAKELONG(x, y));
@@ -1343 +1365 @@
  ULONG showstate = 0;
 
-  dprintf(("ShowWindow %x", nCmdShow));
-  switch(nCmdShow)
-  {
+    dprintf(("ShowWindow %x", nCmdShow));
+    if(fFirstShow) {
+        if(isFrameWindow() && IS_OVERLAPPED(getStyle())) {
+                SendMessageA(WM_SIZE, SIZE_RESTORED,
+                                MAKELONG(rectClient.right-rectClient.left,
+                                         rectClient.bottom-rectClient.top));
+                SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
+
+        }
+        fFirstShow = FALSE;
+    }
+    switch(nCmdShow)
+    {
     case SW_SHOW:
     case SW_SHOWDEFAULT: //todo
@@ -1377 +1409 @@
         showstate = SWPOS_RESTORE | SWPOS_ACTIVATE | SWPOS_SHOW;
         break;
-  }
-  return OSLibWinShowWindow(OS2HwndFrame, showstate);
+    }
+    return OSLibWinShowWindow(OS2HwndFrame, showstate);
 }
 //******************************************************************************
@@ -1391 +1423 @@
         hwndInsertAfter = HWNDOS_BOTTOM;
         break;
-    case HWND_TOPMOST: //TODO:
+    case HWND_TOPMOST: //TODO
     case HWND_NOTOPMOST: //TODO:
     case HWND_TOP:
@@ -1402 +1434 @@
             PRECT clientRect = window->getClientRect();
 
-#if 0
+#if 1
             if(x+cx > clientRect->right - clientRect->left) {
+                dprintf(("Adjusting cx from %d to %d", cx, (clientRect->right - clientRect->left) - x));
                 cx = (clientRect->right - clientRect->left) - x;
             }
             if(y+cy > clientRect->bottom - clientRect->top) {
+                dprintf(("Adjusting cy from %d to %d", cy, (clientRect->bottom - clientRect->top) - y));
                 cy = (clientRect->bottom - clientRect->top) - y;
             }
 #endif
+            //Correct coordinates if parent is a frame window (border adjustment)
             //TODO: Not quite right (Solitaire child window placement slightly wrong)
-            if (HAS_DLGFRAME(window->getStyle(), window->getExStyle() ))
-            {
-                x += GetSystemMetrics(SM_CXDLGFRAME);
-                y -= GetSystemMetrics(SM_CYDLGFRAME);
-            }
-            else
-            {
-                if (HAS_THICKFRAME(window->getStyle()))
+            if (window->isFrameWindow() && !(fuFlags & SWP_NOMOVE)) {
+                if (HAS_DLGFRAME(window->getStyle(), window->getExStyle() ))
                 {
-                    x += GetSystemMetrics(SM_CXFRAME);
-                    y -= GetSystemMetrics(SM_CYFRAME);
+                    x += GetSystemMetrics(SM_CXDLGFRAME);
+                    y -= GetSystemMetrics(SM_CYDLGFRAME);
                 }
-                if (window->getStyle() & WS_BORDER)
+                else
                 {
-                    x += GetSystemMetrics(SM_CXBORDER);
-                    y -= GetSystemMetrics(SM_CYBORDER);
+                    if (HAS_THICKFRAME(window->getStyle()))
+                    {
+                        x += GetSystemMetrics(SM_CXFRAME);
+                        y -= GetSystemMetrics(SM_CYFRAME);
+                    }
+                    else
+                    if (window->getStyle() & WS_BORDER)
+                    {
+                        x += GetSystemMetrics(SM_CXBORDER);
+                        y -= GetSystemMetrics(SM_CYBORDER);
+                    }
                 }
             }
@@ -1615 +1653 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32Window::BringWindowToTop()
-{
-  return SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE );
-}
-//******************************************************************************
-//******************************************************************************
 HWND Win32Window::GetActiveWindow()
 {