Changeset 1093 for trunk/src

Timestamp:

Sep 29, 1999, 11:16:32 AM (26 years ago)

Author:

sandervl

Message:

WM_ACTIVATE(APP) changes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (4 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wmdichild.cpp (modified) (2 diffs)
• win32wmdichild.h (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.11 1999-09-28 13:27:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.12 1999-09-29 09:16:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -379 +379 @@
     case WM_ACTIVATE:
     {
-      HWND hwndActivate = (HWND)mp1;
-
-        dprintf(("OS2: WM_ACTIVATE %x", hwnd));
+      HWND hwndActivate = (HWND)mp2;
+      BOOL fMinimized = FALSE;
+
+        dprintf(("OS2: WM_ACTIVATE %x %x", hwnd, hwndActivate));
         if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
@@ -387 +388 @@
                 hwndActivate = NULL;
         }
-        if(win32wnd->MsgActivate(1, hwndActivate)) {
+        if(WinQueryWindowULong(hwnd, QWL_STYLE) & WS_MINIMIZED)
+        {
+           fMinimized = TRUE;
+        }
+
+        if(win32wnd->MsgActivate(SHORT1FROMMP(mp1), fMinimized, Win32BaseWindow::OS2ToWin32Handle(hwndActivate))) {
                 goto RunDefWndProc;
         }
@@ -407 +413 @@
         }
         if((ULONG)mp2 == TRUE) {
-                rc = win32wnd->MsgSetFocus(hwndFocus);
-        }
-        else    rc = win32wnd->MsgKillFocus(hwndFocus);
+                rc = win32wnd->MsgSetFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
+        }
+        else    rc = win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
         if(rc) {
                 goto RunDefWndProc;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.19 1999-09-29 08:27:15 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.20 1999-09-29 09:16:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -914 +914 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::MsgActivate(BOOL fActivate, HWND hwnd)
-{
-    if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE)
+ULONG Win32BaseWindow::MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd)
+{
+ ULONG rc, curprocid, procidhwnd = -1, threadidhwnd = 0;
+
+    //According to SDK docs, if app returns FALSE & window is being deactivated,
+    //default processing is cancelled
+    //TODO: According to Wine we should proceed anyway if window is sysmodal
+    if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE && !fActivate)
     {
-        if(!fActivate) {
-            return 1;
-        }
-    }
-    return SendInternalMessageA(WM_ACTIVATE, (fActivate) ? WA_ACTIVE : WA_INACTIVE, hwnd);
+        return 0;
+    }
+    rc = SendInternalMessageA(WM_ACTIVATE, MAKELONG((fActivate) ? WA_ACTIVE : WA_INACTIVE, fMinimized), hwnd);
+
+    curprocid  = GetCurrentProcessId();
+    if(hwnd) {
+            threadidhwnd = GetWindowThreadProcessId(hwnd, &procidhwnd);
+    }
+
+    if(curprocid != procidhwnd && fActivate) {
+        SendInternalMessageA(WM_ACTIVATEAPP, 1, threadidhwnd);
+    }
+    return rc;
 }
 //******************************************************************************
@@ -1061 +1074 @@
 ULONG Win32BaseWindow::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, OS2ToWin32Handle (hwnd), 0);
+    return  SendInternalMessageA(WM_SETFOCUS, hwnd, 0);
 }
 //******************************************************************************
@@ -1071 +1080 @@
 ULONG Win32BaseWindow::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, OS2ToWin32Handle (hwnd), 0);
+    return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.9 1999-09-29 08:27:16 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.10 1999-09-29 09:16:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -72 +72 @@
          ULONG  MsgHitTest(ULONG x, ULONG y);
          ULONG  MsgSize(ULONG width, ULONG height, BOOL fMinimize, BOOL fMaximize);
-         ULONG  MsgActivate(BOOL fActivate, HWND hwnd);
+virtual  ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd);
          ULONG  MsgSetFocus(HWND hwnd);
          ULONG  MsgKillFocus(HWND hwnd);

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.1 1999-09-15 23:19:01 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.2 1999-09-29 09:16:32 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -55 +55 @@
 //******************************************************************************
 //******************************************************************************
+ULONG Win32MDIChildWindow::MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd)
+{
+ ULONG rc, curprocid, procidhwnd = -1, threadidhwnd = 0;
+
+    //According to SDK docs, if app returns FALSE & window is being deactivated,
+    //default processing is cancelled
+    //TODO: According to Wine we should proceed anyway if window is sysmodal
+    if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE && !fActivate)
+    {
+        return 0;
+    }
+    if(fActivate)
+    {
+         rc = SendInternalMessageA(WM_CHILDACTIVATE, MAKELONG((fActivate) ? WA_ACTIVE : WA_INACTIVE, fMinimized), hwnd);
+         curprocid  = GetCurrentProcessId();
+         if(hwnd) {
+                threadidhwnd = GetWindowThreadProcessId(hwnd, &procidhwnd);
+         }
+
+         if(curprocid != procidhwnd && fActivate) {
+            SendInternalMessageA(WM_ACTIVATEAPP, 1, threadidhwnd);
+         }
+         return rc;
+    }
+    else return 1;
+}
+//******************************************************************************
+//******************************************************************************
 LRESULT Win32MDIChildWindow::DefMDIChildProcA(UINT Msg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/user32/win32wmdichild.h

@@ -1 @@
-/* $Id: win32wmdichild.h,v 1.1 1999-09-15 23:19:01 sandervl Exp $ */
+/* $Id: win32wmdichild.h,v 1.2 1999-09-29 09:16:32 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -24 +24 @@
 virtual        ~Win32MDIChildWindow();
 
+virtual  ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd);
+
    static HWND  createChild(Win32MDIClientWindow *client, LPMDICREATESTRUCTA cs);
            void childGetMinMaxInfo(MINMAXINFO* lpMinMax);