Changeset 6706 for trunk/src

Timestamp:

Sep 15, 2001, 11:16:09 AM (24 years ago)

Author:

sandervl

Message:

focus/activation changes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (13 diffs)
• win32wbase.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.143 2001-08-09 08:45:41 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.144 2001-09-15 09:16:08 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -799 +799 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
-            goto RunDefWndProc;
+//            goto RunDefWndProc;
+            goto RunDefFrameWndProc;
 
         if(!win32wnd->CanReceiveSizeMsgs())
@@ -924 +925 @@
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
             }
+
             if(pswp->fl & SWP_ACTIVATE)
             {
@@ -930 +932 @@
                 {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-                    if(fOS2Look) {
-                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(TRUE), 0);
-                    }
                 }
             }
@@ -942 +941 @@
                 {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-                    if(fOS2Look) {
-                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(FALSE), 0);
-                    }
                 }
             }
-            goto RunDefWndProc;
+//            goto RunDefWndProc;
+            goto RunDefFrameWndProc;
         }
 
@@ -1087 +1084 @@
              {
                 WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-                if(fOS2Look) {
-                    WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(TRUE), 0);
-                }
              }
         }
@@ -1099 +1093 @@
             {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-                    if(fOS2Look) {
-                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(FALSE), 0);
-                    }
             }
         }
@@ -1216 +1207 @@
 #ifdef DEBUG
     case WM_QUERYFOCUSCHAIN:
-        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2));
+        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0));
 
         RestoreOS2TIB();
         rc = pfnFrameWndProc(hwnd, msg, mp1, mp2);
         SetWin32TIB();
-        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2, rc));
+        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0, (rc) ? OS2ToWin32Handle((DWORD)rc) : 0));
         break;
 //        goto RunDefFrameWndProc;
@@ -1234 +1225 @@
         USHORT fsFocusChange = SHORT2FROMMP(mp2);
 
-        dprintf(("PMFRAME:WM_FOCUSCHANGE %x %x %x %x", win32wnd->getWindowHandle(), hwndFocus, usSetFocus, fsFocusChange));
+        dprintf(("PMFRAME:WM_FOCUSCHANGE %x %x (%x) %x %x", win32wnd->getWindowHandle(), OS2ToWin32Handle(hwndFocus), hwndFocus, usSetFocus, fsFocusChange));
         goto RunDefFrameWndProc;
     }
 #endif
+
+    case WM_SETFOCUS:
+    {
+        dprintf(("PMFRAME: WM_SETFOCUS %x %x", win32wnd->getWindowHandle(), hwnd));
+        goto RunDefFrameWndProc;
+    }
 
     case WM_ACTIVATE:
@@ -1244 +1241 @@
         USHORT flags = WinQueryWindowUShort(hwnd,QWS_FLAGS);
 
-        dprintf(("PMFRAME: WM_ACTIVATE %x %x %x", hwnd, mp1, mp2));
+        dprintf(("PMFRAME: WM_ACTIVATE %x %x %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle((DWORD)mp2)));
         if (win32wnd->IsWindowCreated())
         {
-            WinSendMsg(WinWindowFromID(hwnd,FID_CLIENT),WM_ACTIVATE,mp1,mp2);
+            WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
             if(fOS2Look) {
+                dprintf(("TBM_QUERYHILITE returned %d", WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_QUERYHILITE, 0, 0)));
                 WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, mp1, 0);
             }
-            WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
+            WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, mp1, mp2);
 
             //CB: show owner behind the dialog
@@ -1284 +1282 @@
         WinShowWindow(win32wnd->getOS2WindowHandle(), (BOOL)mp1);
         break;
-
-    case WM_SETFOCUS:
-    {
-        dprintf(("PMFRAME: WM_SETFOCUS %x %x", win32wnd->getWindowHandle(), hwnd));
-        goto RunDefFrameWndProc;
-    }
 
     case WM_QUERYTRACKINFO:
@@ -1410 +1402 @@
 
 RunDefFrameWndProc:
+    dprintf2(("RunDefFrameWndProc"));
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
@@ -1415 +1408 @@
 
 RunDefWndProc:
+    dprintf2(("RunDefWndProc"));
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.279 2001-08-02 14:50:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.280 2001-09-15 09:16:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -973 +973 @@
         threadidhwnd = O32_GetWindowThreadProcessId(hwndOS2Win, &procidhwnd);
     }
+#if 0
     //Warning: temporary hack to force focus to newly created window
     //RealPlayer 8 does not pass WM_ACTIVATE to defwindowproc and doesn't call
     //setfocus -> keyboard focus not set
     //TODO: Find real cause!!
-    if(GetFocus() == 0 && fActivate) {
-        if(!(getStyle() & WS_MINIMIZE))
-            SetFocus(getWindowHandle());
-    }
+//    if(GetFocus() == 0 && fActivate) {
+//        if(!(getStyle() & WS_MINIMIZE))
+//            SetFocus(getWindowHandle());
+//    }
     //Warning: temporary hack to force focus to newly created window
+    //SvL: No longer appears to happen with rp8
+#endif
 
     if(fActivate) {

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.103 2001-07-28 18:02:50 sandervl Exp $ */
+/* $Id: window.cpp,v 1.104 2001-09-15 09:16:09 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -810 +810 @@
     }
     teb->o.odin.hwndFocus = 0;
-    if(activate) {
-        SetActiveWindow(hwndTopParent);
-    }
+////    if(activate) {
+////        SetActiveWindow(hwndTopParent);
+////    }
     if(!IsWindow(hwnd)) return FALSE;       //abort if window destroyed
 
-    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, 0)) ? lastFocus_W : 0;
+    //Always activate window (3rd par) -> seems to fix activation problems
+    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, 1)) ? lastFocus_W : 0;
 }
 //******************************************************************************