Changeset 4463 for trunk/src/user32/window.cpp

Timestamp:

Oct 9, 2000, 7:26:55 PM (25 years ago)

Author:

sandervl

Message:

mdi fix + ShowOwnedPopups implemented

File:

• trunk/src/user32/window.cpp (modified) (19 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.79 2000-10-08 20:05:29 sandervl Exp $ */
+/* $Id: window.cpp,v 1.80 2000-10-09 17:26:55 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -16 +16 @@
  *
  * TODO: Decide what to do about commands for OS/2 windows (non-Win32 apps)
+ * TODO: ShowOwnedPopups needs to be tested
+ *       GetLastActivePopup needs to be rewritten
+ *       ArrangeIconicWindows probably also
  *
  */
@@ -32 +35 @@
 #include "winicon.h"
 #include <win\winpos.h>
+#include <win\win.h>
 #include <heapstring.h>
 
@@ -289 +293 @@
     if(!window) {
         dprintf(("CreateMDIWindowW, window %x not found", hwndParent));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }
@@ -319 +323 @@
     }
     if(window->isDesktopWindow()) {
-        dprintf(("WARNING: Trying to destroy desktop window!"));
-        return FALSE;
+    dprintf(("WARNING: Trying to destroy desktop window!"));
+    return FALSE;
     }
     return window->DestroyWindow();
@@ -366 +370 @@
     }
     if(hwndNewParent == HWND_DESKTOP) {
-        hwndNewParent = GetDesktopWindow();
+    hwndNewParent = GetDesktopWindow();
     }
     else {
-        parent = Win32BaseWindow::GetWindowFromHandle(hwndNewParent);
-        if(!window) {
-                dprintf(("SetParent, parent %x not found", hwndNewParent));
-                SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-                return 0;
-        }
+        parent = Win32BaseWindow::GetWindowFromHandle(hwndNewParent);
+        if(!window) {
+            dprintf(("SetParent, parent %x not found", hwndNewParent));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+    }
     }
     dprintf(("SetParent %x %x", hwndChild, hwndNewParent));
@@ -402 +406 @@
 
     if(hwnd == HWND_DESKTOP) {
-        window = windowDesktop;
+    window = windowDesktop;
     }
     else {
-        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-        if(!window) {
-                dprintf(("GetTopWindow, window %x not found", hwnd));
-                SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-                return 0;
-        }
+        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(!window) {
+            dprintf(("GetTopWindow, window %x not found", hwnd));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+    }
     }
     hwndTop = window->GetTopWindow();
@@ -482 +486 @@
     if( IsWindow(hwnd) )
     {
-        WINDOWPLACEMENT wndpl;
-        UINT flags;
+    WINDOWPLACEMENT wndpl;
+    UINT flags;
 
         GetWindowPlacement(hwnd, &wndpl);
-        wndpl.length  = sizeof(wndpl);
-        wndpl.showCmd = showCmd;
-        wndpl.flags = 0;
-
-        if(lpPoint)
-        {
+    wndpl.length  = sizeof(wndpl);
+    wndpl.showCmd = showCmd;
+    wndpl.flags = 0;
+
+    if(lpPoint)
+    {
             wndpl.flags |= WPF_SETMINPOSITION;
-            wndpl.ptMinPosition = *lpPoint;
-        }
-        if(lpRect)
-        {
+        wndpl.ptMinPosition = *lpPoint;
+    }
+    if(lpRect)
+    {
             wndpl.rcNormalPosition = *lpRect;
-        }
+    }
         SetWindowPlacement( hwnd, &wndpl);
     }
@@ -747 +751 @@
     //convert from parent coordinates to screen (if necessary)
     if(window->getParent()) {
-         MapWindowPoints(window->getParent()->getWindowHandle(), 0, (PPOINT)pRect, 2);
+         MapWindowPoints(window->getParent()->getWindowHandle(), 0, (PPOINT)pRect, 2);
     }
 
@@ -807 +811 @@
     int rc = window->GetWindowTextW(lpsz, cch);
     if(rc) {
-        LPSTR astring = UnicodeToAsciiString(lpsz);
-        dprintf(("GetWindowTextW %x %s", hwnd, lpsz));
-        free(astring);
+        LPSTR astring = UnicodeToAsciiString(lpsz);
+        dprintf(("GetWindowTextW %x %s", hwnd, lpsz));
+        free(astring);
     }
     else dprintf(("GetWindowTextW %x returned %d", hwnd, rc));
@@ -848 +852 @@
     dprintf(("SetWindowTextW %x %s", hwnd, astring));
     free(astring);
-    if(hwnd == 0x68000008) {
-        int i;
-        i = 5;
-    }
 #endif
     return window->SetWindowTextW((LPWSTR)lpsz);
@@ -913 +913 @@
     if(style == 0 && menu == FALSE && exStyle == 0) {
         dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d) -> no change required", style, exStyle, menu, rect->left, rect->top, rect->right, rect->bottom));
