Changeset 21344 for trunk/src/user32

Timestamp:

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

Author:

vladest

Message:

1. Character input implemented
2. Correct HAND icon added

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (2 diffs)
• user32rsrc.orc (modified) (1 diff)
• win32wbase.cpp (modified) (1 diff)
• winkeyboard.cpp (modified) (1 diff)

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:
                 {

trunk/src/user32/user32rsrc.orc

@@ -867 +867 @@
 #define OCR_HELP            32651  /* only defined in Odin */
 
-#if 1
 OCR_HAND CURSOR LOADONCALL DISCARDABLE
 {
-        '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01'
-        '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
-        '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00'
-        '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00'
-        '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0'
-        '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00'
-        '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0'
-        '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00'
-        '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00'
-        '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F'
-        'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF'
-        'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F'
-        'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF'
-        'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF'
-        'FF FF FF FF FF FF'
-}
-#endif
+        '00 00 02 00 01 00 20 20 00 00 07 00 00 00 30 01'
+        '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
+        '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 01 FF 00 00 01 FF 00 00 03 FF 80 00 03 FF'
+        '80 00 07 FF 80 00 07 FF C0 00 0F FF C0 00 0B FF'
+        'C0 00 1B FF C0 00 3B FF C0 00 33 FF C0 00 03 B6'
+        'C0 00 03 B6 80 00 03 B6 00 00 03 B0 00 00 03 80'
+        '00 00 03 80 00 00 03 80 00 00 03 80 00 00 03 80'
+        '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
+        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FC 00'
+        '7F FF FC 00 7F FF FC 00 7F FF F8 00 3F FF F8 00'
+        '3F FF F0 00 3F FF F0 00 1F FF E0 00 1F FF E0 00'
+        '1F FF C0 00 1F FF 80 00 1F FF 80 00 1F FF 88 00'
+        '1F FF F8 00 3F FF F8 00 7F FF F8 01 FF FF F8 0F'
+        'FF FF F8 3F FF FF F8 3F FF FF F8 3F FF FF F8 3F'
+        'FF FF FC 7F FF FF'
+}
 
 /////////////////////////////////////////////////////////////////////////////

trunk/src/user32/win32wbase.cpp

@@ -1559 +1559 @@
 {
 
-    dprintf(("DefWndProc: winmsg: %x for %x Msg %s", Msg, Win32Hwnd, GetMsgText(HIWORD(lParam))));
+    dprintf(("DefWndProc: winmsg: %x for %x Msg %s", Msg, Win32Hwnd, GetMsgText(/*HIWORD(lParam)*/Msg)));
 
     switch(Msg)

trunk/src/user32/winkeyboard.cpp

@@ -1638 +1638 @@
       if (uCode >= VK_A && uCode <= VK_Z) 
       {
-        return 'A' + uCode - VK_A;
+          return 'A' + uCode - VK_A;
       }
     break;