Changeset 3910

Timestamp:

10/14/05 13:32:16 (3 years ago)

Author:

horiguti

Message:

Experimental.
Automatic IME setup. (Now only for japanese environment.)

Files:

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

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-10-14  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/meadow.el (mw32-locale-ime-alist): New alist.
+        (mw32-set-ime-if-available): New function.
+
+        * international/mule-cmds.el (set-language-environment-hook): Set
+        mw32-set-ime-if-available on Meadow.
+
-2005-10-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/lisp/international/meadow.el

@@ -310 +310 @@
-    ("Korean" . korean-iso-8bit)))
-
+;; This is temporal solution.
+(defvar mw32-locale-ime-alist
+  '((("japanese" . 1041) . "MW32-IME")))
+;;    (("korean-hangul" . 1042) . "MW32-IME")))
+
+(defun mw32-set-ime-if-available ()
+  (let ((ime (assoc (cons default-input-method (mw32-input-language-code))
+                    mw32-locale-ime-alist)))
+    (if (and ime (mw32-ime-available))
+        (setq default-input-method (cdr ime)))))
+
-;;
-;; IME state indicator

trunk/lisp/international/mule-cmds.el

@@ -1623 +1623 @@
-
-
-
+
+
+
+
+
-  "Normal hook run after some language environment is set.
-

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-14  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c (mw32_load_cursor): New external function.
+
+        * mw32ime.c (ImmIsIMEProc): New Win32 API.
+        (mw32-ime-available): New function.
+        (mw32-input-langunage-code): New function.
+
-2005-10-14  Hideyuki SHIRAI  <shirai@meadowy.org>
-

trunk/src/mw32ime.c

@@ -142 +142 @@
-typedef DWORD (WINAPI *IMMGETHOTKEYPROC)(DWORD , LPUINT, LPUINT, LPHKL);
-IMMGETHOTKEYPROC ImmGetHotKeyProc;
+typedef BOOL (WINAPI *IMMISIMEPROC)(HKL);
+IMMISIMEPROC ImmIsIMEProc;
-
-extern Lisp_Object Vime_control;
@@ -473 +475 @@
-                        "ImmGetHotKey");
-
+      ImmIsIMEProc =
+        (IMMISIMEPROC)
+        GetProcAddress (hImm32,
+                        "ImmIsIME");
+
-      if (ImmGetOpenStatusProc &&
-          ImmSetOpenStatusProc &&
@@ -491 +498 @@
-          ImmGetCandidateListProc &&
-          ImmGetCandidateListCountProc &&
-
+
+
-        {
-          fIME = TRUE;
@@ -706 +714 @@
-  Emacs Lisp function entries
-*/
+
+DEFUN ("mw32-ime-available", Fmw32_ime_available, Smw32_ime_available,
+       0, 0, 0,
+       doc: /* Non nil if input locale has IME. */)
+  ()
+{
+  return (fIME
+          && ImmIsIMEProc (GetKeyboardLayout (0)) ? Qt : Qnil);
+}
+
+DEFUN ("mw32-input-language-code",
+       Fmw32_input_language_code, Smw32_input_language_code,
+       0, 0, 0,
+       doc: /* Return input language code.
+This is lower 16 bit value of GetKeyboardLayout (0). */)
+  ()
+{
+  return (make_number (((int)GetKeyboardLayout (0)) & 0xffff));
+}
-
-DEFUN ("fep-force-on", Ffep_force_on, Sfep_force_on, 0, 1, 0,
@@ -1555 +1582 @@
-  DEFVAR_LISP ("ime-control", &Vime_control, doc: /* IME control flag  */);
-
+  defsubr (&Smw32_ime_available);
+  defsubr (&Smw32_input_language_code);
-  defsubr (&Sfep_force_on);
-  defsubr (&Sfep_force_off);

trunk/src/mw32term.c

@@ -5879 +5879 @@
- ***********************************************************************/
-
+/* mw32fns.c */
+extern Cursor mw32_load_cursor (LPCTSTR name);
+
-static int mw32_initialized;
-