Changeset 9791 for trunk/src

Timestamp:

Feb 13, 2003, 11:12:27 AM (23 years ago)

Author:

sandervl

Message:

Handle SetFocus(0) correctly: keystrokes are converted into WM_SYSKEYDOWN/(WM_SYSCHAR)/WM_SYSKEYUP messages

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (4 diffs)
• oslibmsgtranslate.cpp (modified) (7 diffs)
• user32api.h (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)
• win32wbasenonclient.cpp (modified) (3 diffs)
• window.cpp (modified) (6 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.64 2003-01-03 16:35:54 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.65 2003-02-13 10:12:24 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -48 +48 @@
 #include <winscan.h>
 #include <winkeyboard.h>
+#include "user32api.h"
 
 #define DBG_LOCALLOG    DBG_oslibmsg
@@ -265 +266 @@
         teb->o.odin.fTranslated = FALSE;
         memcpy(pMsg, &teb->o.odin.msgWCHAR, sizeof(MSG));
+
+        //After SetFocus(0), all keystrokes are converted in WM_SYS*
+        if(pMsg->message == WINWM_CHAR && fIgnoreKeystrokes) {
+            pMsg->message = WINWM_SYSCHAR;
+        }
+
         teb->o.odin.os2msg.msg  = 0;
         teb->o.odin.os2msg.hwnd = 0;
@@ -423 +430 @@
         }
         memcpy(pMsg, &teb->o.odin.msgWCHAR, sizeof(MSG));
+        //After SetFocus(0), all keystrokes are converted in WM_SYS*
+        if(pMsg->message == WINWM_CHAR && fIgnoreKeystrokes) {
+            pMsg->message = WINWM_SYSCHAR;
+        }
+
 
         if(!IsWindow(pMsg->hwnd)) {

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.99 2003-02-06 20:28:38 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.100 2003-02-13 10:12:25 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -38 +38 @@
 #include <winkeyboard.h>
 #include "hook.h"
+#include "user32api.h"
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate
@@ -662 +663 @@
             // adjust our WM_CHAR code
             extramsg.lParam = 0x01460001;
-            extramsg.message = WINWM_CHAR;
+
+            //After SetFocus(0), all keystrokes are converted in WM_SYS*
+            extramsg.message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR : WINWM_CHAR;
+
             setThreadQueueExtraCharMessage(teb, &extramsg);
             // and finally adjust our WM_KEYDOWN code
@@ -712 +716 @@
                     memcpy(&extramsg, winMsg, sizeof(MSG));
     
-                    extramsg.message = WINWM_CHAR;
+                    //After SetFocus(0), all keystrokes are converted in WM_SYS*
+                    extramsg.message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR : WINWM_CHAR;
 
                     // insert message into the queue
@@ -729 +734 @@
                     memcpy(&extramsg, winMsg, sizeof(MSG));
     
-                    extramsg.message = WINWM_CHAR;
+                    //After SetFocus(0), all keystrokes are converted in WM_SYS*
+                    extramsg.message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR : WINWM_CHAR;
 
                     // insert message into the queue
@@ -766 +772 @@
             winMsg->lParam |= WIN_KEY_ALTHELD;
           }
+        }
+        //After SetFocus(0), all keystrokes are converted in WM_SYS*
+        if(fIgnoreKeystrokes) {
+            if(winMsg->message == WINWM_KEYDOWN) {
+                winMsg->message = WINWM_SYSKEYDOWN;
+            }
+            else 
+            if(winMsg->message == WINWM_KEYUP) {
+                winMsg->message = WINWM_SYSKEYUP;
+            }
         }
         break;
@@ -992 +1008 @@
 
 
-      if(msg->message >= WINWM_SYSKEYDOWN) 
+      //After SetFocus(0), all keystrokes are converted in WM_SYS*
+      if(msg->message >= WINWM_SYSKEYDOWN || fIgnoreKeystrokes) 
         extramsg.message = WINWM_SYSCHAR;
       else    

trunk/src/user32/user32api.h

@@ -1 @@
-/* $Id: user32api.h,v 1.1 2002-08-15 10:14:30 sandervl Exp $ */
+/* $Id: user32api.h,v 1.2 2003-02-13 10:12:25 sandervl Exp $ */
 //Internal user32 functions
 
@@ -7 +7 @@
 HWND WINAPI GetAncestor( HWND hwnd, UINT type );
 
