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

Timestamp:

Oct 6, 2009, 1:01:18 PM (16 years ago)

Author:

vladest

Message:

1. Character input implemented
2. Correct HAND icon added

File:

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

trunk/src/user32/pmwindow.cpp

@@ -923 +923 @@
 
     case WM_CHAR:
-        dprintf(("OS2: WM_CHAR %x %x %x, %x %x focus wnd %x", win32wnd->getWindowHandle(), mp1, mp2, pWinMsg->wParam, pWinMsg->lParam, WinQueryFocus(HWND_DESKTOP)));
+        dprintf(("OS2: WM_CHAR %x %x %x, %x %x msg: %x focus wnd %x", win32wnd->getWindowHandle(), mp1, mp2, pWinMsg->wParam, pWinMsg->lParam, pWinMsg->message, WinQueryFocus(HWND_DESKTOP)));
         win32wnd->MsgChar(pWinMsg);
+        /*
+         * now, we need to send WM_CHAR message
+         * to inform Win32 window that an char was input
+         * We ignoring wm_char sending in case of Ctrl or Alt pressed
+         * Also we
+         */
+        /* sending only after WINWM_KEYDOWN */
+        /* checking for alphanum chars and number. did I miss something?
+         */
+        if (WINWM_KEYDOWN == pWinMsg->message &&
+            (SHORT1FROMMP(mp1) & KC_CHAR) &&
+            (pWinMsg->wParam >= 0x30 && pWinMsg->wParam <= 0x5A) ||
+            pWinMsg->wParam == 0x20)
+        {
+            MSG extramsg;
+            memcpy(&extramsg, pWinMsg, sizeof(MSG));
+            extramsg.message = WINWM_CHAR;
+            extramsg.wParam = (ULONG)mp2;
+            win32wnd->MsgChar(&extramsg);
+        }
+
         break;
 
@@ -1440 +1461 @@
         break;
     }
-        
+
         case WM_CHAR:
                 {