Changeset 9791 for trunk/src/user32/oslibmsgtranslate.cpp

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

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (7 diffs)

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