Changeset 4005

Timestamp:

2005年12月28日 01時30分53秒 (3 years ago)

Author:

horiguti

Message:

Modification related to IME control.

Files:

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

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-12-28  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/meadow.el (mw32-input-method): Don't continue to
+        use FEP when length of the composition string is zero. Set
+        redisplay-dont-pause when calling sit-for. Preserve
+        buffer-modified-p.
+
-2005-12-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-

trunk/lisp/international/meadow.el

@@ -525 +525 @@
-       (fep-get-mode))
-      (list key)
-
+
+
-    (fep-force-on)
-    (let* ((pos (point))
+           (modified-p (buffer-modified-p))
-           (ov (make-overlay (point) (1+ (point))))
-           (ret (mw32-ime-input-method-function (char-to-string key)))
-
-
-
+
+
+
+
-      (unwind-protect
-          (while (or
@@ -538 +541 @@
-                  (and
-                   (cadr ret)
+                   (> (length (cadr ret)) 0)
-                   (not (eq (string-to-char (japanese-hankaku (cadr ret)))
-                            (car (cddr ret))))))
@@ -555 +559 @@
-        (fep-force-off)
-        (delete-region pos (point))
-
+
+
-      result)))
-

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-12-27  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32ime.c (fep_switch_event): New sync object.
+        (mw32-fep-switch-by-key-event): New lisp variable.
+        (mw32_ime_control_init): Initialize fep_switch_event.
+        (mw32_ime_input_method_function_unwind): Set parameter properly to
+        call Ffep_force_off().
+        (mw32-ime-input-method-function): call
+        redisplay_preserve_echo_area () before set the position of fep
+        window.
+        (fep-force-on): Add new mode that changes FEP state by internally
+        generated windows key event instead of IMM API. This mode is
+        activated when mw32-fep-switch-by-key-event is not nil.
+        (fep-force-off): Ditto.
+        (mw32-fep-switch-by-key-event): New function to control behavior
+        of fep-force-on and fep-force-off.
+
+        * mw32term.c (SendInputProc): New function pointer for Win32 API.
+        (mw32_send_key_event): New function.
+        (mw32_initialize): Initialize SendInputProc.
+
+        * mw32term.h (struct INPUT): New struct for SendInput.
+        (struct MOUSEINPUT): Ditto.
+        (struct KEYBDINUT): Ditto.
+        (struct HARDWAREINPUT): Ditto.
+        (SENDINPUTPROC): New typedef.
+
+        * mw32fns.c (fep_switch_state): New extern.
+        (mw32_WndProc<WM_IME_NOTIFY>): Set event when FEP switched.
+        (mw32_WndProc<WM_IME_REPORT>): Set event when FEP switched.
+
-2005-12-25  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/src/mw32fns.c

@@ -1922 +1922 @@
-#ifdef IME_CONTROL
-  extern int IME_event_off_count;
+  extern HANDLE fep_switch_event;
-#endif
-  extern void mw32_scroll_bar_store_event (WPARAM wParam, LPARAM lParam);
@@ -2412 +2413 @@
-        else
-          IME_event_off_count--;
+        SetEvent (fep_switch_event);
-      }
-    goto dflt;
@@ -2499 +2501 @@
-        else
-          IME_event_off_count--;
+        SetEvent (fep_switch_event);
-        return 0;
-      }
@@ -2665 +2668 @@
-                last_bitmap = MW32_FRAME_CARET_BITMAP (f);
-              }
-
+
-            SetCaretPos (caret_xpos, caret_ypos);
-

trunk/src/mw32ime.c

