Changeset 6783 for trunk/src

Timestamp:

Sep 22, 2001, 8:21:01 PM (24 years ago)

Author:

sandervl

Message:

focus/activation fixes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (6 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.147 2001-09-19 15:39:49 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.148 2001-09-22 18:20:59 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -803 +803 @@
         }
 
-        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
-//            goto RunDefWndProc;
-            goto RunDefFrameWndProc;
-
         if(!win32wnd->CanReceiveSizeMsgs())
             break;
@@ -899 +895 @@
 
             ret = 0xf;
+        }
+adjustend:
+        //The next part needs to be done for top-level windows only
+        if(!((win32wnd->getStyle() & (WS_POPUP_W|WS_CHILD_W)) == WS_CHILD_W)) 
+        {
             //Setting these flags is necessary to avoid activation/focus problems
             if(ulFlags & SWP_DEACTIVATE) {
@@ -918 +919 @@
                 else
                 {
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, FID_CLIENT));
-    
+                    HWND hwndFocusSave = WinQueryWindowULong(hwnd, QWL_HWNDFOCUSSAVE);
+                    if(!WinIsWindow(hab, hwndFocusSave)) {
+                        hwndFocusSave = WinWindowFromID(hwnd, FID_CLIENT);
+                        WinSetWindowULong(hwnd, QWL_HWNDFOCUSSAVE, hwndFocusSave);
+                    }
+                    dprintf(("WM_ADJUSTWINDOWPOS: hwndFocusSave %x %x", OS2ToWin32Handle(hwndFocusSave), hwndFocusSave));
+                    WinSetFocus(HWND_DESKTOP, hwndFocusSave);
+
                     ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
                     ulFrameFlags &= ~FF_NOACTIVATESWP;
@@ -925 +932 @@
                 }
             }
-            rc = (MRESULT)ret;
-            break;
-        }
-        //Setting these flags is necessary to avoid activation/focus problems
-        if(ulFlags & SWP_DEACTIVATE) {
-            ret |= AWP_DEACTIVATE;
-        }
-        if(ulFlags & SWP_ACTIVATE) 
-        {
-            ULONG ulFrameFlags;
-
-            if(ulFlags & SWP_ZORDER) {
-                ulFrameFlags = WinQueryWindowUShort(hwnd, QWS_FLAGS);
-                WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags | FF_NOACTIVATESWP);
-            }
-
-            if(!(ulFlags & SWP_SHOW))
+        }
+        else {
+            if(ulFlags & (SWP_ACTIVATE|SWP_FOCUSACTIVATE)) 
             {
-                ret |= AWP_ACTIVATE;
-            }
-            else
+                win32wnd->MsgChildActivate(TRUE);
+                if(fOS2Look) {
+                    dprintf(("TBM_QUERYHILITE returned %d", WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_QUERYHILITE, 0, 0)));
+                    WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, (MPARAM)1, 0);
+                }
+            }
+            else 
+            if(ulFlags & (SWP_DEACTIVATE|SWP_FOCUSDEACTIVATE)) 
             {
-                WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, FID_CLIENT));
-
-                ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
-                ulFrameFlags &= ~FF_NOACTIVATESWP;
-                WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
-            }
-        }
+                win32wnd->MsgChildActivate(FALSE);
+                if(fOS2Look) {
+                    dprintf(("TBM_QUERYHILITE returned %d", WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_QUERYHILITE, 0, 0)));
+                    WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, 0, 0);
+                }
+            }
+        }
+        dprintf(("WM_ADJUSTWINDOWPOS ret %x", ret));
         rc = (MRESULT)ret;
         break;
@@ -983 +982 @@
             if(pswp->fl & SWP_HIDE) {
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
-            }
+            } 
             goto RunDefFrameWndProc;
         }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.283 2001-09-20 12:57:15 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.284 2001-09-22 18:21:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -78 +78 @@
 //For quick lookup of current process id
 static ULONG currentProcessId = -1;
+static int iF10Key = 0;
+static int iMenuSysKey = 0;
 
 //******************************************************************************
