Changeset 4044

Timestamp:

2006年02月24日 19時46分43秒 (2 years ago)

Author:

horiguti

Message:

Refine IME control. Protect key strokes around switching of fep from
disordering and/or vanishing.

Files:

• trunk/lisp/ChangeLog.Meadow (modified) (1 diff)
• trunk/lisp/international/meadow.el (modified) (1 diff)
• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32ime.c (modified) (6 diffs)
• trunk/src/mw32term.c (modified) (1 diff)

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2006-02-24  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/meadow.el (mw32-input-method): Protect key strokes
+        around switching of fep from disordering and/or vanishing.
+
-2006-02-21  Hideyuki SHIRAI  <shirai@meadowy.org>
-

trunk/lisp/international/meadow.el

@@ -529 +529 @@
-    (let ((redisplay-dont-pause t))
-      (sit-for 0))
+    (mw32-protect-fep-input)
-    (fep-force-on)
-    (let* ((pos (point))

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-02-24  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32ime.c (CHOKEDKEYBUFLEN): New macro.
+        (choke_keystroke): New variable.
+        (choked_key_index): New variable.
+        (choked_key_buf): New variable.
+        (mw32_ime_choke_keystroke): New function.
+        (mw32-ime-input-method-function): Protect key strokes around
+        switching of fep from disordering and/or vanishing.
+        (mw32-protect-fep-input): New lisp function.
+
+        * mw32term.c (mw32_message_loop<WM_KEYDOWN>): Protect key strokes
+        around switching of fep from disordering and/or vanishing.
+
-2006-02-20  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/mw32ime.c

@@ -162 +162 @@
-int mw32_fep_switch_by_key_event;
-
+#define CHOKEDKEYBUFLEN 16
-int IME_event_off_count;
-static int last_ime_vkeycode;
-static int last_ime_vkeymod;
+static int choke_keystroke = FALSE;
+static int choked_key_index = 0;
+static char choked_key_buf [CHOKEDKEYBUFLEN];
-
-EXFUN (Fsubstring_no_properties, 3);
@@ -795 +799 @@
-}
-
+int
+mw32_ime_choke_keystroke (int keycode)
+{
+  if (! choke_keystroke
+      || keycode == 0
+      || choked_key_index >= CHOKEDKEYBUFLEN) return FALSE;
+
+  choked_key_buf[choked_key_index++] = keycode;
+
+  return TRUE;
+}
+
-void
-mw32_ime_cancel_input_function (void)
@@ -850 +866 @@
-  ResetEvent (input_method_function_event);
-
+  Fmw32_protect_fep_input ();
-  Ffep_force_on (Qnil);
-
-  result = Qnil;
-  redisplay_preserve_echo_area (30);
-
-  /* If new ascii (expected..) key event comes after this function
@@ -869 +885 @@
-        }
-    }
+  /* redisplay won't done when waiting keyevents exist. */
+  redisplay_preserve_echo_area (30);
+
+  /* Key strokes after keystroke choking has turned on till here is
+     stored into choked_key_buf */
+  if (choked_key_index > 0)
+    {
+      Lisp_Object args[2];
+      args[0] = str;
+      args[1] = make_string (choked_key_buf, choked_key_index);
+      str = Fconcat (2, args);
+    }
+  choke_keystroke = FALSE;
+  choked_key_index = 0;
-
-  mw32_set_ime_conv_window (hwnd,
@@ -969 +999 @@
-{
-  return (make_number (((int)GetKeyboardLayout (0)) & 0xffff));
+}
+
+DEFUN ("mw32-protect-fep-input", Fmw32_protect_fep_input, Smw32_protect_fep_input, 0, 0, 0,
+       doc: /* Start choking of fep-input to protect them from disordering
+on fep-swithing.
+This function is internal function for mw32-input-method. */)
+  ()
+{
+  if (NILP (Ffep_get_mode ()))
+    choke_keystroke = TRUE;
+
+  return Qnil;
-}
-
@@ -1890 +1932 @@
-  defsubr (&Smw32_ime_available);
-  defsubr (&Smw32_input_language_code);
+  defsubr (&Smw32_protect_fep_input);
-  defsubr (&Sfep_force_on);
-  defsubr (&Sfep_force_off);

trunk/src/mw32term.c

@@ -4627 +4627 @@
-                {
-                  int vkey = mw32_ime_get_virtual_key (msg.hwnd);
-
-
-
+
+
-                  mw32_ime_record_keycode (keycode, keymod);
+                  if (mw32_ime_choke_keystroke (keycode))
+                    break;
-                }
-              keyflag = mw32_emacs_translate_message (dpyinfo, 1, msg.wParam,
-                                                      &keycode, &keymod);
+
+              if (keyflag ==1 && mw32_ime_choke_keystroke (keycode))
+                break;
+
-              EVENT_INIT (*bufp);
-              MW32_INIT_EMACS_EVENT (*bufp);