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

Timestamp:

Oct 31, 2009, 8:56:51 PM (16 years ago)

Author:

vladest

Message:

1. Remove setting up Windows codepage for ODIN PM session. This is incorrect. Fixed umlaut problem
2. Textinput improves. Attempt to add deadchars support

File:

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

trunk/src/user32/pmwindow.cpp

@@ -152 +152 @@
 // We make sure PM is up and running for our purposes and init the existing
 // thread 0.
-//******************************************************************************
+//******************************************************************************
 BOOL InitPM()
 {
@@ -198 +198 @@
     hookInit(hab);
 
-    BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
-    dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
+    //BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
+    //dprintf(("InitPM: WinSetCP was %s OK", rc ? " " : "not "));
 
     /* IM instace is created per message queue, that is, thread */
@@ -935 +935 @@
          */
         if (WINWM_KEYDOWN == pWinMsg->message &&
-            (SHORT1FROMMP(mp1) & KC_CHAR) &&
-            ((pWinMsg->wParam >= 0x30 && pWinMsg->wParam <= 0x5A) ||
-            pWinMsg->wParam == 0x20))
+            (((SHORT1FROMMP(mp1) & KC_CHAR) &&
+             !(SHORT1FROMMP(mp1) & KC_VIRTUALKEY)) ||
+            (SHORT1FROMMP(mp1) & KC_DEADKEY)))
         {
             MSG extramsg;
@@ -943 +943 @@
             extramsg.message = WINWM_CHAR;
             extramsg.wParam = (ULONG)mp2;
+            if(SHORT1FROMMP(mp1) & KC_DEADKEY)
+            {
+                extramsg.message++;  //WM_DEADCHAR/WM_SYSDEADCHAR
+            }
+            
             win32wnd->MsgChar(&extramsg);
         }