-        return TRUE;    //nothing needs to be changed (VERIFIED in NT 4)
+    return TRUE;    //nothing needs to be changed (VERIFIED in NT 4)
     }
     dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d)\n", style, exStyle, menu, rect->left, rect->top, rect->right, rect->bottom));
     /* Correct the window style */
     if (!(style & (WS_POPUP | WS_CHILD)))  /* Overlapped window */
-        style |= WS_CAPTION;
+        style |= WS_CAPTION;
 
     //SvL: Include WS_POPUP -> otherwise HAS_THINFRAME is true for popup windows
@@ -949 +949 @@
     //Adjust rect inner (Win32BaseWindow::AdjustRectInner)
     if(!(style & WS_ICONIC)) {
-        if (exStyle & WS_EX_CLIENTEDGE)
-                InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
-
-        if (exStyle & WS_EX_STATICEDGE)
-                InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-
-        //SvL: scrollbars aren't checked *UNLESS* the style includes a border (any border)
+    if (exStyle & WS_EX_CLIENTEDGE)
+            InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
+
+    if (exStyle & WS_EX_STATICEDGE)
+            InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+    //SvL: scrollbars aren't checked *UNLESS* the style includes a border (any border)
         //     --> VERIFIED IN NT4, SP6 (fixes MFC apps with scrollbars + bar controls)
-        if(style & (WS_THICKFRAME|WS_BORDER|WS_DLGFRAME)) {
-                if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
-                if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
-        }
+    if(style & (WS_THICKFRAME|WS_BORDER|WS_DLGFRAME)) {
+            if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
+            if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
+    }
     }
 
@@ -986 +986 @@
     if(wndFrom != windowDesktop)
     {
-        window = wndFrom;
+    window = wndFrom;
         while(window)
         {
@@ -998 +998 @@
     if(wndTo != windowDesktop)
     {
-        window = wndTo;
+    window = wndTo;
         while(window)
         {
@@ -1066 +1066 @@
 
     if(!hwnd) {
-        return (TRUE);
+    return (TRUE);
     }
     wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
@@ -1552 +1552 @@
 BOOL WIN32API OpenIcon(HWND hwnd)
 {
-  dprintf(("USER32:  OpenIcon"));
+  dprintf(("USER32: OpenIcon %x", hwnd));
 
   if(!IsIconic(hwnd))
@@ -1560 +1560 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL WIN32API ShowOwnedPopups( HWND hwnd, BOOL  arg2)
-{
-    dprintf(("USER32:  ShowOwnedPopups (OPEN32: todo) %x", hwnd));
-    return O32_ShowOwnedPopups(Win32BaseWindow::Win32ToOS2Handle(hwnd), arg2);
+//SDK: Windows can only be shown with ShowOwnedPopups if they were previously
+//     hidden with the same api
+//TODO: -> needs testing
+//******************************************************************************
+BOOL WIN32API ShowOwnedPopups(HWND hwndOwner, BOOL fShow)
+{
+  Win32BaseWindow *window, *owner;
+  HWND hwnd;
+
+  owner = Win32BaseWindow::GetWindowFromHandle(hwndOwner);
+  if(!owner) {
+        dprintf(("ShowOwnedPopups, window %x not found", hwndOwner));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+  }
+  dprintf(("USER32: ShowOwnedPopups %x %d", hwnd, fShow));
+
+  hwnd = GetWindow(GetDesktopWindow(), GW_CHILD);
+  while(hwnd) {
+        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(window) {
+            if(window == owner && (window->getStyle() & WS_POPUP))
+            {
+                if(fShow) {
+                    if(window->getFlags() & WIN_NEEDS_SHOW_OWNEDPOPUP)
+                    {
+                        /*
+                        * In Windows, ShowOwnedPopups(TRUE) generates WM_SHOWWINDOW messages with SW_PARENTOPENING,
+                        * regardless of the state of the owner
+                        */
+                        SendMessageA(hwnd, WM_SHOWWINDOW, SW_SHOW, SW_PARENTOPENING);
+                        window->setFlags(window->getFlags() & ~WIN_NEEDS_SHOW_OWNEDPOPUP);
+                    }
+                }
+                else
+                {
+                    if(IsWindowVisible(hwnd))
+                    {
+                        /*
+                         * In Windows, ShowOwnedPopups(FALSE) generates WM_SHOWWINDOW messages with SW_PARENTCLOSING,
+                         * regardless of the state of the owner
+                         */
+                        SendMessageA(hwnd, WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING);
+                        window->setFlags(window->getFlags() | WIN_NEEDS_SHOW_OWNEDPOPUP);
+                    }
+                }
+            }
+        }
+        else    dprintf(("WARNING: window %x is not valid", hwnd));
+
+        hwnd = GetWindow(hwnd, GW_HWNDNEXT);
+  }
+  return TRUE;
 }
 //******************************************************************************
@@ -1586 +1634 @@
     hwnd = Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hWnd));
 
-    dprintf(("GetLastActivePopup %x returned %x", hWnd, hwnd));
+    dprintf(("GetLastActivePopup %x returned %x NOT CORRECTLY IMPLEMENTED", hWnd, hwnd));
     return hwnd;
 }