Changeset 4026

Timestamp:

02/01/06 03:19:58 (3 years ago)

Author:

horiguti

Message:

* mw32ime.c (mw32-ime-input-method-function): Change the method
setting initial input into IME. Injecting key event instead of setting
composition string with WM_MULE_IMM_SET_COMPOSITION_STRING, which has
different behavior between MS-IME and ATOK.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32ime.c (modified) (3 diffs)

trunk/src/ChangeLog.Meadow

@@ -23 +23 @@
-        (fep-force-on): Ditto.
-        (fep-force-off): Ditto.
+        (mw32-ime-input-method-function): Change the method setting
+        initial input into IME. Injecting key event instead of setting
+        composition string with WM_MULE_IMM_SET_COMPOSITION_STRING, which
+        has different behavior between MS-IME and ATOK.
-
-        * callproc.c (Vmw32_process_expects_pty): Renamed to

trunk/src/mw32ime.c

@@ -850 +850 @@
-  ResetEvent (input_method_function_event);
-
+  Ffep_force_on (Qnil);
+
-  result = Qnil;
-  redisplay_preserve_echo_area (30);
@@ -867 +869 @@
-        }
-    }
-  fflush (stdout);
-  if (STRINGP (str))
-    {
-      str = ENCODE_SYSTEM (str);
-      SendMessage (hwnd, WM_MULE_IMM_SET_COMPOSITION_STRING,
-                   (WPARAM)(SDATA (str)), 0);
-    }
-  Ffep_force_on (Qnil);
-
-  mw32_set_ime_conv_window (hwnd,
@@ -880 +874 @@
-                            XWINDOW (f->minibuffer_window):
-                            XWINDOW (f->selected_window));
+
+  /* Put the initnal string into IME via message. */
+  if (STRINGP (str))
+    {
+      char *p;
+      int ctrlstate;
+
+      /* Cancel control key if pressed */
+      ctrlstate = GetKeyState (VK_CONTROL) & 0x80;
+      if (ctrlstate)
+        mw32_send_key_input (VK_CONTROL, 0, KEYEVENTF_KEYUP);
+
+      /* str assumed not to contain non-ascii characters. */
+      for (p = SDATA (str) ; *p ; p++)
+        {
+          int c = toupper (*p);
+          
+          mw32_send_key_input (c, 0, 0);
+          mw32_send_key_input (c, 0, KEYEVENTF_KEYUP);
+        }
+
+      /* Restore the state of control key */
+      if (ctrlstate)
+        mw32_send_key_input (VK_CONTROL, 0, 0);
+    }
-
-  /* Rescue from dead block. This may not happen. */