+//Notify that focus has changed (necessary for SetFocus(0) handling)
+void SetFocusChanged();
+
+extern BOOL fIgnoreKeystrokes;
+
 #endif

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.357 2003-02-11 14:20:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.358 2003-02-13 10:12:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1097 +1097 @@
 ULONG Win32BaseWindow::MsgSetFocus(HWND hwnd)
 {
+    //Notify that focus has changed (necessary for SetFocus(0) handling)
+    SetFocusChanged();
+
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
@@ -1113 +1116 @@
 ULONG Win32BaseWindow::MsgKillFocus(HWND hwnd)
 {
+    //Notify that focus has changed (necessary for SetFocus(0) handling)
+    SetFocusChanged();
+
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
@@ -1183 +1189 @@
                     if (win32top) {
                         //Must use client window handle (not frame!!)
-                        OSLibWinSetFocus(win32top->getOS2WindowHandle());
+                        SetFocus(win32top->getWindowHandle());
                         RELEASE_WNDOBJ(win32top);
                     }

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.47 2003-01-03 16:35:57 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.48 2003-02-13 10:12:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -270 +270 @@
                 //SvL: Calling topparent->SetActiveWindow() causes focus problems
                 ::SetActiveWindow(hwndTopParent);
-////            OSLibWinSetFocus(topparent->getOS2WindowHandle());
+////            SetFocus(topparent->getWindowHandle());
             }
             if (GetActiveWindow() == hwndTopParent)
@@ -1071 +1071 @@
     dprintf(("DoNCPaint %x %x %d", getWindowHandle(), clip, suppress_menupaint));
 
-    if ( getStyle() & WS_MINIMIZE ||
+    if ( (getStyle() & WS_MINIMIZE) ||
          !IsWindowVisible( getWindowHandle() )) {
         return; /* Nothing to do */
-    }
+   }
 
     rect.top    = rect.left = 0;

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.130 2003-01-02 17:02:06 sandervl Exp $ */
+/* $Id: window.cpp,v 1.131 2003-02-13 10:12:27 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -748 +748 @@
 }
 //******************************************************************************
+BOOL fIgnoreKeystrokes = FALSE;
+//******************************************************************************
+void SetFocusChanged()
+{
+    //Focus has changed; invalidate SetFocus(0) state
+    fIgnoreKeystrokes = FALSE;
+}
+//******************************************************************************
 //******************************************************************************
 HWND WIN32API SetFocus(HWND hwnd)
@@ -762 +770 @@
         DebugInt3();
         return 0;
+    }
+    //Special case; SetFocus(0) tells Windows to ignore keystrokes. Pressing
+    //a key now generates WM_SYSKEYDOWN/(WM_SYSCHAR)/WM_SYSKEYUP instead
+    //of WM_KEYDOWN/(WM_CHAR)/WM_KEYUP
+    //WM_KILLFOCUS is sent to the window that currently has focus
+    if(hwnd == 0) {
+        lastFocus_W = GetFocus();
+        if(lastFocus_W == 0) return 0;  //nothing to do
+
+        if(HOOK_CallHooksA(WH_CBT, HCBT_SETFOCUS, 0, (LPARAM)lastFocus_W)) {
+            dprintf(("hook cancelled SetFocus call!"));
+            return 0;
+        }
+        SendMessageA(lastFocus_W, WM_KILLFOCUS, 0, 0);
+
+        fIgnoreKeystrokes = TRUE;
+
+        return lastFocus_W;
     }
 
@@ -820 +846 @@
         dprintf(("USER32: Delay SetFocus call!"));
         teb->o.odin.hwndFocus = hwnd;
-        //mp1 = win32 window handle
-        //mp2 = top parent if activation required
-        OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, (activate) ? hwndTopParent : 0);
+
+        //If keystrokes were ignored and focus is set to the old focus window, then
+        //PM won't send us a WM_SETFOCUS message. (as we don't inform PM for SetFocus(0))
+        if(fIgnoreKeystrokes && lastFocus_W == hwnd) {
+            dprintf(("Manually send WM_SETFOCUS; real focus window hasn't changed"));
+            SendMessageA(lastFocus_W, WM_SETFOCUS, 0, 0);
+        }
+        else {
+            //mp1 = win32 window handle
+            //mp2 = top parent if activation required
+            OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, (activate) ? hwndTopParent : 0);
+        }
         RELEASE_WNDOBJ(window);
         return lastFocus_W;
@@ -832 +867 @@
     ret = (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
     RELEASE_WNDOBJ(window);
+
+    //If keystrokes were ignored and focus is set to the old focus window, then
+    //PM won't send us a WM_SETFOCUS message. (as we don't inform PM for SetFocus(0))
+    if(fIgnoreKeystrokes && lastFocus_W == hwnd) {
+        dprintf(("Manually send WM_SETFOCUS; real focus window hasn't changed"));
+        SendMessageA(lastFocus_W, WM_SETFOCUS, 0, 0);
+    }
+
+    fIgnoreKeystrokes = FALSE;
     return ret;
 }
@@ -844 +888 @@
     if(teb == NULL) {
         DebugInt3();
+        return 0;
+    }
+    //If keystrokes are ignored (SetFocus(0)), then return 0
+    if(fIgnoreKeystrokes) {
+        dprintf(("GetFocus; returning 0 after SetFocus(0) call"));
         return 0;
     }