X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=canna.el;h=9e89926ae4d02d8c7e2bb76885fdfd5241362589;hb=840ae24229e63454f9130150d280ed4aceeb1251;hp=aa497e1950af809299f02a53de7e6cb2aaa7ee86;hpb=8e717a13c139d2a6825c94aa7a83175b28765834;p=elisp%2Femacs-canna.git diff --git a/canna.el b/canna.el index aa497e1..9e89926 100644 --- a/canna.el +++ b/canna.el @@ -1,49 +1,90 @@ -;; This file is a part of Canna on Nemacs/Mule. +;;; canna.el --- Interface to the Canna input method. -;; Canna on Nemacs/Mule is distributed in the forms of -;; patches to Nemacs under the terms of the GNU EMACS -;; GENERAL PUBLIC LICENSE which is distributed along with -;; GNU Emacs by the Free Software Foundation. +;; Copyright (C) 1994 Akira Kon, NEC Corporation. +;; Copyright (C) 1996,1997,1998,2004 MORIOKA Tomohiko +;; Copyright (C) 1997 Stephen Turnbull -;; Canna on Nemacs/Mule is distributed in the hope that it will -;; be useful, but WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;; PARTICULAR PURPOSE. See the GNU EMACS GENERAL PUBLIC -;; LICENSE for more details. +;; Author: Akira Kon +;; MORIOKA Tomohiko +;; Stephen Turnbull +;; Version: $Revision: 1.21 $ +;; Keywords: Canna, Japanese, input method, mule, multilingual -;; You should have received a copy of the GNU EMACS GENERAL -;; PUBLIC LICENSE along with Nemacs/Mule; see the file -;; COPYING. If not, write to the Free Software Foundation, -;; 675 Mass Ave, Cambridge, MA 02139, USA. +;; This file is part of Emacs-Canna. -;; Egg offered some influences to the implementation of -;; Canna on Nemacs/Mule, and this file contains a few part -;; of Egg which is written by S.Tomura, Electrotechnical -;; Lab. (tomura@etl.go.jp) +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. -;; Written by Akira Kon, NEC Corporation. -;; E-Mail: kon@d1.bs2.mt.nec.co.jp. +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. -;; -*-mode: emacs-lisp-*- +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; Egg offered some influences to the implementation of Canna on +;; Nemacs/Mule, and this file contains a few part of Egg which is +;; written by S.Tomura, Electrotechnical Lab. (tomura@etl.go.jp) + +;; This program is rewritten for Emacs/mule and XEmacs/mule by MORIOKA +;; Tomohiko. + +;;; Code: + +(require 'poem) + +(defvar canna-dl-module + (expand-file-name "canna.so" exec-directory)) + +(defvar canna-dl-handle + (and (not (boundp 'CANNA)) + (fboundp 'dynamic-link) + (dynamic-link canna-dl-module))) + +(and canna-dl-handle + (dynamic-call "emacs_canna_init" canna-dl-handle)) -;; by 守岡 知彦 1996/11/11 (or (boundp 'CANNA) - (let ((handle (dynamic-link (expand-file-name "canna.so" exec-directory)))) - (dynamic-call "emacs_canna_init" handle)) - ) + (featurep 'CANNA) + (error "Canna is not built into this Emacs")) (defvar self-insert-after-hook nil) ;; (defalias 'self-insert-internal 'self-insert-command) ;; end -(defconst canna-rcs-version - "$Id: canna.el,v 1.4 1997-04-03 18:35:51 morioka Exp $") +(defconst canna-version "Emacs-Canna 1.3") (defun canna-version () + "Display version of canna.el in mini-buffer." (interactive) - (message (concat (substring canna-rcs-version 0 72) " ...")) ) + (message (concat canna-version " ..."))) + +(cond + ((featurep 'xemacs) + (defvar canna-self-insert-string-filter (function identity)) + (defun canna-self-insert-string (string) + (if (fboundp canna-self-insert-string-filter) + (setq string (funcall canna-self-insert-string-filter string))) + (let ((len (length string)) + (i 0) + ;; 挿入の途中で blink が起きるとうっとおしいので、 + ;; 一時的に blink を抑止する。 + (blink-matching-paren nil)) + (while (< i len) + (self-insert-internal (aref string i)) + (setq i (1+ i))))) + ) + (t + (defalias 'canna-self-insert-string 'insert) + )) -(provide 'canna) ;;; かんなの変数 @@ -135,19 +176,42 @@ (canna:memq-recursive a (cdr l)) ))) (defun canna:create-mode-line () - (if (not (canna:memq-recursive 'mode-line-canna-mode mode-line-format)) - (setq-default - mode-line-format - (append (list (list 'minibuffer-window-selected - (list 'display-minibuffer-mode-in-minibuffer - "-" "m") "-") - (list 'minibuffer-window-selected - (list 'display-minibuffer-mode-in-minibuffer - 'mode-line-canna-mode - 'mode-line-canna-mode-in-minibuffer) - 'mode-line-canna-mode)) - mode-line-format))) - (mode-line-canna-mode-update mode-line-canna-mode) ) + "Add Canna status string into mode-line." + (cond ((featurep 'xemacs) + (or (canna:memq-recursive 'mode-line-canna-mode + default-modeline-format) + (setq-default default-modeline-format + (append '("" mode-line-canna-mode) + default-modeline-format)) + ) + (mapcar (function + (lambda (buffer) + (save-excursion + (set-buffer buffer) + (or (canna:memq-recursive 'mode-line-canna-mode + modeline-format) + (setq modeline-format + (append '("" mode-line-canna-mode) + modeline-format)) + ) + ))) + (buffer-list)) + ) + (t + (or (canna:memq-recursive 'mode-line-canna-mode mode-line-format) + (setq-default + mode-line-format + (append (list (list 'minibuffer-window-selected + (list 'display-minibuffer-mode-in-minibuffer + "-" "m") "-") + (list 'minibuffer-window-selected + (list 'display-minibuffer-mode-in-minibuffer + 'mode-line-canna-mode + 'mode-line-canna-mode-in-minibuffer) + 'mode-line-canna-mode)) + mode-line-format)) + ))) + (mode-line-canna-mode-update mode-line-canna-mode)) (defun canna:mode-line-display () (mode-line-canna-mode-update mode-line-canna-mode)) @@ -219,10 +283,10 @@ t の時はデフォルトの色を使用する。 (make-variable-buffer-local (defvar canna:*select-overlay* nil)) ;;; -;;; キーマップテーブル +;;; Keymap table ;;; -;; フェンスモードでのローカルマップ +;; Fence mode local map (defvar canna-mode-map (make-sparse-keymap)) (let ((ch 0)) @@ -230,20 +294,38 @@ t の時はデフォルトの色を使用する。 (define-key canna-mode-map (make-string 1 ch) 'canna-functional-insert-command) (setq ch (1+ ch)))) -(define-key canna-mode-map [up] [?\C-p]) -(define-key canna-mode-map [S-up] [?\C-p]) -(define-key canna-mode-map [C-up] [?\C-p]) -(define-key canna-mode-map [down] [?\C-n]) -(define-key canna-mode-map [S-down] [?\C-n]) -(define-key canna-mode-map [C-down] [?\C-n]) -(define-key canna-mode-map [right] [?\C-f]) -(define-key canna-mode-map [S-right] [?\C-f]) -(define-key canna-mode-map [C-right] [?\C-f]) -(define-key canna-mode-map [left] [?\C-b]) -(define-key canna-mode-map [S-left] [?\C-b]) -(define-key canna-mode-map [C-left] [?\C-b]) -(define-key canna-mode-map [kanji] [? ]) -(define-key canna-mode-map [?\C- ] [?\C-@]) +(cond ((featurep 'xemacs) + (define-key canna-mode-map [up] "\C-p") + (define-key canna-mode-map [(shift up)] "\C-p") + (define-key canna-mode-map [(control up)] "\C-p") + (define-key canna-mode-map [down] "\C-n") + (define-key canna-mode-map [(shift down)] "\C-n") + (define-key canna-mode-map [(control down)] "\C-n") + (define-key canna-mode-map [right] "\C-f") + (define-key canna-mode-map [(shift right)] "\C-f") + (define-key canna-mode-map [(control right)] "\C-f") + (define-key canna-mode-map [left] "\C-b") + (define-key canna-mode-map [(shift left)] "\C-b") + (define-key canna-mode-map [(control left)] "\C-b") + (define-key canna-mode-map [kanji] " ") + (define-key canna-mode-map [(control space)] [(control @)]) + ) + (t + (define-key canna-mode-map [up] [?\C-p]) + (define-key canna-mode-map [S-up] [?\C-p]) + (define-key canna-mode-map [C-up] [?\C-p]) + (define-key canna-mode-map [down] [?\C-n]) + (define-key canna-mode-map [S-down] [?\C-n]) + (define-key canna-mode-map [C-down] [?\C-n]) + (define-key canna-mode-map [right] [?\C-f]) + (define-key canna-mode-map [S-right] [?\C-f]) + (define-key canna-mode-map [C-right] [?\C-f]) + (define-key canna-mode-map [left] [?\C-b]) + (define-key canna-mode-map [S-left] [?\C-b]) + (define-key canna-mode-map [C-left] [?\C-b]) + (define-key canna-mode-map [kanji] [? ]) + (define-key canna-mode-map [?\C- ] [?\C-@]) + )) ;; ミニバッファに何かを表示している時のローカルマップ (defvar canna-minibuffer-mode-map (make-sparse-keymap)) @@ -253,20 +335,38 @@ t の時はデフォルトの色を使用する。 (define-key canna-minibuffer-mode-map (make-string 1 ch) 'canna-minibuffer-insert-command) (setq ch (1+ ch)))) -(define-key canna-minibuffer-mode-map [up] [?\C-p]) -(define-key canna-minibuffer-mode-map [S-up] [?\C-p]) -(define-key canna-minibuffer-mode-map [C-up] [?\C-p]) -(define-key canna-minibuffer-mode-map [down] [?\C-n]) -(define-key canna-minibuffer-mode-map [S-down] [?\C-n]) -(define-key canna-minibuffer-mode-map [C-down] [?\C-n]) -(define-key canna-minibuffer-mode-map [right] [?\C-f]) -(define-key canna-minibuffer-mode-map [S-right] [?\C-f]) -(define-key canna-minibuffer-mode-map [C-right] [?\C-f]) -(define-key canna-minibuffer-mode-map [left] [?\C-b]) -(define-key canna-minibuffer-mode-map [S-left] [?\C-b]) -(define-key canna-minibuffer-mode-map [C-left] [?\C-b]) -(define-key canna-minibuffer-mode-map [kanji] [? ]) -(define-key canna-minibuffer-mode-map [?\C- ] [?\C-@]) +(cond ((featurep 'xemacs) + (define-key canna-minibuffer-mode-map [up] "\C-p") + (define-key canna-minibuffer-mode-map [(shift up)] "\C-p") + (define-key canna-minibuffer-mode-map [(control up)] "\C-p") + (define-key canna-minibuffer-mode-map [down] "\C-n") + (define-key canna-minibuffer-mode-map [(shift down)] "\C-n") + (define-key canna-minibuffer-mode-map [(control down)] "\C-n") + (define-key canna-minibuffer-mode-map [right] "\C-f") + (define-key canna-minibuffer-mode-map [(shift right)] "\C-f") + (define-key canna-minibuffer-mode-map [(control right)] "\C-f") + (define-key canna-minibuffer-mode-map [left] "\C-b") + (define-key canna-minibuffer-mode-map [(shift left)] "\C-b") + (define-key canna-minibuffer-mode-map [(control left)] "\C-b") + (define-key canna-minibuffer-mode-map [kanji] " ") + (define-key canna-minibuffer-mode-map [(control space)] [(control @)]) + ) + (t + (define-key canna-minibuffer-mode-map [up] [?\C-p]) + (define-key canna-minibuffer-mode-map [S-up] [?\C-p]) + (define-key canna-minibuffer-mode-map [C-up] [?\C-p]) + (define-key canna-minibuffer-mode-map [down] [?\C-n]) + (define-key canna-minibuffer-mode-map [S-down] [?\C-n]) + (define-key canna-minibuffer-mode-map [C-down] [?\C-n]) + (define-key canna-minibuffer-mode-map [right] [?\C-f]) + (define-key canna-minibuffer-mode-map [S-right] [?\C-f]) + (define-key canna-minibuffer-mode-map [C-right] [?\C-f]) + (define-key canna-minibuffer-mode-map [left] [?\C-b]) + (define-key canna-minibuffer-mode-map [S-left] [?\C-b]) + (define-key canna-minibuffer-mode-map [C-left] [?\C-b]) + (define-key canna-minibuffer-mode-map [kanji] [? ]) + (define-key canna-minibuffer-mode-map [?\C- ] [?\C-@]) + )) ;;; ;;; グローバル関数の書き替え @@ -341,13 +441,17 @@ See also document for canna:saved-exit-minibuffer." ;;; (defun canna-functional-insert-command (arg) - "Use input character as a key of complex translation input such as\n\ + "Use input character as a key of complex translation input such as kana-to-kanji translation." (interactive "*p") - (canna:functional-insert-command2 last-command-char arg) ) + (let ((ch)) + (if (char-or-char-int-p arg) + (setq ch last-command-char) + (setq ch (event-to-character last-command-event))) + (canna:functional-insert-command2 ch arg) )) (defun canna:functional-insert-command2 (ch arg) - "This function actualy isert a converted Japanese string." + "This function actually inserts a converted Japanese string." ;; この関数は与えられた文字を日本語入力のためのキー入力として取り扱 ;; い、日本語入力の中間結果を含めた処理をEmacsのバッファに反映させる ;; 関数である。 @@ -376,16 +480,7 @@ kana-to-kanji translation." (set-marker canna:*spos-undo-text* (point)) ;; ;; update kbnes - ;; by 守岡 知彦 1996/11/8 - ;; とりあえず insert にしとく。 - (insert canna-kakutei-string) - ;;(let ((list (string-to-char-list canna-kakutei-string)) - ;; ;; 挿入の途中で blink が起きるとうっとおしいので、 - ;; ;; 一時的に blink を抑止する。 - ;; (blink-matching-paren nil)) - ;; (while list - ;; (self-insert-internal (car list)) - ;; (setq list (cdr list)))) + (canna-self-insert-string canna-kakutei-string) ;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の ;; 類だったときは blink させる。 (if (and canna-empty-info @@ -413,17 +508,7 @@ kana-to-kanji translation." (t ;; ;; update kbnes - ;; by 守岡 知彦 1996/11/8 - ;; とりあえず insert にしとく。 - (insert canna-kakutei-string) - ;; (let ((list (string-to-char-list canna-kakutei-string)) - ;; ;; 挿入の途中で blink が起きるとうっとおしいので、 - ;; ;; 一時的に blink を抑止する。 - ;; (blink-matching-paren nil)) - ;; (while list - ;; (self-insert-internal (car list)) - ;; (setq list (cdr list)))) - + (canna-self-insert-string canna-kakutei-string) ;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の ;; 類だったときは blink させる。 (if (and canna-empty-info @@ -558,10 +643,13 @@ kana-to-kanji translation." (setq canna:*saved-minibuffer* (window-buffer (minibuffer-window))) ; (set-window-buffer (minibuffer-window) ; (get-buffer-create canna:*menu-buffer*)) - (setq canna:*saved-redirection* (frame-focus (selected-frame))) - (redirect-frame-focus (selected-frame) - (window-frame (minibuffer-window))) - + ;; modified by 守岡 知彦 , 1996/6/7 + (unless (featurep 'xemacs) + ;; とりあえず XEmacs では動かさないことにしておこう (^_^; + (setq canna:*saved-redirection* (frame-focus (selected-frame))) + (redirect-frame-focus (selected-frame) + (window-frame (minibuffer-window))) + ) ;; ミニバッファのキーマップを保存しておく。 (setq canna:*minibuffer-local-map-backup* (current-local-map)) )) @@ -601,8 +689,12 @@ kana-to-kanji translation." ;; ミニバッファウィンドウのバッファを元に戻す。 (set-window-buffer (minibuffer-window) canna:*saved-minibuffer*) ; (setq canna:*saved-minibuffer* nil) - (redirect-frame-focus (window-frame canna:*previous-window*) - canna:*saved-redirection*) + ;; modified by 守岡 知彦 , 1996/6/7 + (unless (featurep 'xemacs) + ;; とりあえず XEmacs では動かさないようにしておこう (^_^; + (redirect-frame-focus (window-frame canna:*previous-window*) + canna:*saved-redirection*) + ) ; ミニバッファで入力していたのなら以下もする。 ; (if (eq canna:*previous-window* (selected-window)) ; (progn @@ -623,7 +715,11 @@ kana-to-kanji translation, even if you are in the minibuffer." (use-local-map canna:*minibuffer-local-map-backup*) (set-window-buffer (minibuffer-window) canna:*saved-minibuffer*) (select-window canna:*previous-window*) - (canna:functional-insert-command2 last-command-char arg) ) + (let ((ch)) + (if (char-or-char-int-p arg) + (setq ch last-command-char) + (setq ch (event-to-character last-command-event))) + (canna:functional-insert-command2 ch arg) )) ;;; ;;; かんなモードの主役は、次の canna-self-insert-command である。この @@ -635,8 +731,8 @@ kana-to-kanji translation, even if you are in the minibuffer." ;;; canna-functional-insert-command を呼ぶ。 ;;; -(if (not (boundp 'MULE)) ; for Nemacs - (defun cancel-undo-boundary ())) +;; (if (not (boundp 'MULE)) ; for Nemacs +;; (defun cancel-undo-boundary ())) (defun canna-self-insert-command (arg) "Self insert pressed key and use it to assemble Romaji character." @@ -671,6 +767,9 @@ kana-to-kanji translation, even if you are in the minibuffer." (- (point) arg) (point))) (if (= last-command-char ? ) (canna:do-auto-fill)))))) +;; wire us into pending-delete +(put 'canna-self-insert-command 'pending-delete t) + (defun canna-toggle-japanese-mode () "Toggle canna japanese mode." (interactive) @@ -749,11 +848,14 @@ kana-to-kanji translation, even if you are in the minibuffer." canna:*saved-mode-string* new-mode))) 0))) - (setq canna:*local-map-backup* (current-local-map)) + (setq canna:*local-map-backup* (current-local-map)) (setq canna:*fence-mode* t) - (if (boundp 'disable-undo) - (setq disable-undo canna:*fence-mode*)) - (use-local-map canna-mode-map) ) + ;; XEmacs change: + ;; (buffer-disable-undo (current-buffer)) + ;; Original: + ;; (if (boundp 'disable-undo) + ;; (setq disable-undo canna:*fence-mode*)) + (use-local-map canna-mode-map)) (defun canna:enter-canna-mode-and-functional-insert () (canna:enter-canna-mode) @@ -771,8 +873,11 @@ kana-to-kanji translation, even if you are in the minibuffer." (if canna:*japanese-mode* (canna-toggle-japanese-mode) (mode-line-canna-mode-update canna:*alpha-mode-string*) ))) - (if (boundp 'disable-undo) - (setq disable-undo canna:*fence-mode*)) + ;; XEmacs change: + ;; (buffer-enable-undo (current-buffer)) + ;; Original: + ;; (if (boundp 'disable-undo) + ;; (setq disable-undo canna:*fence-mode*)) )) (set-marker canna:*region-start* nil) (set-marker canna:*region-end* nil) @@ -804,8 +909,7 @@ kana-to-kanji translation, even if you are in the minibuffer." ))) (defun canna-touroku-region (start end) - "Register a word which is indicated by region into a kana-to-kanji\n\ -dictionary." + "Register a word in the selected region into a kana-to-kanji dictionary." (interactive "r") (if (canna-without-newline start end) ; (if canna:*japanese-mode* @@ -903,7 +1007,10 @@ dictionary." (eq hilit-background-mode 'dark)) (string-match "on\\|t" - (or (x-get-resource "ReverseVideo" "reverseVideo") + (or (if (featurep 'xemacs) + (x-get-resource "ReverseVideo" + "reverseVideo" 'string) + (x-get-resource "ReverseVideo" "reverseVideo")) ""))) 'reverse) ;反転しているなら 'reverse (t 'normal))) @@ -957,7 +1064,14 @@ dictionary." (define-key global-map (make-string 1 ch) 'canna-self-insert-command) (setq ch (1+ ch)) )) - (cond ((let ((keys (car init-val)) (ok nil)) + (cond + ;; #### I'm just guessing that this should come before the + ;; init-val setting + ;; if registered with LEIM, no-op + ((featurep 'canna-leim) t) + ;; check to see if an X resource or the like is available in + ;; init-val + ((let ((keys (car init-val)) (ok nil)) (while keys (cond ((< (car keys) 128) (global-set-key @@ -966,9 +1080,13 @@ dictionary." (setq ok t) )) (setq keys (cdr keys)) ) ok)) - (t ; デフォルトの設定 - (global-set-key "\C-o" 'canna-toggle-japanese-mode) )) + ;; デフォルトの設定 + ;; Since XEmacs provides canna-leim.el, we should leave this + ;; as is. + (t (global-set-key "\C-o" 'canna-toggle-japanese-mode) )) + ;; #### should these global bindings be conditional on LEIM? + ;; LEIM doesn't use kanji key yet AFAIK, so leave them. (if (not (keymapp (global-key-binding "\e["))) (global-unset-key "\e[") ) (global-set-key "\e[210z" 'canna-toggle-japanese-mode) ; XFER @@ -1106,8 +1224,7 @@ dictionary." ;;; (defun canna-set-mark-command (arg) - "Besides setting mark, set mark as a HENKAN region if it is in\n\ -the japanese mode." + "Set mark, also set mark as HENKAN region if in Japanese mode." (interactive "P") (set-mark-command arg) (if canna:*japanese-mode* @@ -1116,8 +1233,7 @@ the japanese mode." (message "Mark set(変換領域開始)") ))) (defun canna-henkan-region-or-self-insert (arg) - "Do kana-to-kanji convert region if HENKAN region is defined,\n\ -self insert otherwise." + "Do kana-to-kanji convert region if HENKAN region is defined, else insert." (interactive "*p") (if (and canna:*use-region-as-henkan-region* ; (< (mark) (point)) @@ -1296,3 +1412,8 @@ self insert otherwise." (delete-overlay canna:*select-overlay*) ) ) + + +(provide 'canna) + +;;; canna.el ends here