Changeset 10607 for trunk/src/user32/win32wbase.cpp

Timestamp:

May 24, 2004, 11:02:01 AM (21 years ago)

Author:

sandervl

Message:

KOM: Updates

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.389 2004-04-20 10:11:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.390 2004-05-24 09:02:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -70 +70 @@
 #include "callwrap.h"
 
+#include <imm.h>
+
 #define DBG_LOCALLOG    DBG_win32wbase
 #include "dbglocal.h"
@@ -2123 +2125 @@
 
     case WM_IME_CHAR:
-        if( wParam & 0xFF00 ) // DBCS ?
+        if( IsDBCSLeadByte(( CHAR )( wParam >> 8 )))
             SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam >> 8 ), lParam );
         SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam & 0xFF ), lParam );
         break;
+
+    case WM_IME_KEYDOWN:
+        return SendMessageA( getWindowHandle(), WM_KEYDOWN, wParam, lParam );
+
+    case WM_IME_KEYUP:
+        return SendMessageA( getWindowHandle(), WM_KEYUP, wParam, lParam );
+
+    case WM_IME_COMPOSITION:
+    case WM_IME_COMPOSITIONFULL:
+    case WM_IME_CONTROL:
+    case WM_IME_ENDCOMPOSITION:
+    case WM_IME_NOTIFY:
+    case WM_IME_REQUEST:
+    case WM_IME_SELECT:
+    case WM_IME_SETCONTEXT:
+    case WM_IME_STARTCOMPOSITION:
+    {
+        HWND hwndIME = ImmGetDefaultIMEWnd( getWindowHandle());
+
+        if( hwndIME )
+        {
+            BOOL result = ImmIsUIMessageA( hwndIME, Msg, wParam, lParam );
+
+            switch( Msg )
+            {
+                case WM_IME_SETCONTEXT :
+                    return result;
+
+                case WM_IME_CONTROL :
+                    // todo : IMC_GETSTATUSWINDOWPOS return POINTS structure
+                    return !result;
+
+                case WM_IME_REQUEST :
+                    // todo
+                    return 0;
+            }
+        }
+        break;
+    }
 
     default:
@@ -2206 +2247 @@
         SendMessageW( getWindowHandle(), WM_CHAR, wParam, lParam );
         return 0;
+
+    case WM_IME_KEYDOWN:
+        return SendMessageW( getWindowHandle(), WM_KEYDOWN, wParam, lParam );
+
+    case WM_IME_KEYUP:
+        return SendMessageW( getWindowHandle(), WM_KEYUP, wParam, lParam );
+
+    case WM_IME_COMPOSITION:
+    case WM_IME_COMPOSITIONFULL:
+    case WM_IME_CONTROL:
+    case WM_IME_ENDCOMPOSITION:
+    case WM_IME_NOTIFY:
+    case WM_IME_REQUEST:
+    case WM_IME_SELECT:
+    case WM_IME_SETCONTEXT:
+    case WM_IME_STARTCOMPOSITION:
+    {
+        HWND hwndIME = ImmGetDefaultIMEWnd( getWindowHandle());
+
+        if( hwndIME )
+        {
+            BOOL result = ImmIsUIMessageW( hwndIME, Msg, wParam, lParam );
+
+            switch( Msg )
+            {
+                case WM_IME_SETCONTEXT :
+                    return result;
+
+                case WM_IME_CONTROL :
+                    // todo : IMC_GETSTATUSWINDOWPOS return POINTS structure
+                    return !result;
+
+                case WM_IME_REQUEST :
+                    // todo
+                    return 0;
+            }
+        }
+        return 0;
+    }
 
     default: