From: morioka Date: Thu, 3 Apr 1997 20:18:20 +0000 (+0000) Subject: Merge canna.el for XEmacs. X-Git-Tag: emacs-canna-199811302358~31 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=09a9c22c59b9e55ba9d34b07523e8adbf4b34052;p=elisp%2Femacs-canna.git Merge canna.el for XEmacs. --- diff --git a/canna.el b/canna.el index 947f188..715e5cf 100644 --- a/canna.el +++ b/canna.el @@ -1,28 +1,40 @@ -;; 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 MORIOKA Tomohiko -;; 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 +;; Version: $Revision: 1.6 $ +;; 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 not a part of Emacs yet. -;; 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. + +;; 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: ;; -*-mode: emacs-lisp-*- @@ -37,7 +49,7 @@ ;; end (defconst canna-rcs-version - "$Id: canna.el,v 1.5 1997-04-03 18:52:22 morioka Exp $") + "$Id: canna.el,v 1.6 1997-04-03 20:18:20 morioka Exp $") (defun canna-version () "Display version of canna.el in mini-buffer." @@ -50,7 +62,40 @@ )) " ..."))) -(provide 'canna) +;; added by MORIOKA Tomohiko , 1996/6/7 +(or (fboundp 'minibuffer-prompt-width) + (defun minibuffer-prompt-width () + "Return the display width of the minibuffer prompt." + (save-excursion + (set-buffer (window-buffer (minibuffer-window))) + (current-column) + )) + ) + +;; added by MORIOKA Tomohiko , 1997/4/3 +(or (fboundp 'char-or-char-int-p) + (defalias 'char-or-char-int-p 'integerp) + ) + +;; added by MORIOKA Tomohiko , 1996/6/18 +(defvar running-xemacs (string-match "XEmacs" emacs-version)) + +(cond (running-xemacs + (require 'overlay) + (defun self-insert-string (string) + (let ((len (length string)) + (i 0) + ;; 挿入の途中で blink が起きるとうっとおしいので、 + ;; 一時的に blink を抑止する。 + (blink-matching-paren nil)) + (while (< i len) + (self-insert-internal (aref canna-kakutei-string i)) + (setq i (1+ i)) + ))) + ) + (t + (defalias 'self-insert-string 'insert) + )) ;;; かんなの変数 @@ -237,20 +282,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 (running-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)) @@ -260,20 +323,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 (running-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-@]) + )) ;;; ;;; グローバル関数の書き替え @@ -351,7 +432,11 @@ See also document for canna:saved-exit-minibuffer." "Use input character as a key of complex translation input such as\n\ 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." @@ -383,16 +468,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)))) + (self-insert-string canna-kakutei-string) ;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の ;; 類だったときは blink させる。 (if (and canna-empty-info @@ -420,17 +496,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)))) - + (self-insert-string canna-kakutei-string) ;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の ;; 類だったときは blink させる。 (if (and canna-empty-info @@ -565,10 +631,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 running-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)) )) @@ -608,8 +677,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 running-xemacs + ;; とりあえず XEmacs では動かさないようにしておこう (^_^; + (redirect-frame-focus (window-frame canna:*previous-window*) + canna:*saved-redirection*) + ) ; ミニバッファで入力していたのなら以下もする。 ; (if (eq canna:*previous-window* (selected-window)) ; (progn @@ -630,7 +703,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 である。この @@ -758,9 +835,11 @@ kana-to-kanji translation, even if you are in the minibuffer." 0))) (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)) + ;; (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) @@ -778,8 +857,10 @@ 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)) + ;; (if (boundp 'disable-undo) + ;; (setq disable-undo canna:*fence-mode*)) )) (set-marker canna:*region-start* nil) (set-marker canna:*region-end* nil) @@ -910,7 +991,10 @@ dictionary." (eq hilit-background-mode 'dark)) (string-match "on\\|t" - (or (x-get-resource "ReverseVideo" "reverseVideo") + (or (if running-xemacs + (x-get-resource "ReverseVideo" + "reverseVideo" 'string) + (x-get-resource "ReverseVideo" "reverseVideo")) ""))) 'reverse) ;反転しているなら 'reverse (t 'normal))) @@ -1303,3 +1387,8 @@ self insert otherwise." (delete-overlay canna:*select-overlay*) ) ) + + +(provide 'canna) + +;;; canna.el ends here