Changeset 10216 for trunk/src/user32/windowmsg.cpp

Timestamp:

Aug 8, 2003, 3:30:22 PM (22 years ago)

Author:

sandervl

Message:

KOM: WM_IME_CHAR generation + processing added for DBCS input

File:

• trunk/src/user32/windowmsg.cpp (modified) (12 diffs)

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.46 2003-08-04 17:01:58 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.47 2003-08-08 13:30:22 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -35 +35 @@
 #include "timer.h"
 
-#define DBG_LOCALLOG    DBG_windowmsg
+#define DBG_LOCALLOG    DBG_windowmsg
 #include "dbglocal.h"
 
@@ -50 +50 @@
     if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
     {
-        if (msg->lParam)
+    if (msg->lParam)
         {
 /*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
@@ -56 +56 @@
             /* before calling window proc, verify whether timer is still valid;
                there's a slim chance that the application kills the timer
-               between GetMessage and DispatchMessage API calls */
+           between GetMessage and DispatchMessage API calls */
             if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
                 return 0; /* invalid winproc */
 
-            return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
+        return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
@@ -76 +76 @@
     if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
     {
-        if (msg->lParam)
+    if (msg->lParam)
         {
 /*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
@@ -82 +82 @@
             /* before calling window proc, verify whether timer is still valid;
                there's a slim chance that the application kills the timer
-               between GetMessage and DispatchMessage API calls */
+           between GetMessage and DispatchMessage API calls */
             if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
                 return 0; /* invalid winproc */
 
-            return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd,
+        return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
@@ -100 +100 @@
          (msg->message >  WM_SYSKEYUP)||
          (msg->message == WM_CHAR)    ||
+#ifdef __WIN32OS2__
+         (msg->message == WM_DEADCHAR)||
+         (msg->message == WM_IME_CHAR) )
+#else
          (msg->message == WM_DEADCHAR) )
+#endif
     {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -448 +453 @@
         return 0;
 
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {
+        // always DBCS char
+        CHAR charA[ 2 ];
+
+        charA[ 0 ] = ( CHAR )( *pwparam >> 8 );
+        charA[ 1 ] = ( CHAR )*pwparam;
+
+        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )pwparam, 1);
+
+        return 0;
+    }
+#endif
+
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
@@ -725 +745 @@
         return 0;
 
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {   // always DBCS char
+        CHAR charA[ 2 ];
+
+        WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )pwparam, 1, ( LPSTR )charA, 2, 0, 0 );
+        *pwparam = ( charA[ 0 ] << 8 ) | charA[ 1 ];
+
+        return 0;
+    }
+#endif
+
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
@@ -862 +894 @@
     LRESULT result;
 
-#ifdef __WIN32OS2__
-    if( IsDBCSEnv() && msg == WM_CHAR )
-    {
-        static BYTE dbcsLead = 0;
-        WCHAR charA = wParam;
-        int size = dbcsLead ? 2 : 1;
-
-        if( dbcsLead )
-               charA = ( charA << 8 ) | dbcsLead;
-        else if( IsDBCSLeadByte( wParam ))
-        {
-            dbcsLead = wParam;
-            return 0;
-        }
-        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )&charA, size, ( LPWSTR )&wParam, 1 );
-
-        dbcsLead = 0;
-    }
-    else
-#endif
     if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
@@ -888 +900 @@
 
 #ifdef __WIN32OS2__
-    if(IsDBCSEnv()) 
+    if(IsDBCSEnv())
     {
       switch( msg )
@@ -940 +952 @@
     LRESULT result;
 
-#ifdef __WIN32OS2__
-    if( IsDBCSEnv() && msg == WM_CHAR )
-    {
-        char charA[ 2 ];
-
-        if( WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )&wParam, 1, ( LPSTR )charA, 2, 0, 0 ) > 1 )
-        {
-            func( hwnd, msg, ( WPARAM )charA[ 0 ], lParam );
-            wParam = charA[ 1 ];
-        }
-        else
-            wParam = charA[ 0 ];
-    }
-    else
-#endif
     if (WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam ) == -1) return 0;