@@ -155 +155 @@
-static int waiting_on_main_thread = FALSE;
-static HANDLE input_method_function_string = INVALID_HANDLE_VALUE;
+HANDLE fep_switch_event = INVALID_HANDLE_VALUE;
-
-Lisp_Object Vime_control;
-Lisp_Object VIME_command_off_flag;
-Lisp_Object Qim_info;
+Lisp_Object Vmw32_fep_switch_by_key_event;
-
-int IME_event_off_count;
@@ -586 +588 @@
-          Vime_control = Qt;
-          input_method_function_event = CreateEvent (NULL, FALSE, FALSE, NULL);
+          fep_switch_event = CreateEvent (NULL, FALSE, FALSE, NULL);
-        }
-    }
@@ -811 +814 @@
-
-  if (NILP (arg))
-
+Qnil
-
-  return Qnil;
@@ -848 +851 @@
-
-  result = Qnil;
-Ffep_force_on (
+redisplay_preserve_echo_area (30
-
-  /* If new ascii (expected..) key event comes after this function
@@ -871 +874 @@
-                   (WPARAM)(SDATA (str)), 0);
-    }
+  Ffep_force_on (Qnil);
-
-  mw32_set_ime_conv_window (hwnd,
@@ -950 +954 @@
-DEFUN ("fep-force-on", Ffep_force_on, Sfep_force_on, 0, 1, 0,
-       doc: /* Force status of IME open.
-
+
+
-  (eventp)
-     Lisp_Object eventp;
@@ -966 +971 @@
-      hwnd = hwndConsole;
-#endif
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  return Qnil;
@@ -974 +989 @@
-DEFUN ("fep-force-off", Ffep_force_off, Sfep_force_off, 0, 1, 0,
-       doc: /* Force status of IME close.
-
+
+
-  (eventp)
-     Lisp_Object eventp;
@@ -990 +1006 @@
-      hwnd = hwndConsole;
-#endif
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  return Qnil;
@@ -1836 +1862 @@
-
-  DEFVAR_LISP ("ime-control", &Vime_control, doc: /* IME control flag  */);
+  DEFVAR_BOOL ("mw32-fep-switch-by-key-event", &Vmw32_fep_switch_by_key_event,
+               doc: /* If non-nil, use windows key event instead of IMM API in `fep-force-on'
+and `fep-force-off'. */);
+  Vmw32_fep_switch_by_key_event = FALSE;
-
-  defsubr (&Simm_get_conversion_status);

trunk/src/mw32term.c

@@ -234 +234 @@
-/* Layered Window */
-SETLAYEREDWINDOWATTRPROC SetLayeredWindowAttributes = NULL;
+
+SENDINPUTPROC SendInputProc = NULL;
-
-/* Incremented by XTread_socket whenever it really tries to read
@@ -3615 +3617 @@
-}
-
+void
+mw32_send_key_input (int vkeycode, int scancode, int flags)
+{
+  INPUT in;
+
+  if (SendInputProc == NULL) return;
+
+  in.type = INPUT_KEYBOARD;
+  in.ki.wVk = vkeycode;
+  in.ki.wScan = scancode;
+  in.ki.dwFlags = flags;
+  in.ki.time = GetTickCount ();
+  in.ki.dwExtraInfo = 0;
+  SendInputProc (1, &in, sizeof (in));
+}
+
-DEFUN ("mw32-get-window-position", Fmw32_get_window_position,
-       Smw32_get_window_position, 0, 2, 0,
@@ -6291 +6309 @@
-    SetLayeredWindowAttributes = (SETLAYEREDWINDOWATTRPROC)
-      GetProcAddress (user32_lib, "SetLayeredWindowAttributes");
+
+    SendInputProc = (SENDINPUTPROC)
+      GetProcAddress (user32_lib, "SendInput");
-  }
-}

trunk/src/mw32term.h

@@ -1292 +1292 @@
-#endif
-
+typedef struct{
+  LONG    dx;
+  LONG    dy;
+  DWORD   mouseData;
+  DWORD   dwFlags;
+  DWORD   time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEINPUT;
+
+typedef struct {
+  WORD    wVk;
+  WORD    wScan;
+  DWORD   dwFlags;
+  DWORD   time;
+  ULONG_PTR dwExtraInfo;
+} KEYBDINPUT;
+
+typedef struct {
+  DWORD   uMsg;
+  WORD    wParamL;
+  WORD    wParamH;
+} HARDWAREINPUT;
+
+#define INPUT_MOUSE     0
+#define INPUT_KEYBOARD  1
+#define INPUT_HARDWARE  2
+
+typedef struct {
+  DWORD   type;
+  union
+  {
+    MOUSEINPUT      mi;
+    KEYBDINPUT      ki;
+    HARDWAREINPUT   hi;
+  };
+} INPUT;
+
+typedef UINT (WINAPI *SENDINPUTPROC)(UINT, INPUT*, int);
+
-#endif /* not _MW32TERM_H_ */