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

Timestamp:

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

Author:

sandervl

Message:

KOM: Updates

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.229 2004-03-12 18:19:50 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.230 2004-05-24 09:01:59 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -61 +61 @@
 #include "user32api.h"
 #include <kbdhook.h>
+#include <heapstring.h>
+
+#include <os2im.h>
+#include <im32.h>
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -140 +144 @@
 #endif
 
+extern "C" ULONG OSLibImSetMsgQueueProperty( ULONG, ULONG );
+
 //******************************************************************************
 // Initialize PM; create hab, message queue and register special Win32 window classes
@@ -194 +200 @@
     BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
     dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
+
+    /* IM instace is created per message queue, that is, thread */
+    if( IsDBCSEnv())
+        OSLibImSetMsgQueueProperty( hmq, MQP_INSTANCE_PERMQ );
 
     //CD polling window class
@@ -1006 +1016 @@
         break;
 
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
+        break;
+
     case DM_DRAGOVER:
     {
@@ -1016 +1049 @@
 
         if(fDragDropDisabled) {
-                rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+            rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
             break;
         }
@@ -1022 +1055 @@
         //does this window accept dropped files?
         if(!DragDropAccept(win32wnd->getWindowHandle())) {
-                rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+            rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
             break;
         }
 
         if(PMDragValidate(pDragInfo) == FALSE) {
-                rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+            rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
             break;
         }
@@ -2210 +2243 @@
         break;
 
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            dprintf(("Frame window received IME message"));
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
+        break;
+
 #ifdef DEBUG
     case WM_DDE_INITIATE:
@@ -2326 +2383 @@
 // Parameters
 //
-//     HWND hwndOS2             - PM handle of fake window
+//     HWND hwndOS2     - PM handle of fake window
 //
 // Returns
-//     NULL                     - Failure
+//     NULL         - Failure
 //     else                     - Old PM window procedure
 //