Changeset 5713 for trunk/src

Timestamp:

May 15, 2001, 4:31:40 PM (24 years ago)

Author:

sandervl

Message:

SetFocus fix

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (5 diffs)
• oslibwin.cpp (modified) (14 diffs)
• pmwindow.cpp (modified) (7 diffs)
• win32wbase.cpp (modified) (3 diffs)
• window.cpp (modified) (5 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.50 2001-05-11 08:39:43 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.51 2001-05-15 14:31:38 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -192 +192 @@
   TEB             *teb = (TEB *)pTeb;
   BOOL             fWasDisabled = FALSE;
+  BOOL             fIsFrame = FALSE;
   int i;
 
@@ -198 +199 @@
     if(!win32wnd) {
         win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(os2Msg->hwnd);
+        if(win32wnd) {
+            fIsFrame = TRUE;
+        }
     }
 
@@ -276 +280 @@
       LONG      xDelta = pswp->cx - swpOld.cx;
 
+        if(!fIsFrame) goto dummymessage;
+
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) goto dummymessage;
 
@@ -294 +300 @@
         if (!win32wnd->CanReceiveSizeMsgs())    goto dummymessage;
 
-        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-/////                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
-/////                win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
-
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE))
+        {
                 teb->o.odin.wp.hwnd = win32wnd->getWindowHandle();
                 if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.92 2001-05-11 08:39:43 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.93 2001-05-15 14:31:38 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -153 +153 @@
 BOOL OSLibWinAlarm(HWND hwndDeskTop,ULONG flStyle)
 {
-  return WinAlarm(hwndDeskTop,flStyle);
+    return WinAlarm(hwndDeskTop,flStyle);
 }
 //******************************************************************************
@@ -159 +159 @@
 APIRET OSLibDosBeep(ULONG freg,ULONG dur)
 {
-  return DosBeep(freg,dur);
+    return DosBeep(freg,dur);
 }
 //******************************************************************************
@@ -165 +165 @@
 HWND OSLibWinQueryFocus(HWND hwndDeskTop)
 {
-  return WinQueryFocus(hwndDeskTop);
+    return WinQueryFocus(hwndDeskTop);
 }
 //******************************************************************************
@@ -171 +171 @@
 HWND OSLibWinWindowFromID(HWND hwndParent,ULONG id)
 {
-  return WinWindowFromID(hwndParent,id);
+    return WinWindowFromID(hwndParent,id);
 }
 //******************************************************************************
@@ -177 +177 @@
 BOOL OSLibWinSetFocus(HWND hwndDeskTop,HWND hwndNewFocus, BOOL activate)
 {
-  return WinFocusChange (hwndDeskTop, hwndNewFocus, activate ? FC_NOLOSEACTIVE : 0);
+    return WinFocusChange (hwndDeskTop, hwndNewFocus, activate ? 0 : FC_NOSETACTIVE);
 }
 //******************************************************************************
@@ -183 +183 @@
 BOOL OSLibWinIsChild (HWND hwnd, HWND hwndOf)
 {
-  return WinIsChild (hwnd, hwndOf);
+    return WinIsChild (hwnd, hwndOf);
 }
 //******************************************************************************
@@ -189 +189 @@
 ULONG OSLibGetWindowHeight(HWND hwnd)
 {
-  RECTL rect;
-
-  return (WinQueryWindowRect(hwnd,&rect)) ? rect.yTop-rect.yBottom:0;
+    RECTL rect;
+
+    return (WinQueryWindowRect(hwnd,&rect)) ? rect.yTop-rect.yBottom:0;
 }
 //******************************************************************************
@@ -197 +197 @@
 LONG OSLibWinQuerySysValue(LONG iSysValue)
 {
-  return WinQuerySysValue(HWND_DESKTOP,iSysValue);
+    return WinQuerySysValue(HWND_DESKTOP,iSysValue);
 }
 //******************************************************************************
@@ -203 +203 @@
 ULONG OSLibWinQueryDlgItemText(HWND hwndDlg,ULONG idItem,LONG cchBufferMax,char* pchBuffer)
 {
-  return WinQueryDlgItemText(hwndDlg,idItem,cchBufferMax,pchBuffer);
+    return WinQueryDlgItemText(hwndDlg,idItem,cchBufferMax,pchBuffer);
 }
 //******************************************************************************
@@ -209 +209 @@
 BOOL OSLibWinSetDlgItemText(HWND hwndDlg,ULONG idItem,char* pszText)
 {
-  return WinSetDlgItemText(hwndDlg,idItem,pszText);
+    return WinSetDlgItemText(hwndDlg,idItem,pszText);
 }
 //******************************************************************************
@@ -215 +215 @@
 BOOL OSLibWinQueryPointerPos(PPOINT pptlPoint)
 {
-  return WinQueryPointerPos(HWND_DESKTOP,(PPOINTL)pptlPoint);
+    return WinQueryPointerPos(HWND_DESKTOP,(PPOINTL)pptlPoint);
 }
 //******************************************************************************
@@ -221 +221 @@
 BOOL OSLibWinSetPointerPos(int x, int y)
 {
-  return WinSetPointerPos(HWND_DESKTOP, x, y);
+    return WinSetPointerPos(HWND_DESKTOP, x, y);
 }
 //******************************************************************************
@@ -227 +227 @@
 HWND OSLibWinQueryWindow(HWND hwnd, ULONG lCode)
 {
-  return WinQueryWindow(hwnd, lCode);
+    return WinQueryWindow(hwnd, lCode);
 }
 //******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.129 2001-05-12 08:25:56 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.130 2001-05-15 14:31:39 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -125 +125 @@
         (PFNWP)Win32FrameWindowProc,       /* Address of window procedure  */
         CS_FRAME,
-        FrameClassInfo.cbWindowData+NROF_WIN32WNDBYTES))
+        FrameClassInfo.cbWindowData))
     {
         dprintf(("WinRegisterClass Win32BaseWindow failed %x", WinGetLastError(hab)));
@@ -145 +145 @@
     DevCloseDC(hdc);
 
-    dprintf(("InitPM: Desktop (%d,%d)", ScreenWidth, ScreenHeight));
+    dprintf(("InitPM: Desktop (%d,%d) bpp %d", ScreenWidth, ScreenHeight, ScreenBitsPerPel));
     return TRUE;
 } /* End of main */
@@ -310 +310 @@
         //must delay this function call
         //mp1 = win32 window handle
-        //mp2 = activate flag
-        dprintf(("USER32: Delayed SetFocus %x %x call!", teb->o.odin.hwndFocus, mp1));
+        //mp2 = top parent if activation required
+        dprintf(("USER32: Delayed SetFocus %x %x %x call!", teb->o.odin.hwndFocus, mp1, mp2));
         if(teb->o.odin.hwndFocus) {
             win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
             if(win32wnd) {
-                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), (mp2) ? FC_NOLOSEACTIVE : 0);
+                 if(mp2) {
+                    SetActiveWindow((HWND)mp2);
+                 }
+                 if(!IsWindow(win32wnd->getWindowHandle())) break;       //abort if window destroyed
+                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), FC_NOSETACTIVE);
             }
             else DebugInt3();
@@ -578 +582 @@
     {
         //WM_CREATE handled during client window creation
+        dprintf(("PMFRAME: WM_CREATE %x"));
         goto RunDefFrameWndProc;
     }
@@ -584 +589 @@
     {
       RECTL rectl;
-
 
         HPS hps = WinBeginPaint(hwnd, NULL, &rectl);
@@ -1350 +1354 @@
 RunDefWndProc:
     RestoreOS2TIB();
-    //calling WinDefWindowProc here break Opera hotlist window (WM_ADJUSTWINDOWPOS)
+    //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
 //    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.255 2001-05-11 08:39:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.256 2001-05-15 14:31:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3138 +3138 @@
  BOOL rc;
 
-  dprintf(("Win32BaseWindow::EnableWindow %x %d", getWindowHandle(), fEnable));
-  //return true if previous state was disabled, else false (sdk docs)
-  rc = (getStyle() & WS_DISABLED) != 0;
-  if(rc && !fEnable) {
+    dprintf(("Win32BaseWindow::EnableWindow %x %d", getWindowHandle(), fEnable));
+    //return true if previous state was disabled, else false (sdk docs)
+    rc = (getStyle() & WS_DISABLED) != 0;
+    if(rc && !fEnable) {
         SendMessageA(WM_CANCELMODE, 0, 0);
-  }
-  OSLibWinEnableWindow(OS2HwndFrame, fEnable);
-  if(fEnable == FALSE) {
+    }
+    OSLibWinEnableWindow(OS2HwndFrame, fEnable);
+    if(fEnable == FALSE) {
         //SvL: No need to clear focus as PM already does this
         if(getWindowHandle() == GetCapture()) {
@@ -3151 +3151 @@
                 dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
         }
-  }
-  return rc;
+    }
+    return rc;
 }
 //******************************************************************************

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.97 2001-05-12 08:25:57 sandervl Exp $ */
+/* $Id: window.cpp,v 1.98 2001-05-15 14:31:40 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -39 +39 @@
 #include <heapstring.h>
 #include <winuser32.h>
+#include "hook.h"
 
 #define DBG_LOCALLOG    DBG_window
@@ -715 +716 @@
 HWND WIN32API SetFocus(HWND hwnd)
 {
- Win32BaseWindow *window;
+ Win32BaseWindow *window, *topparent;
+ Win32BaseWindow *oldfocuswnd;
  HWND lastFocus, lastFocus_W, hwnd_O;
  BOOL activate;
@@ -739 +741 @@
     else lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
 
-    activate  = ((hwnd_O == lastFocus) || OSLibWinIsChild (lastFocus, hwnd_O));
+    topparent = window->GetTopParent();
+    activate = FALSE;
     lastFocus_W = OS2ToWin32Handle (lastFocus);
-
-    dprintf(("SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
+    if(lastFocus_W) {
+         oldfocuswnd = Win32BaseWindow::GetWindowFromHandle(lastFocus_W);
+         if(lastFocus_W != hwnd && topparent != oldfocuswnd->GetTopParent()) {
+            activate = TRUE;
+         }
+    }
+    else activate = TRUE;
+
+    dprintf(("SetFocus %x (%x) -> %x (%x) act %d", lastFocus_W, lastFocus, hwnd, hwnd_O, activate));
+
+    if(HOOK_CallHooksA(WH_CBT, HCBT_SETFOCUS, hwnd, (LPARAM)lastFocus_W)) {
+        dprintf(("hook cancelled SetFocus call!"));
+        return 0;
+    }
 
     //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
@@ -750 +765 @@
         teb->o.odin.hwndFocus = hwnd;
         //mp1 = win32 window handle
-        //mp2 = activate flag
-        OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, activate);
+        //mp2 = top parent if activation required
+        OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, (activate) ? topparent->getWindowHandle() : 0);
         return lastFocus_W;
     }
     teb->o.odin.hwndFocus = 0;
-    return (OSLibWinSetFocus (OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
+    if(activate) {
+        SetActiveWindow(topparent->getWindowHandle());
+    }
+    if(!IsWindow(hwnd)) return FALSE;       //abort if window destroyed
+
+    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, 0)) ? lastFocus_W : 0;
 }
 //******************************************************************************