;;; quail.el --- provides simple input method for multilingual text
-;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H14PRO021
;; Author: Kenichi HANDA <handa@etl.go.jp>
;; Naoto TAKAHASHI <ntakahas@etl.go.jp>
;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(make-variable-buffer-local 'quail-current-package)
(put 'quail-current-package 'permanent-local t)
-;; Quail uses the following two buffers to assist users.
-;; A buffer to show available key sequence or translation list.
-(defvar quail-guidance-buf nil)
+;; Quail uses the following variables to assist users.
+;; A string containing available key sequences or translation list.
+(defvar quail-guidance-str nil)
;; A buffer to show completion list of the current key sequence.
(defvar quail-completion-buf nil)
+;; We may display the guidance string in a buffer on a one-line frame.
+(defvar quail-guidance-buf nil)
+(defvar quail-guidance-frame nil)
;; Each buffer in which Quail is activated should use different
-;; guidance buffers.
-(make-variable-buffer-local 'quail-guidance-buf)
-(put 'quail-guidance-buf 'permanent-local t)
-
-;; A main window showing Quail guidance buffer.
-(defvar quail-guidance-win nil)
-(make-variable-buffer-local 'quail-guidance-win)
+;; guidance string.
+(make-variable-buffer-local 'quail-guidance-str)
+(put 'quail-guidance-str 'permanent-local t)
(defvar quail-overlay nil
"Overlay which covers the current translation region of Quail.")
title
(condition-case nil
(mapconcat
- (lambda (x)
+ (lambda (x)
(cond ((stringp x) x)
((and (listp x) (symbolp (car x)) (= (length x) 3))
(if (symbol-value (car x))
(let ((pos (point)))
(if (overlayp quail-overlay)
(move-overlay quail-overlay pos pos)
- (setq quail-overlay (make-overlay pos pos nil nil t))
+ (setq quail-overlay (make-overlay pos pos))
(if input-method-highlight-flag
(overlay-put quail-overlay 'face 'underline))
(let ((l (quail-overlay-plist)))
(if (overlayp quail-conv-overlay)
(if (not (overlay-start quail-conv-overlay))
(move-overlay quail-conv-overlay pos pos))
- (setq quail-conv-overlay (make-overlay pos pos nil nil t))
+ (setq quail-conv-overlay (make-overlay pos pos))
(if input-method-highlight-flag
(overlay-put quail-conv-overlay 'face 'underline))))))
(if (and (overlayp quail-conv-overlay) (overlay-start quail-conv-overlay))
(delete-overlay quail-conv-overlay)))
-;; Kill Quail guidance buffer. Set in kill-buffer-hook.
-(defun quail-kill-guidance-buf ()
- (if (buffer-live-p quail-guidance-buf)
- (kill-buffer quail-guidance-buf)))
-
(defun quail-inactivate ()
"Inactivate Quail input method.
;; Let's inactivate Quail input method.
(unwind-protect
(progn
- (quail-hide-guidance-buf)
(quail-delete-overlays)
(setq describe-current-input-method-function nil)
+ (quail-hide-guidance)
+ (remove-hook 'post-command-hook 'quail-show-guidance t)
(run-hooks 'quail-inactivate-hook))
(kill-local-variable 'input-method-function))
;; Let's activate Quail input method.
(setq inactivate-current-input-method-function 'quail-inactivate)
(setq describe-current-input-method-function 'quail-help)
(quail-delete-overlays)
- (quail-show-guidance-buf)
+ (setq quail-guidance-str "")
+ (quail-show-guidance)
;; If we are in minibuffer, turn off the current input method
;; before exiting.
- (if (eq (selected-window) (minibuffer-window))
- (add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer))
- (add-hook 'kill-buffer-hook 'quail-kill-guidance-buf nil t)
+ (when (eq (selected-window) (minibuffer-window))
+ (add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer)
+ (add-hook 'post-command-hook 'quail-show-guidance nil t))
(run-hooks 'quail-activate-hook)
(make-local-variable 'input-method-function)
(setq input-method-function 'quail-input-method)))
but the location of key \\ (backslash) is just right of key ' (single-quote),
not right of RETURN key.")
-(defcustom quail-keyboard-layout quail-keyboard-layout-standard
- "A string which represents physical key layout of a particular keyboard.
-We assume there are six rows and each row has 15 keys (columns),
- the first row is above the `1' - `0' row,
- the first column of the second row is left of key `1',
- the first column of the third row is left of key `q',
- the first column of the fourth row is left of key `a',
- the first column of the fifth row is left of key `z',
- the sixth row is below the `z' - `/' row.
-Nth (N is even) and (N+1)th characters in the string are non-shifted
-and shifted characters respectively at the same location.
-The location of Nth character is row (N / 30) and column ((N mod 30) / 2).
-The command `quail-set-keyboard-layout' usually sets this variable."
- :group 'quail
- :type `(choice
- ,@(mapcar (lambda (pair)
- (list 'const :tag (car pair) (cdr pair)))
- quail-keyboard-layout-alist)
- (string :tag "Other")))
-
(defconst quail-keyboard-layout-len 180)
;; Here we provide several examples of famous keyboard layouts.
See the documentation of `quail-keyboard-layout' for the format of
the layout string.")
+(defcustom quail-keyboard-layout quail-keyboard-layout-standard
+ "A string which represents physical key layout of a particular keyboard.
+We assume there are six rows and each row has 15 keys (columns),
+ the first row is above the `1' - `0' row,
+ the first column of the second row is left of key `1',
+ the first column of the third row is left of key `q',
+ the first column of the fourth row is left of key `a',
+ the first column of the fifth row is left of key `z',
+ the sixth row is below the `z' - `/' row.
+Nth (N is even) and (N+1)th characters in the string are non-shifted
+and shifted characters respectively at the same location.
+The location of Nth character is row (N / 30) and column ((N mod 30) / 2).
+The command `quail-set-keyboard-layout' usually sets this variable."
+ :group 'quail
+ :type `(choice
+ ,@(mapcar (lambda (pair)
+ (list 'const :tag (car pair) (cdr pair)))
+ quail-keyboard-layout-alist)
+ (string :tag "Other")))
+
;; A non-standard keyboard layout may miss some key locations of the
;; standard layout while having additional key locations not in the
;; standard layout. This alist maps those additional key locations to
The variable `quail-keyboard-layout-type' holds the currently selected
keyboard type."
(interactive
- (list (completing-read "Keyboard type (default, current choice): "
+ (list (completing-read "Keyboard type (default current choice): "
quail-keyboard-layout-alist
nil t)))
(or (and keyboard-type (> (length keyboard-type) 0))
The installed decode map can be referred by the function `quail-decode-map'."
(if (null quail-current-package)
(error "No current Quail package"))
- (if (not (and (consp decode-map) (eq (car decode-map) 'decode-map)))
- (error "Invalid Quail decode map `%s'" decode-map))
- (setcar (nthcdr 10 quail-current-package) decode-map))
+ (if (if (consp decode-map)
+ (eq (car decode-map) 'decode-map)
+ (if (char-table-p decode-map)
+ (eq (char-table-subtype decode-map) 'quail-decode-map)))
+ (setcar (nthcdr 10 quail-current-package) decode-map)
+ (error "Invalid Quail decode map `%s'" decode-map)))
+
;;;###autoload
(defun quail-defrule (key translation &optional name append)
Optional 6th arg PROPS is a property list annotating TRANS. See the
function `quail-define-rules' for the detail."
- (if (null (stringp key))
- "Invalid Quail key `%s'" key)
+ (if (not (or (stringp key) (vectorp key)))
+ (error "Invalid Quail key `%s'" key))
(if (not (or (numberp trans) (stringp trans) (vectorp trans)
(consp trans)
(symbolp trans)
(t
(error "Invalid object in Quail map: %s" def))))
-(defun quail-lookup-key (key &optional len)
+(defun quail-lookup-key (key &optional len not-reset-indices)
"Lookup KEY of length LEN in the current Quail map and return the definition.
The returned value is a Quail map specific to KEY."
(or len
(if (and (consp translation) (vectorp (cdr translation)))
(progn
(setq quail-current-translations translation)
- (if (quail-forget-last-selection)
+ (if (and (not not-reset-indices) (quail-forget-last-selection))
(setcar (car quail-current-translations) 0))))))
;; We may have to reform cdr part of MAP.
(if (and (cdr map) (functionp (cdr map)))
(list key)
(quail-setup-overlays (quail-conversion-keymap))
(let ((modified-p (buffer-modified-p))
- (buffer-undo-list t))
- (or (and quail-guidance-win
- (window-live-p quail-guidance-win)
- (eq (window-buffer quail-guidance-win) quail-guidance-buf)
- (not input-method-use-echo-area))
- (quail-show-guidance-buf))
+ (buffer-undo-list t)
+ (inhibit-modification-hooks t))
(unwind-protect
(let ((input-string (if (quail-conversion-keymap)
(quail-start-conversion key)
(quail-start-translation key))))
+ (setq quail-guidance-str "")
(when (and (stringp input-string)
(> (length input-string) 0))
(if input-method-exit-on-first-char
(list (aref input-string 0))
(quail-input-string-to-events input-string))))
(quail-delete-overlays)
- (if (buffer-live-p quail-guidance-buf)
- (with-current-buffer quail-guidance-buf
- (erase-buffer)))
- (quail-hide-guidance-buf)
(set-buffer-modified-p modified-p)
;; Run this hook only when the current input method doesn't require
;; conversion. When conversion is required, the conversion function
(setq unread-command-events (cons key unread-command-events)))
(while quail-translating
(set-buffer-modified-p modified-p)
- (let* ((keyseq (read-key-sequence
- (and input-method-use-echo-area
- (concat input-method-previous-message
- quail-current-str))
- nil nil t))
+ (quail-show-guidance)
+ (let* ((prompt (if input-method-use-echo-area
+ (format "%s%s %s"
+ (or input-method-previous-message "")
+ quail-current-str
+ quail-guidance-str)))
+ (keyseq (read-key-sequence prompt nil nil t))
(cmd (lookup-key (quail-translation-keymap) keyseq)))
(if (if key
(and (commandp cmd) (not (eq cmd 'quail-other-command)))
quail-current-str ""
quail-translating t)
(quail-setup-overlays nil)))
- ;; Hide '... loaded' message.
- (message nil)
- (let* ((keyseq (read-key-sequence
- (and input-method-use-echo-area
- (concat input-method-previous-message
- quail-conversion-str
- quail-current-str))
- nil nil t))
+ (quail-show-guidance)
+ (let* ((prompt (if input-method-use-echo-area
+ (format "%s%s%s %s"
+ (or input-method-previous-message "")
+ quail-conversion-str
+ quail-current-str
+ quail-guidance-str)))
+ (keyseq (read-key-sequence prompt nil nil t))
(cmd (lookup-key (quail-conversion-keymap) keyseq)))
(if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
(progn
(defun quail-terminate-translation ()
"Terminate the translation of the current key."
(setq quail-translating nil)
- (if (buffer-live-p quail-guidance-buf)
- (with-current-buffer quail-guidance-buf
- (erase-buffer))))
+ (setq quail-guidance-str " "))
(defun quail-select-current ()
"Accept the currently selected translation."
(quail-simple))
(setq control-flag t)))))))
(or input-method-use-echo-area
- (progn
+ (let (pos)
(quail-delete-region)
- (insert quail-current-str)))
+ (setq pos (point))
+ (or enable-multibyte-characters
+ (let (char)
+ (if (stringp quail-current-str)
+ (catch 'tag
+ (mapc #'(lambda (ch)
+ (when (/= (unibyte-char-to-multibyte
+ (multibyte-char-to-unibyte ch))
+ ch)
+ (setq char ch)
+ (throw 'tag nil)))
+ quail-current-str))
+ (if (/= (unibyte-char-to-multibyte
+ (multibyte-char-to-unibyte quail-current-str))
+ quail-current-str)
+ (setq char quail-current-str)))
+ (when char
+ (message "Can't input %c in the current unibyte buffer" char)
+ (ding)
+ (sit-for 2)
+ (message nil)
+ (setq quail-current-str nil)
+ (throw 'quail-tag nil))))
+ (insert quail-current-str)
+ (move-overlay quail-overlay pos (point))
+ (if (overlayp quail-conv-overlay)
+ (if (not (overlay-start quail-conv-overlay))
+ (move-overlay quail-conv-overlay pos (point))
+ (if (< (overlay-end quail-conv-overlay) (point))
+ (move-overlay quail-conv-overlay
+ (overlay-start quail-conv-overlay)
+ (point)))))))
(let (quail-current-str)
(quail-update-guidance))
(or (stringp quail-current-str)
(or (and (consp def) (aref (cdr def) (car (car def))))
def
(and (> len 1)
- (let ((str (quail-get-current-str
- (1- len)
- (quail-map-definition (quail-lookup-key
- quail-current-key (1- len))))))
+ (let* ((str (quail-get-current-str
+ (1- len)
+ (quail-map-definition (quail-lookup-key
+ quail-current-key (1- len)))))
+ (substr1 (substring quail-current-key (1- len) len))
+ (str1 (and (quail-deterministic)
+ (quail-get-current-str
+ 1
+ (quail-map-definition (quail-lookup-key
+ substr1 1))))))
(if str
(concat (if (stringp str) str (char-to-string str))
- (substring quail-current-key (1- len) len)))))))
+ (if str1
+ (if (stringp str1) str1 (char-to-string str1))
+ substr1)))))))
(defvar quail-guidance-translations-starting-column 20)
(< cur start) ; We moved to the previous block.
(>= cur end)) ; We moved to the next block.
(let ((len (length (cdr quail-current-translations)))
- (maxcol (- (window-width quail-guidance-win)
+ (maxcol (- (window-width)
quail-guidance-translations-starting-column))
(block (nth 3 indices))
col idx width trans num-items blocks)
;; And, we can terminate the current translation.
t)
+ ((quail-deterministic)
+ ;; No way to handle the last character in this context.
+ ;; Commit the longest successfully translated characters, and
+ ;; handle the remaining characters in a new loop.
+ (setq def nil)
+ (while (and (not def) (> len 1))
+ (setq len (1- len))
+ (setq def (quail-map-definition
+ (quail-lookup-key quail-current-key len))))
+ (if def (setq quail-current-str
+ (quail-get-current-str len def))
+ (setq quail-current-str (aref quail-current-key 0)))
+ len)
+
(t
;; No way to handle the last character in this context.
+ (setq def (quail-map-definition
+ (quail-lookup-key quail-current-key (1- len))))
+ (if def (setq quail-current-str
+ (quail-get-current-str (1- len) def)))
(1- len))))))
(defun quail-next-translation ()
;; Guidance, Completion, and Help buffer handlers.
-(defun quail-make-guidance-frame (buf)
- "Make a new one-line frame for Quail guidance buffer."
+(defun quail-make-guidance-frame ()
+ "Make a new one-line frame for Quail guidance."
(let* ((fparam (frame-parameters))
(top (cdr (assq 'top fparam)))
(border (cdr (assq 'border-width fparam)))
(newtop (- top
(frame-char-height) (* internal-border 2) (* border 2))))
(if (< newtop 0)
- (setq newtop (+ top (frame-pixel-height))))
- (let* ((frame (make-frame (append '((user-position . t) (height . 1)
- (minibuffer) (menu-bar-lines . 0))
- (cons (cons 'top newtop) fparam))))
- (win (frame-first-window frame)))
- (set-window-buffer win buf)
- ;;(set-window-dedicated-p win t)
- )))
+ (setq newtop (+ top (frame-pixel-height) internal-border border)))
+ (make-frame (append '((user-position . t) (height . 1)
+ (minibuffer)
+ (menu-bar-lines . 0) (tool-bar-lines . 0))
+ (cons (cons 'top newtop) fparam)))))
(defun quail-setup-completion-buf ()
"Setup Quail completion buffer."
(let ((default-enable-multibyte-characters enable-multibyte-characters))
(setq quail-completion-buf (get-buffer-create "*Quail Completions*")))
(with-current-buffer quail-completion-buf
+ (setq buffer-read-only t)
(setq quail-overlay (make-overlay 1 1))
(overlay-put quail-overlay 'face 'highlight))))
(not (quail-simple))
t))))
-(defun quail-show-guidance-buf ()
- "Display a guidance buffer for Quail input method in some window.
-Create the buffer if it does not exist yet.
-The buffer is normally displayed at the echo area,
-but if the current buffer is a minibuffer, it is shown in
-the bottom-most ordinary window of the same frame,
-or in a newly created frame (if the selected frame has no other windows)."
- (when (quail-require-guidance-buf)
- ;; At first, setup a guidance buffer.
- (let ((default-enable-multibyte-characters enable-multibyte-characters))
- (or (buffer-live-p quail-guidance-buf)
- (setq quail-guidance-buf (generate-new-buffer " *Quail-guidance*"))))
- (let ((name (quail-name))
- (title (quail-title)))
- (with-current-buffer quail-guidance-buf
- ;; To show the title of Quail package.
- (setq current-input-method name
- current-input-method-title title)
- (erase-buffer)
- (or (overlayp quail-overlay)
- (progn
- (setq quail-overlay (make-overlay 1 1))
- (overlay-put quail-overlay 'face 'highlight)))
- (delete-overlay quail-overlay)
- (set-buffer-modified-p nil)))
- (bury-buffer quail-guidance-buf)
-
- ;; Assign the buffer " *Minibuf-N*" to all windows which are now
- ;; displaying quail-guidance-buf.
- (let ((win-list (get-buffer-window-list quail-guidance-buf t t)))
- (while win-list
- (set-window-buffer (car win-list)
- (format " *Minibuf-%d*" (minibuffer-depth)))
- (setq win-list (cdr win-list))))
-
- ;; Then, display it in an appropriate window.
- (let ((win (minibuffer-window)))
- (if (or (eq (selected-window) win)
- input-method-use-echo-area)
- ;; Since we are in minibuffer, we can't use it for guidance.
- (if (eq win (frame-root-window))
- ;; Create a frame. It is sure that we are using some
- ;; window system.
- (quail-make-guidance-frame quail-guidance-buf)
- ;; Find the bottom window and split it if necessary.
- (setq win (window-at
- 0 (1- (- (frame-height) (window-height win)))))
- (let ((height (window-height win))
- (window-min-height 2))
- ;; If WIN is tall enough, split it vertically and use
- ;; the lower one.
- (when (>= height 4)
- ;; Here, `split-window' returns a lower window
- ;; which is what we wanted.
- (setq win (split-window win (- height 2))))
- (set-window-buffer win quail-guidance-buf)
- (with-current-buffer quail-guidance-buf
- (fit-window-to-buffer win nil (window-height win)))))
- (set-window-buffer win quail-guidance-buf)
- (set-minibuffer-window win))
- (setq quail-guidance-win win)))
-
- ;; And, create a buffer for completion.
+
+;; Quail specific version of minibuffer-message. It displays STRING
+;; with timeout 1000000 seconds instead of two seconds.
+
+(defun quail-minibuffer-message (string)
+ (message nil)
+ (let ((point-max (point-max))
+ (inhibit-quit t))
+ (save-excursion
+ (goto-char point-max)
+ (insert string))
+ (sit-for 1000000)
+ (delete-region point-max (point-max))
+ (when quit-flag
+ (setq quit-flag nil
+ unread-command-events '(7)))))
+
+(defun quail-show-guidance ()
+ "Display a guidance for Quail input method in some window.
+The guidance is normally displayed at the echo area,
+or in a newly created frame (if the current buffer is a
+minibuffer and the selected frame has no other windows)."
+ ;; At first, setup a buffer for completion.
(quail-setup-completion-buf)
- (bury-buffer quail-completion-buf))
-
-(defun quail-hide-guidance-buf ()
- "Hide the Quail guidance buffer."
- (if (buffer-live-p quail-guidance-buf)
- (let ((win-list (get-buffer-window-list quail-guidance-buf t t))
- win)
- (while win-list
- (setq win (car win-list) win-list (cdr win-list))
- (if (window-minibuffer-p win)
- ;; We are using echo area for the guidance buffer.
- ;; Vacate it to the deepest minibuffer.
- (set-window-buffer win
- (format " *Minibuf-%d*" (minibuffer-depth)))
- (if (eq win (frame-root-window (window-frame win)))
- (progn
- ;; We are using a separate frame for guidance buffer.
- ;;(set-window-dedicated-p win nil)
- (delete-frame (window-frame win)))
- ;;(set-window-dedicated-p win nil)
- (delete-window win))))
- (setq quail-guidance-win nil))))
+ (bury-buffer quail-completion-buf)
+
+ ;; Then, show the guidance.
+ (when (and (quail-require-guidance-buf)
+ (not input-method-use-echo-area)
+ (null unread-command-events)
+ (null unread-post-input-method-events))
+ (if (eq (selected-window) (minibuffer-window))
+ (if (eq (minibuffer-window) (frame-root-window))
+ ;; Use another frame. It is sure that we are using some
+ ;; window system.
+ (let ((guidance quail-guidance-str))
+ (or (frame-live-p quail-guidance-frame)
+ (setq quail-guidance-frame
+ (quail-make-guidance-frame)))
+ (or (buffer-live-p quail-guidance-buf)
+ (setq quail-guidance-buf
+ (get-buffer-create " *Quail-guidance*")))
+ (save-excursion
+ (set-buffer quail-guidance-buf)
+ (erase-buffer)
+ (setq cursor-type nil)
+ (insert guidance))
+ (set-window-buffer (frame-root-window quail-guidance-frame)
+ quail-guidance-buf)
+ (quail-minibuffer-message
+ (format " [%s]" current-input-method-title)))
+ ;; Show the guidance in the next line of the currrent
+ ;; minibuffer.
+ (quail-minibuffer-message
+ (format " [%s]\n%s"
+ current-input-method-title quail-guidance-str)))
+ ;; Show the guidance in echo area without logging.
+ (let ((message-log-max nil))
+ (message "%s" quail-guidance-str)))))
+
+(defun quail-hide-guidance ()
+ "Hide the Quail guidance."
+ (when (and (quail-require-guidance-buf)
+ (or (eq (selected-window) (minibuffer-window))
+ input-method-use-echo-area)
+ (eq (minibuffer-window) (frame-root-window)))
+ ;; We are using another frame for the guidance.
+ (if (frame-live-p quail-guidance-frame)
+ (delete-frame quail-guidance-frame))
+ (if (buffer-live-p quail-guidance-buf)
+ (kill-buffer quail-guidance-buf))))
(defun quail-update-guidance ()
"Update the Quail guidance buffer and completion buffer (if displayed now)."
- ;; Update guidance buffer.
- (if (quail-require-guidance-buf)
- (let ((guidance (quail-guidance)))
- (unless (and (eq (selected-frame) (window-frame (minibuffer-window)))
- (eq (selected-frame) (window-frame quail-guidance-win)))
- ;; The guidance window is not shown in this frame, show it.
- (quail-show-guidance-buf))
- (cond ((or (eq guidance t)
- (consp guidance))
- ;; Show the current possible translations.
- (quail-show-translations))
- ((null guidance)
- ;; Show the current input keys.
- (let ((key quail-current-key))
- (if (quail-kbd-translate)
- (setq key (quail-keyseq-translate key)))
- (with-current-buffer quail-guidance-buf
- (erase-buffer)
- (insert key)))))
- ;; Make sure the height of the guidance window is OK --
- ;; sometimes, if the minibuffer window expands due to user
- ;; input (for instance if the newly inserted character is in a
- ;; different font), it will cause the guidance window to be
- ;; only partially visible. We force a redisplay first because
- ;; this automatic expansion doesn't happen until then, and we
- ;; want to see the window sizes after the expansion.
- (sit-for 0)
- (fit-window-to-buffer quail-guidance-win nil
- (window-height quail-guidance-win))))
+ ;; Update the guidance string.
+ (when (quail-require-guidance-buf)
+ (let ((guidance (quail-guidance)))
+ (cond ((or (eq guidance t)
+ (consp guidance))
+ ;; Show the current possible translations.
+ (setq quail-guidance-str
+ (quail-get-translations)))
+ ((null guidance)
+ ;; Show the current input keys.
+ (let ((key quail-current-key))
+ (if (quail-kbd-translate)
+ (setq key (quail-keyseq-translate key)))
+ (setq quail-guidance-str (if (stringp key) key (string key)))))
+ (t
+ (setq quail-guidance-str " ")))))
;; Update completion buffer if displayed now. We highlight the
;; selected candidate string in *Completion* buffer if any.
(delete-overlay quail-overlay)
(setq pos (point))
(if (and str (search-forward (concat "." str) nil t))
- (move-overlay quail-overlay (1+ (match-beginning 0)) (point))
- (move-overlay quail-overlay (match-beginning 0) (point)))
+ (move-overlay quail-overlay (1+ (match-beginning 0)) (point))
+ (move-overlay quail-overlay (match-beginning 0) (point)))
;; Now POS points end of KEY and (point) points end of STR.
(if (pos-visible-in-window-p (point) win)
;; STR is already visible.
(set-window-start win pos))
))))))
-(defun quail-show-translations ()
- "Show the current possible translations."
- (let* ((key quail-current-key)
- (map (quail-lookup-key quail-current-key))
- (current-translations quail-current-translations))
+(defun quail-get-translations ()
+ "Return a string containing the current possible translations."
+ (let ((map (quail-lookup-key quail-current-key nil t))
+ (str (copy-sequence quail-current-key)))
(if quail-current-translations
(quail-update-current-translations))
- (with-current-buffer quail-guidance-buf
- (erase-buffer)
-
- ;; Show the current key.
- (let ((guidance (quail-guidance)))
- (if (listp guidance)
- ;; We must show the specified PROMPTKEY instead of the
- ;; actual typed keys.
- (let ((i 0)
- (len (length key))
- prompt-key)
- (while (< i len)
- (setq prompt-key (cdr (assoc (aref key i) guidance)))
- (insert (or prompt-key (aref key i)))
- (setq i (1+ i))))
- (insert key)))
- ;; Show followable keys.
- (if (and (> (length key) 0) (cdr map))
- (let ((keys (mapcar (function (lambda (x) (car x)))
- (cdr map))))
- (setq keys (sort keys '<))
- (insert "[")
- (while keys
- (insert (car keys))
- (setq keys (cdr keys)))
- (insert "]")))
+ ;; Show the current key.
+ (let ((guidance (quail-guidance)))
+ (if (listp guidance)
+ ;; We must replace thetyped key with the specified PROMPTKEY.
+ (dotimes (i (length str))
+ (let ((prompt-key (cdr (assoc (aref str i) guidance))))
+ (if prompt-key
+ (aset str i (aref prompt-key 0)))))))
+ ;; Show followable keys.
+ (if (and (> (length quail-current-key) 0) (cdr map))
+ (setq str
+ (format "%s[%s]"
+ str
+ (concat (sort (mapcar (function (lambda (x) (car x)))
+ (cdr map))
+ '<)))))
;; Show list of translations.
- (if (and current-translations
+ (if (and quail-current-translations
(not (quail-deterministic)))
- (let* ((indices (car current-translations))
+ (let* ((indices (car quail-current-translations))
(cur (car indices))
(start (nth 1 indices))
(end (nth 2 indices))
(idx start))
- (indent-to (- quail-guidance-translations-starting-column 7))
- (insert (format "(%02d/"(nth 3 indices))
- (if (nth 4 indices)
- (format "%02d)" (nth 4 indices))
- "??)"))
+ (if (< (string-width str)
+ (- quail-guidance-translations-starting-column 7))
+ (setq str
+ (concat str
+ (make-string
+ (- quail-guidance-translations-starting-column
+ 7 (string-width str))
+ 32))))
+ (setq str (format "%s(%02d/%s)"
+ str (nth 3 indices)
+ (if (nth 4 indices)
+ (format "%02d" (nth 4 indices))
+ "??")))
(while (< idx end)
- (insert (format " %d." (if (= (- idx start) 9) 0
- (1+ (- idx start)))))
- (let ((pos (point)))
- (insert (aref (cdr current-translations) idx))
+ (let ((len (length str))
+ (trans (aref (cdr quail-current-translations) idx)))
+ (or (stringp trans)
+ (setq trans (string trans)))
+ (setq str (format "%s %d.%s"
+ str
+ (if (= (- idx start) 9) 0
+ (1+ (- idx start)))
+ trans))
(if (= idx cur)
- (move-overlay quail-overlay pos (point))))
- (setq idx (1+ idx)))))
- )))
+ (put-text-property (+ len 3) (length str)
+ 'face 'highlight str))
+ (setq idx (1+ idx))))))
+
+ str))
(defvar quail-completion-max-depth 5
"The maximum depth of Quail completion list.")
(quail-setup-completion-buf)
(let ((win (get-buffer-window quail-completion-buf 'visible))
(key quail-current-key)
- (map (quail-lookup-key quail-current-key))
+ (map (quail-lookup-key quail-current-key nil t))
(require-update nil))
(with-current-buffer quail-completion-buf
(if (and win
(minibuffer-scroll-window nil))
(scroll-other-window)))
(setq quail-current-key key)
- (erase-buffer)
- (insert "Possible completion and corresponding translations are:\n")
- (quail-completion-1 key map 1)
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (insert "Possible completion and corresponding characters are:\n")
+ (quail-completion-1 key map 1)
+ (set-buffer-modified-p nil))
(goto-char (point-min))
(display-buffer (current-buffer))
(setq require-update t)))
(or (> (length x) (length y))
(and (= (length x) (length y))
(not (string< x y))))))))
- (let ((frame-width (frame-width (window-frame (get-buffer-window
- (current-buffer) 'visible))))
+ (let ((window-width (window-width (get-buffer-window
+ (current-buffer) 'visible)))
(single-key-width 3)
(single-trans-width 4)
(multiple-key-width 3)
(setq multiple-key-width width)))
(when single-list
(setq col-width (+ single-key-width 1 single-trans-width 1)
- cols (/ frame-width col-width)
+ cols (/ window-width col-width)
rows (/ (length single-list) cols))
(if (> (% (length single-list) cols) 0)
(setq rows (1+ rows)))
(lambda (x)
(let ((width (if (integerp x) (char-width x)
(string-width x))))
- (when (> (+ (current-column) 1 width) frame-width)
+ (when (> (+ (current-column) 1 width) window-width)
(insert "\n")
(indent-to multiple-key-width))
(insert " " x))))
(define-button-type 'quail-keyboard-layout-button
:supertype 'help-xref
- 'help-function '(lambda (layout)
+ 'help-function '(lambda (layout)
(help-setup-xref `(quail-keyboard-layout-button ,layout) nil)
(quail-show-keyboard-layout layout))
'help-echo (purecopy "mouse-2, RET: show keyboard layout"))
(with-current-buffer standard-output
(setq quail-current-package package-def))))
;; Then, insert text in the help buffer while paying attention to
- ;; the width of the frame in which the buffer displayed.
+ ;; the width of the window in which the buffer displayed.
(with-current-buffer (help-buffer)
(setq buffer-read-only nil)
(insert "Input method: " (quail-name)
(quail-update-guidance)
))))
\f
+;; Add KEY (string) to the element of TABLE (char-table) for CHAR if
+;; it is not yet stored. As a result, the element is a string or a
+;; list of strings.
+
+(defsubst quail-store-decode-map-key (table char key)
+ (let ((elt (aref table char)))
+ (if elt
+ (if (consp elt)
+ (or (member key elt)
+ (aset table char (cons key elt)))
+ (or (string= key elt)
+ (aset table char (list key elt))))
+ (aset table char key))
+ (if (and translation-table-for-input
+ (setq char (aref translation-table-for-input char)))
+ (let ((translation-table-for-input nil))
+ (quail-store-decode-map-key table char key)))))
+
+;; Helper function for quail-gen-decode-map. Store key strings to
+;; type each character under MAP in TABLE (char-table). MAP is an
+;; element of the current Quail map reached by typing keys in KEY
+;; (string).
+
+(defun quail-gen-decode-map1 (map key table)
+ (when (and (consp map) (listp (cdr map)))
+ (let ((trans (car map)))
+ (cond ((integerp trans)
+ (quail-store-decode-map-key table trans key))
+ ((stringp trans)
+ (dotimes (i (length trans))
+ (quail-store-decode-map-key table (aref trans i) key)))
+ ((or (vectorp trans)
+ (and (consp trans)
+ (setq trans (cdr trans))))
+ (dotimes (i (length trans))
+ (let ((elt (aref trans i)))
+ (if (stringp elt)
+ (if (= (length elt) 1)
+ (quail-store-decode-map-key table (aref elt 0) key))
+ (quail-store-decode-map-key table elt key)))))))
+ (if (> (length key) 1)
+ (dolist (elt (cdr map))
+ (quail-gen-decode-map1 (cdr elt) key table))
+ (dolist (elt (cdr map))
+ (quail-gen-decode-map1 (cdr elt) (format "%s%c" key (car elt))
+ table)))))
+
+(put 'quail-decode-map 'char-table-extra-slots 0)
+
+;; Generate a halfly-cooked decode map (char-table) for the current
+;; Quail map. An element for a character C is a key string or a list
+;; of a key strings to type to input C. The lenth of key string is at
+;; most 2. If it is 2, more keys may be required to input C.
+
+(defun quail-gen-decode-map ()
+ (let ((table (make-char-table 'quail-decode-map nil)))
+ (dolist (elt (cdr (quail-map)))
+ (quail-gen-decode-map1 (cdr elt) (string (car elt)) table))
+ table))
+
+;; Check if CHAR equals to TARGET while also trying to translate CHAR
+;; by translation-table-for-input.
+
+(defsubst quail-char-equal-p (char target)
+ (or (= char target)
+ (and translation-table-for-input
+ (setq char (aref translation-table-for-input char))
+ (= char target))))
+
+;; Helper function for quail-find-key. Prepend key strings to type
+;; for inputting CHAR by the current input method to KEY-LIST and
+;; return the result. MAP is an element of the current Quail map
+;; reached by typing keys in KEY.
+
+(defun quail-find-key1 (map key char key-list)
+ (let ((trans (car map))
+ (found-here nil))
+ (cond ((stringp trans)
+ (setq found-here
+ (and (= (length trans) 1)
+ (quail-char-equal-p (aref trans 0) char))))
+ ((or (vectorp trans) (consp trans))
+ (if (consp trans)
+ (setq trans (cdr trans)))
+ (setq found-here
+ (catch 'tag
+ (dotimes (i (length trans))
+ (let ((target (aref trans i)))
+ (if (integerp target)
+ (if (quail-char-equal-p target char)
+ (throw 'tag t))
+ (if (and (= (length target) 1)
+ (quail-char-equal-p (aref target 0) char))
+ (throw 'tag t))))))))
+ ((integerp trans)
+ (setq found-here (quail-char-equal-p trans char))))
+ (if found-here
+ (setq key-list (cons key key-list)))
+ (if (> (length key) 1)
+ (dolist (elt (cdr map))
+ (setq key-list
+ (quail-find-key1 (cdr elt) (format "%s%c" key (car elt))
+ char key-list))))
+ key-list))
+
+;; If non-nil, the value has the form (QUAIL-MAP . CODING-SYSTEM)
+;; where QUAIL-MAP is a quail-map of which decode map was generated
+;; while buffer-file-coding-system was CODING-SYSTEM.
+
+(defvar quail-decode-map-generated nil)
+
+(defun quail-find-key (char)
+ "Return a list of keys to type to input CHAR in the current input method.
+If CHAR is an ASCII character and can be input by typing itself, return t."
+ (let ((decode-map (or (and (or (not quail-decode-map-generated)
+ (and (eq (car quail-decode-map-generated) (quail-map))
+ (eq (cdr quail-decode-map-generated)
+ (or buffer-file-coding-system t))))
+ (quail-decode-map))
+ (let ((map (quail-gen-decode-map)))
+ (setq quail-decode-map-generated
+ (cons (quail-map) (or buffer-file-coding-system t)))
+ (setcar (nthcdr 10 quail-current-package) map)
+ map)))
+ (key-list nil))
+ (if (consp decode-map)
+ (let ((str (string char)))
+ (mapc #'(lambda (elt)
+ (if (string= str (car elt))
+ (setq key-list (cons (cdr elt) key-list))))
+ (cdr decode-map)))
+ (let ((key-head (aref decode-map char)))
+ (if (stringp key-head)
+ (setq key-list (quail-find-key1
+ (quail-lookup-key key-head nil t)
+ key-head char nil))
+ (mapc #'(lambda (elt)
+ (setq key-list
+ (quail-find-key1
+ (quail-lookup-key elt nil t) elt char key-list)))
+ key-head))))
+ (or key-list
+ (and (< char 128)
+ (not (quail-lookup-key (string char) 1))))))
+
+(defun quail-show-key ()
+ "Show a list of key strings to type for inputting a character at point."
+ (interactive)
+ (or current-input-method
+ (error "No input method is activated"))
+ (or (assoc current-input-method quail-package-alist)
+ (error "The current input method does not use Quail"))
+ (let* ((char (following-char))
+ (key-list (quail-find-key char)))
+ (cond ((consp key-list)
+ (message "To input `%c', type \"%s\""
+ char
+ (mapconcat 'identity key-list "\", \"")))
+ ((eq key-list t)
+ (message "To input `%s', just type it"
+ (single-key-description char)))
+ (t
+ (message "%c can't be input by the current input method" char)))))
+
+\f
;; Quail map generator from state transition table.
(defun quail-map-from-table (table)
(translation-list nil)
map)
(while (> len 0)
- (setq map (quail-lookup-key key len)
+ (setq map (quail-lookup-key key len t)
len (1- len))
(if map
(let* ((def (quail-map-definition map))
;;
(provide 'quail)
+;;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
;;; quail.el ends here