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

Timestamp:

Feb 27, 2010, 4:33:12 PM (15 years ago)

Author:

vladest

Message:

• Space character was not entered to lineedit. fixed
• added mouse buttons handling

File:

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

trunk/src/user32/pmwindow.cpp

@@ -875 +875 @@
         }
         if(win32wnd)
+        {
+            dprintf(("Mouse click: %x, msg: %x, mp1: %x, mp2: %x",
+                 pWinMsg->hwnd, pWinMsg->message, pWinMsg->wParam, pWinMsg->lParam));
             win32wnd->MsgButton(pWinMsg);
-
+        }
         rc = (MRESULT)TRUE;
         break;
@@ -940 +943 @@
         if (WINWM_KEYDOWN == pWinMsg->message &&
             (((SHORT1FROMMP(mp1) & KC_CHAR) &&
-             !(SHORT1FROMMP(mp1) & KC_VIRTUALKEY)) ||
-            (SHORT1FROMMP(mp1) & KC_DEADKEY)))
+              !(SHORT1FROMMP(mp1) & KC_VIRTUALKEY)) || (SHORT1FROMMP(mp1) & KC_DEADKEY)) ||
+            (SHORT1FROMMP(mp2) == 0x20) //special case for space
+           )
         {
             MSG extramsg;
             char cpfrom[10] = {0};
             char cpto[10] = {0};
-            ULONG       ulCpSize, ulCP;
-
-
+            ULONG  ulCpSize, ulCP, mp2l;
+
+            mp2l = (ULONG)mp2 & 0x0000FFFF;
             memcpy(&extramsg, pWinMsg, sizeof(MSG));
             extramsg.message = WINWM_CHAR;
@@ -954 +958 @@
             sprintf(cpfrom,"IBM-%d\0", ulCP);
             sprintf(cpto,"IBM-%d\0", GetDisplayCodepage());
-            if (cp2cp(cpfrom, cpto, (char*)&mp2, (char*)&extramsg.wParam, 1))
-                extramsg.wParam = (ULONG)mp2;
+            if (cp2cp(cpfrom, cpto, (char*)&mp2l, (char*)&extramsg.wParam, 1))
+                extramsg.wParam = (ULONG)mp2l;
 
             if(SHORT1FROMMP(mp1) & KC_DEADKEY)