Changeset 4051

Timestamp:

2006年03月13日 03時31分50秒 (2 years ago)

Author:

horiguti

Message:

Change of IME control, See ticket:241.

Files:

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

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2006-03-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/meadow.el (mw32-ime-cont-on): Change default value
+        to 'always.
+        (mw32-ime-sync-state): Don't sync IME state when
+        mw32-ime-composition-window is not nil. Modify to handle (eq
+        mw32-ime-cont-on 'always).
+        (mw32-ime-initialize): Ditto.
+        (mw32-ime-uninitialize): Ditto.
+        (mw32-isearch-mode-hook-function): Ditto.
+        (mw32-isearch-update): New function.
+        (mw32-input-method): Keystroke protection is moved into
+        mw32-ime-input-method-function.
+
-2006-02-28  Shun-ichi GOTO  <gotoh@taiyo.co.jp>
-

trunk/lisp/international/meadow.el

@@ -155 +155 @@
-(defvar mw32-ime-mode-line-format-original nil
-  "Original mode line format.")
-
-
+
+
+
-(defvar mw32-input-method-noconv-regexp nil
-  "Regexp represents printable-chars that does not activate IME.")
@@ -330 +331 @@
-
-(defun mw32-ime-sync-state (window)
-
+
+
-    (with-current-buffer (window-buffer window)
-      (if (window-minibuffer-p)
@@ -340 +342 @@
-          (if mw32-ime-cont-on
-              (if (string= current-input-method "MW32-IME")
-
+
+
-                      (fep-force-on))
-                (fep-force-off))))))))
@@ -410 +413 @@
-      (defadvice isearch-toggle-input-method (after mw32-fep-off activate)
-        "Deactivate fep when mw32-ime-cont-on is not nil."
-mw32-ime-cont-on
+(eq mw32-ime-cont-on t)
-      (defadvice isearch-done (after mw32-fep-on activate)
-        "Deactivate fep when mw32-ime-cont-on is not nil."
-        (if (and mw32-ime-cont-on
-                 (string= current-input-method "MW32-IME"))
-
+
+
+
+
+
+
+
-
-(defun mw32-isearch-mode-hook-function ()
-
-
+
+
+
+
+
-  (define-key isearch-mode-map [kanji] 'isearch-toggle-input-method)
-ignor
+mw32-isearch-updat
-      
-    
@@ -461 +473 @@
-          (add-hook 'minibuffer-exit-hook 'mw32-ime-exit-from-minibuffer))
-        (make-local-variable 'input-method-function)
-setq input-method-function 'mw32-input-method
-(if (and mw32-ime-cont-on
-        (not (window-minibuffer-p)))
+if (not (eq mw32-ime-cont-on 'always)
+    (setq input-method-function 'mw32-input-method))
+(if mw32-ime-cont-on
-            (fep-force-on)))
-    (setq current-input-method nil)
@@ -529 +541 @@
-    (let ((redisplay-dont-pause t))
-      (sit-for 0))
-
-
+
-    (let* ((pos (point))
-           (modified-p (buffer-modified-p))
-           (ov (make-overlay (point) (1+ (point))))
-
-
-
-
-
+
+
-      (unwind-protect
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        (if (and (cadr ret)
-
-
-
-
-
-
+
+
+
+
-        (delete-region pos (point))
-        (delete-overlay ov)
@@ -576 +579 @@
-
-(provide 'meadow)
-
-

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-03-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.h (WM_EMACS_FLUSH_MESSAGE): New message.
+        (WM_EMACS_KEYSTROKE): New message.
+
+        * mw32term.c (mw32_message_loop): Modify related to IME input.
+        (mw32_message_loop<WM_EMACS_FLUSH_MESSAGE>): New message handler.
+        (mw32_message_loop<WM_EMACS_KEYSTROKE>): New message handler.   (mw32_message_loop<WM_KEYDOWN>): Modify related to IME input.
+
+        * mw32ime.c (Vmw32_ime_composition_window): New variable.
+        (mw32_set_ime_conv_window): Use Vmw32_ime_composition_window if
+        possible.
+        (mw32_ime_record_keycode): Don't record keycode when choking
+        keystrokes.
+        (mw32_get_ime_result_string): Start keystroke choking immediately
+        if needed.
+        (mw32_ime_choke_keystroke): Add parameter for debugging.
+        (mw32_ime_stop_choke_keystrokes): New function.
+        (mw32_change_shift_state): New function.
+        (mw32_ime_inject_keystrokes): Moved out from
+        mw32-ime-input-method-function and widen applicable chars.
+        (mw32_ime_inject_keymessage): New function.
+        (mw32_ime_input_method_function_unwind): Fix coding style. Stop
+        choking keystrokes and put them into message queue.
+        (mw32-ime-input-method-function): Improve tolerance of key
+        fastshot.
+        (mw32-protect-fep-input): Removed.
+        (fep-force-on): Don't send keyup message.
+        (fep-force-on): Ditto.
+        (syms_of_mw32ime): Add initialize of Vmw32_ime_composition_window.
+
-2006-02-24  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/mw32ime.c

@@ -160 +160 @@
-Lisp_Object VIME_command_off_flag;
-Lisp_Object Qim_info;
+Lisp_Object Vmw32_ime_composition_window;
-int mw32_fep_switch_by_key_event;
-
@@ -182 +183 @@
-mw32_ime_record_keycode (int keycode, int keymod)
-{
+  if (choke_keystroke)
+    return;
+
-  last_ime_vkeycode = keycode;
-  last_ime_vkeymod  = keymod;
@@ -193 +197 @@
-      HWND IMEhwnd;
-      COMPOSITIONFORM cf;
+
+      /* If Vmw32_ime_composition_window is set, try it. */
+      if (!NILP (Vmw32_ime_composition_window)
+          && WINDOWP (Vmw32_ime_composition_window)
+          && WINDOW_FRAME (XWINDOW (Vmw32_ime_composition_window))
+          == WINDOW_FRAME (w))
+        w = XWINDOW (Vmw32_ime_composition_window);
-
-      IMEhwnd = (ImmGetDefaultIMEWndProc) (hwnd);
@@ -289 +300 @@
-  struct mw32_display_info *dpyinfo = GET_MW32_DISPLAY_INFO (hwnd);
-
+  if (waiting_on_main_thread)
+    choke_keystroke = TRUE;
+  
-  hIMC = (ImmGetContextProc) (hwnd);
-  if (!hIMC) return FALSE;
@@ -799 +813 @@
-}
-
+
+/* Keystroke choking functions.
+   Snatch keystrokes on IME switching. This cannot be perfectly done
+   by other than filter driver of keyboard. Here is the second best
+   way that occasionally fails to protect the order of keystrokes. */
-int
-
+, int n
-{
-  if (! choke_keystroke
-      || keycode == 0
-
+
+
-
-  choked_key_buf[choked_key_index++] = keycode;
+  choked_key_buf[choked_key_index] = 0;
-
-  return TRUE;
+}
+
+int
+mw32_ime_stop_choke_keystrokes ()
+{
+  choke_keystroke = 0;
+  choked_key_index = 0;
+  choked_key_buf[0] = 0;
+  
+  return 0;
+}
+
+/* Key strokes cannot be directly posted into IME process. */
+static void
+mw32_change_shift_state (int *ctrlstate, int ctrl, int *shiftstate, int shift)
+{
+  if (*ctrlstate && ! ctrl)
+    mw32_send_key_input (VK_CONTROL, 0, KEYEVENTF_KEYUP);
+  else if (! *ctrlstate && ctrl)
+    mw32_send_key_input (VK_CONTROL, 0, 0);
+  if (*shiftstate && ! shift)
+    mw32_send_key_input (VK_SHIFT, 0, KEYEVENTF_KEYUP);
+  else if (! *shiftstate && shift)
+    mw32_send_key_input (VK_SHIFT, 0, 0);
+
+  *ctrlstate = ctrl;
+  *shiftstate = shift;
+}
+
+
+static void
+mw32_ime_inject_keystrokes (char *str)
+{
+  char *p;
+  int orgctrlstate, ctrlstate;
+  int orgshiftstate, shiftstate;
+
+  /* Cancel control key if pressed */
+  orgctrlstate = ctrlstate = (GetKeyState (VK_CONTROL) & 0x80) != 0;
+  orgshiftstate = shiftstate = (GetKeyState (VK_SHIFT) & 0x80) != 0;
+  
+  /* str assumed not to contain non-ascii characters. */
+  for (p = str ; *p ; p++)
+    {
+      SHORT ret;
+      int vk;
+      UINT sc;
+      int ctrl, shift;
+      HKL kl;
+
+      kl = GetKeyboardLayout (0);
+      ret = VkKeyScanEx (*p, kl);
+      if (ret == 0xffff) continue;
+      ctrl = ((ret & 0x200) != 0);
+      shift = ((ret & 0x100) != 0);
+      vk = ret & 0xff;
+      sc = MapVirtualKeyEx (vk, 0, kl);
+
+      mw32_change_shift_state (&ctrlstate, ctrl, &shiftstate, shift);
+
+      if (GetKeyState (vk) & 0x8000)
+        mw32_send_key_input (vk, sc, KEYEVENTF_KEYUP);
+      mw32_send_key_input (vk, sc, 0);
+    }
+  
+  mw32_change_shift_state (&ctrlstate, orgctrlstate,
+                           &shiftstate, orgshiftstate);
+}
+
+/* Keystrokes can be posted directly into message thread while IME is
+   deactivated. */
+void
+mw32_ime_inject_keymessage (char *str)
+{
+  char *p;
+
+  for (p = str ; *p ; p++)
+    {
+      PostMessage (FRAME_MW32_WINDOW (XFRAME (selected_frame)),
+                   WM_EMACS_KEYSTROKE,
+                   toupper (*p),
+                   1);
+    }
+
+  if (*p)
+    PostMessage (FRAME_MW32_WINDOW (XFRAME (selected_frame)),
+                 WM_EMACS_FLUSH_MESSAGE, 0, 0);
-}
-
@@ -824 +932 @@
-}       
-
-
-
+
+
+
-{
-  mw32_ime_cancel_input_function ();
@@ -832 +941 @@
-    Ffep_force_off (Qnil);
-
+  if (choked_key_index > 0)
+    mw32_ime_inject_keymessage (choked_key_buf);
+  mw32_ime_stop_choke_keystrokes ();
-  return Qnil;
-}
@@ -866 +978 @@
-  ResetEvent (input_method_function_event);
-
-Fmw32_protect_fep_input ()
+choke_keystroke = TRUE
-  Ffep_force_on (Qnil);
-
-  result = Qnil;
+
+  /* Flush received but not emacs-queued message. */
+  PostMessage (FRAME_MW32_WINDOW (XFRAME (selected_frame)),
+               WM_EMACS_FLUSH_MESSAGE, 0, 0);
-
-  /* If new ascii (expected..) key event comes after this function
-     invoked, get it and add to composition string. */
-if
+while
-    {
-      Lisp_Object kseq, args[2];
@@ -887 +1003 @@
-  /* redisplay won't done when waiting keyevents exist. */
-  redisplay_preserve_echo_area (30);
-
-
-
+
+
+
+
+
-  if (choked_key_index > 0)
-    {
@@ -897 +1015 @@
-      str = Fconcat (2, args);
-    }
-
-
-
-
-
-
-
-
-
+
-  if (STRINGP (str))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  /* Rescue from dead block. This may not happen. */
@@ -935 +1024 @@
-    QUIT;
-
+  choke_keystroke = TRUE;
-  hstr = input_method_function_string;
-  input_method_function_string = INVALID_HANDLE_VALUE;
@@ -975 +1065 @@
-  result = Fcons (resultstr,
-                  Fcons (compstr,
-
-
+
-                                Qnil)));
-
-  return unbind_to (count, result);
-}
@@ -999 +1087 @@
-{
-  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;
-}
-
@@ -1037 +1113 @@
-          ResetEvent (fep_switch_event);
-          mw32_send_key_input (VK_KANJI, 0, 0);
-          mw32_send_key_input (VK_KANJI, 0, KEYEVENTF_KEYUP);
-          WaitForSingleObject (fep_switch_event, 500L);
-        }
@@ -1072 +1147 @@
-          ResetEvent (fep_switch_event);
-          mw32_send_key_input (VK_KANJI, 0, 0);
-          mw32_send_key_input (VK_KANJI, 0, KEYEVENTF_KEYUP);
-          WaitForSingleObject (fep_switch_event, 500L);
-        }
@@ -1927 +2001 @@
-and `fep-force-off'. */);
-  mw32_fep_switch_by_key_event = FALSE;
+  DEFVAR_LISP ("mw32-ime-composition-window", &Vmw32_ime_composition_window,
+               doc: /* If this is a window of current frame, IME composition window appears on the
+window instead of current window." */);
+  Vmw32_ime_composition_window = Qnil;
-
-  defsubr (&Simm_get_conversion_status);
@@ -1932 +2010 @@
-  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

@@ -3621 +3621 @@
-  in.ki.wScan = scancode;
-  in.ki.dwFlags = flags;
-GetTickCount ()
+0
-  in.ki.dwExtraInfo = 0;
-  SendInputProc (1, &in, sizeof (in));
@@ -4580 +4580 @@
-      int up;
-      int modifier;
+      int injected_key;
-
-      if (lastmsgp) lastmsgp = 0;
@@ -4612 +4613 @@
-        f = NULL;
-
+      injected_key = FALSE;
-      switch (msg.message)
-        {
+        case WM_EMACS_FLUSH_MESSAGE:
+          return count;
+
+        case WM_EMACS_KEYSTROKE:
+          injected_key = TRUE;
+          msg.message = WM_KEYDOWN;
+          /*  fall through */
-        case WM_KEYDOWN:
-        case WM_SYSKEYDOWN:
@@ -4627 +4636 @@
-                {
-                  int vkey = mw32_ime_get_virtual_key (msg.hwnd);
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-              keyflag = mw32_emacs_translate_message (dpyinfo, 1, msg.wParam,
-                                                      &keycode, &keymod);
-
-
+
+
+
-                break;
-

trunk/src/mw32term.h

@@ -839 +839 @@
-#define WM_EMACS_UPDATE_ALPHA                   (WM_USER+2013)
-#define WM_EMACS_EXPOSE_FRAME                   (WM_USER+2014)
+#define WM_EMACS_KEYSTROKE                      (WM_USER+2015)
+#define WM_EMACS_FLUSH_MESSAGE                  (WM_USER+2016)
-/* to report "switch-buffer" event by himi */
-#define WM_IME_REPORT     0x0280