Changeset 10443 for trunk/src/kernel32/kbdhook.cpp

Timestamp:

Feb 10, 2004, 4:36:04 PM (22 years ago)

Author:

sandervl

Message:

Rewrote keyboard hook handler to post messages and swallow the one it gets from PM

File:

• trunk/src/kernel32/kbdhook.cpp (modified) (6 diffs)

trunk/src/kernel32/kbdhook.cpp

@@ -1 @@
-/* $Id: kbdhook.cpp,v 1.1 2004-01-12 09:55:25 sandervl Exp $ */
+/* $Id: kbdhook.cpp,v 1.2 2004-02-10 15:36:04 sandervl Exp $ */
 /*
  * OS/2 native Presentation Manager hooks
@@ -211 +211 @@
                // and won't translate the message to anything else.
 
-               pqmsg->msg = WM_CHAR_SPECIAL;
-
-               break;
+               WinPostMsg(pqmsg->hwnd, WM_CHAR_SPECIAL, pqmsg->mp1, pqmsg->mp2);
+               return TRUE;
 
         //
@@ -253 +252 @@
 
                 flags = SHORT1FROMMP(pqmsg->mp1);
-
-                pqmsg->msg = WM_CHAR_SPECIAL;
 
                 if (flags & KC_KEYUP)
@@ -267 +264 @@
                       mp1 |= (KC_ALT | KC_KEYUP | KC_VIRTUALKEY | KC_SCANCODE);
                       mp2  = (VK_CTRL << 16);           //virtual keycode
-                      pqmsg->msg = WM_CHAR_SPECIAL_ALTGRCONTROL;
-                      pqmsg->mp1 = (MPARAM)mp1;
-                      pqmsg->mp2 = (MPARAM)mp2;
+                      WinPostMsg(msg.hwnd, WM_CHAR_SPECIAL_ALTGRCONTROL, (MPARAM)mp1, (MPARAM)mp2);
 
                       //and finally, post the AltGr WM_CHAR message
                       WinPostMsg(msg.hwnd, WM_CHAR_SPECIAL, msg.mp1, msg.mp2);
                   }
-                  //else do nothing
+                  else {
+                      WinPostMsg(pqmsg->hwnd, WM_CHAR_SPECIAL, pqmsg->mp1, pqmsg->mp2);
+                  }
                }
                else
@@ -287 +284 @@
                       mp1 |= (KC_KEYUP | KC_VIRTUALKEY | KC_SCANCODE);
                       mp2  = (VK_CTRL << 16);           //virtual keycode
-                      pqmsg->msg = WM_CHAR_SPECIAL_ALTGRCONTROL;
-                      pqmsg->mp1 = (MPARAM)mp1;
-                      pqmsg->mp2 = (MPARAM)mp2;
+
+                      WinPostMsg(pqmsg->hwnd, WM_CHAR_SPECIAL_ALTGRCONTROL, (MPARAM)mp1, (MPARAM)mp2);
                   }
                   //send left control key down message
@@ -305 +301 @@
                   {
                       //translate this message into control key down
-                      pqmsg->msg = WM_CHAR_SPECIAL_ALTGRCONTROL;
-                      pqmsg->mp1 = (MPARAM)mp1;
-                      pqmsg->mp2 = (MPARAM)mp2;
+                      WinPostMsg(pqmsg->hwnd, WM_CHAR_SPECIAL_ALTGRCONTROL, (MPARAM)mp1, (MPARAM)mp2);
                   }
                   //and finally, post the AltGr WM_CHAR message
                   WinPostMsg(msg.hwnd, WM_CHAR_SPECIAL, msg.mp1, msg.mp2);
               }
-              break;
+              return TRUE;
            }
         }