Changeset 1671 for trunk/src/user32/pmwindow.cpp

Timestamp:

Nov 9, 1999, 8:23:17 PM (26 years ago)

Author:

sandervl

Message:

dprintf2 addition + Rene Pronk's mnemonics changes

File:

• trunk/src/user32/pmwindow.cpp (modified) (8 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.52 1999-11-08 13:44:14 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.53 1999-11-09 19:23:16 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -672 +672 @@
         ULONG flags = SHORT1FROMMP(mp1);
         BOOL keyWasPressed, fTranslated = FALSE, fRunDefWndProc = FALSE;
+
         char c;
 
@@ -679 +680 @@
 
         dprintf(("PM: WM_CHAR: %x %x %d %x", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), repeatCount, scanCode));
+        dprintf(("PM: WM_CHAR: %x", flags));
         // both WM_KEYUP & WM_KEYDOWN want a virtual key, find the right Win32 virtual key
         // given the OS/2 virtual key and OS/2 character
 
-        if (((SHORT1FROMMP (mp1) & KC_CHAR) == KC_CHAR) ||
-            ((SHORT1FROMMP (mp1) & KC_LONEKEY) == KC_LONEKEY))
+        //if (((SHORT1FROMMP (mp1) & KC_CHAR) == KC_CHAR) ||
+        //    ((SHORT1FROMMP (mp1) & KC_LONEKEY) == KC_LONEKEY))
+        c = 0;
+        if ((SHORT1FROMMP (mp1) & 0xFF) != 0)
         {
             c = SHORT1FROMMP (mp2);
@@ -705 +709 @@
 
 VirtualKeyFound:
+        dprintf (("VIRTUALKEYFOUND:(%x)", virtualKey));
 
         if(!(SHORT1FROMMP(mp1) & KC_ALT))
@@ -720 +725 @@
             else {
                 // send WM_KEYDOWN message
-                if (win32wnd->MsgKeyDown (repeatCount, scanCode, virtualKey, keyWasPressed))
+                if (win32wnd->MsgKeyDown (repeatCount, scanCode,
+                                          virtualKey, keyWasPressed))
                     fRunDefWndProc = TRUE;
             }
@@ -731 +737 @@
                 // send WM_SYSKEYUP message
 
+                dprintf(("PMWINDOW_WM_SYSKEYUP: vkey:(%x)", virtualKey));
                 if(win32wnd->MsgSysKeyUp (repeatCount, scanCode, virtualKey)) {
                     fRunDefWndProc = TRUE;
@@ -737 +744 @@
             else {
                 // send WM_SYSKEYDOWN message
+                dprintf(("PMWINDOW_WM_SYSKEYDOWN: vkey:(%x)", virtualKey));
                 if (win32wnd->MsgSysKeyDown (repeatCount, scanCode, virtualKey, keyWasPressed))
                     fRunDefWndProc = TRUE;
@@ -749 +757 @@
         //NOTE: These actually need to be posted so that the next message retrieved by GetMessage contains
         //      the newly generated WM_CHAR message.
-        if(fTranslated && !((flags & KC_KEYUP) == KC_KEYUP)) {//TranslatedMessage was called before DispatchMessage, so send WM_CHAR messages
+        if(fTranslated && !((flags & KC_KEYUP) == KC_KEYUP))
+        {//TranslatedMessage was called before DispatchMessage, so send WM_CHAR messages
             ULONG keyflags = 0, vkey = 0;
             ULONG fl = SHORT1FROMMP(mp1);