@@ -994 +996 @@
     else SendInternalMessageA(WM_ACTIVATEAPP, 0, threadidhwnd);  //deactivate; specify thread id of other process
     return rc;
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32BaseWindow::MsgChildActivate(BOOL fActivate)
+{
+    //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
+    if(fDestroyWindowCalled) {
+        return 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)
+    {
+        dprintf(("WARNING: WM_NCACTIVATE return code = FALSE -> cancel processing"));
+        return 0;
+    }
+    /* child windows get a WM_CHILDACTIVATE message */
+    if((getStyle() & (WS_CHILD | WS_POPUP)) == WS_CHILD )
+    {
+        if(fActivate) {//WM_CHILDACTIVE is for activation only
+            SendInternalMessageA(WM_CHILDACTIVATE, 0, 0L);
+        }
+        return 0;
+    }
+    DebugInt3();
+    return 0;
 }
 //******************************************************************************
@@ -1733 +1763 @@
 
     case WM_SYSKEYDOWN:
-        if(wParam == VK_F4) /* try to close the window */
-        {
-            Win32BaseWindow *window = GetWindowFromHandle(GetTopParent());
-            if(window && !(window->getClass()->getStyle() & CS_NOCLOSE))
-                PostMessageA(window->getWindowHandle(), WM_SYSCOMMAND, SC_CLOSE, 0);
-            if(window) RELEASE_WNDOBJ(window);
-            return 0;
-        }
+    {
+        if( HIWORD(lParam) & KEYDATA_ALT )
+        {
+            /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */
+              if( wParam == VK_MENU && !iMenuSysKey )
+                iMenuSysKey = 1;
+              else
+                iMenuSysKey = 0;
+            
+            iF10Key = 0;
+
+            if( wParam == VK_F4 )       /* try to close the window */
+            {
+                HWND top = GetTopWindow();
+                if (!(GetClassLongW( top, GCL_STYLE ) & CS_NOCLOSE))
+                    PostMessageW( top, WM_SYSCOMMAND, SC_CLOSE, 0 );
+            }
+        } 
+        else if( wParam == VK_F10 )
+                iF10Key = 1;
+             else
+                if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000))
+                    SendMessageW(WM_SYSCOMMAND, SC_KEYMENU, VK_SPACE );
 
         Win32BaseWindow *siblingWindow;
@@ -1779 +1824 @@
 
         return 0;
-
-#if 0 //CB: todo: MSDN docu: Windown handles these messages and not WM_SYSCHAR (the code below doesn't work)
-    case WM_KEYDOWN:
+    }
+
     case WM_KEYUP:
-    case WM_SYSKEYDOWN:
     case WM_SYSKEYUP:
-#endif
+        /* Press and release F10 or ALT */
+        if (((wParam == VK_MENU) && iMenuSysKey) ||
+            ((wParam == VK_F10) && iF10Key))
+              ::SendMessageW( GetTopWindow(), WM_SYSCOMMAND, SC_KEYMENU, 0L );
+        iMenuSysKey = iF10Key = 0;
+        break;
 
     case WM_SYSCHAR:
     {
-        int iMenuSysKey = 0;
+        iMenuSysKey = 0;
         if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
         {
@@ -1801 +1849 @@
                         break;
                 if (wParam == VK_SPACE && (getStyle() & WS_CHILD)) {
-                        getParent()->SendMessageA(Msg, wParam, lParam );
+                        ::SendMessageW(GetParent(), Msg, wParam, lParam );
                 }
                 else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.125 2001-09-19 15:39:50 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.126 2001-09-22 18:21:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -140 +140 @@
          ULONG  MsgPosChanged(LPARAM lp);
          ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
+         ULONG  MsgChildActivate(BOOL fActivate);
          ULONG  MsgSetFocus(HWND hwnd);
          ULONG  MsgKillFocus(HWND hwnd);

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.106 2001-09-19 15:39:52 sandervl Exp $ */
+/* $Id: window.cpp,v 1.107 2001-09-22 18:21:01 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -427 +427 @@
 BOOL WIN32API BringWindowToTop(HWND hwnd)
 {
+    dprintf(("BringWindowToTop %x", hwnd));
     return SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE );
 }