Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68

[bpt/emacs.git] / lisp / international / encoded-kb.el

diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index f9020fe..7ec8446 100644 (file)
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -1,8 +1,9 @@
 ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
@@ -21,8 +22,8 @@
 
 ;; 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:
 
@@ -130,9 +131,7 @@ The following key sequence may cause multilingual text insertion."
 
 (defun encoded-kbd-iso2022-single-shift (ignore)
   (let ((char (encoded-kbd-last-key)))
-    (aset encoded-kbd-iso2022-invocations 2
-         (aref encoded-kbd-iso2022-designations
-               (if (= char ?\216) 2 3))))
+    (aset encoded-kbd-iso2022-invocations 2 (if (= char ?\216) 2 3)))
   "")
 
 (defun encoded-kbd-self-insert-iso2022-7bit (ignore)
@@ -177,14 +176,46 @@ The following key sequence may cause multilingual text insertion."
       (setq str (format "%s%c" str (read-char-exclusive))))
     (vector (aref result 0))))
 
+
+;; Decode list of codes in CODE-LIST by CHARSET and return the decoded
+;; characters.  If CODE-LIST is too short for the dimension of
+;; CHARSET, read new codes and append them to the tail of CODE-LIST.
+;; Return nil if CODE-LIST can't be decoded.
+
+(defun encoded-kbd-decode-code-list (charset code-list)
+  (let ((dimension (charset-dimension charset))
+       code)
+    (while (> dimension (length code-list))
+      (nconc code-list (list (read-char-exclusive))))
+    (setq code (car code-list))
+    (if (= dimension 1)
+       (decode-char charset code)
+      (setq code-list (cdr code-list)
+           code (logior (lsh code 8) (car code-list)))
+      (if (= dimension 2)
+         (decode-char charset code)
+       (setq code-list (cdr code-list)
+             code (logior (lsh code 8) (car code-list)))
+       (if (= dimension 3)
+           (decode-char charset code)
+         ;; As Emacs can't handle full 32-bit integer, we must give a
+         ;; cons of higher and lower 16-bit codes to decode-char.
+         (setq code (cons (lsh code -8)
+                          (logior (lsh (car code-list) 8) (cadr code-list))))
+         (decode-char charset code))))))
+
 (defun encoded-kbd-self-insert-charset (ignore)
-  (let* ((charset-list
-         (coding-system-get (keyboard-coding-system) :charset-list))
-        (charset (car charset-list))
-        ;; For the moment, we can assume that the length of CHARSET-LIST
-        ;; is 1, and the dimension of CHARSET is 1.
-        (char (encoded-kbd-last-key)))
-    (vector (or (decode-char charset char) char))))
+  (let ((charset-list
+        (coding-system-get (keyboard-coding-system) :charset-list))
+       (code-list (list (encoded-kbd-last-key)))
+       tail char)
+    (while (and charset-list (not char))
+      (setq char (encoded-kbd-decode-code-list (car charset-list) code-list)
+           charset-list (cdr charset-list)))
+    (if char
+       (vector char)
+      (setq unread-command-events (cdr code-list))
+      (vector (car code-list)))))
 
 (defun encoded-kbd-self-insert-utf-8 (arg)
   (interactive "p")
@@ -217,14 +248,19 @@ The following key sequence may cause multilingual text insertion."
     8)
 
    ((eq (coding-system-type coding) 'charset)
-    (let* ((charset (car (coding-system-get coding :charset-list)))
-          (code-space (get-charset-property charset :code-space))
-          (from (max (aref code-space 0) 128))
-          (to (aref code-space 1)))
-      (while (<= from to)
-       (define-key key-translation-map
-         (vector from) 'encoded-kbd-self-insert-charset)
-       (setq from (1+ from))))
+    (dolist (elt (mapcar
+                 #'(lambda (x) 
+                     (let ((dim (charset-dimension x))
+                           (code-space (get-charset-property x :code-space)))
+                       (cons (aref code-space (* (1- dim) 2))
+                             (aref code-space (1+ (* (1- dim) 2))))))
+                 (coding-system-get coding :charset-list)))
+      (let ((from (max (car elt) 128))
+           (to (cdr elt)))
+       (while (<= from to)
+         (define-key key-translation-map
+           (vector from) 'encoded-kbd-self-insert-charset)
+         (setq from (1+ from)))))
     8)
 
    ((eq (coding-system-type coding) 'iso-2022)
@@ -311,7 +347,7 @@ automatically.
 In Encoded-kbd mode, a text sent from keyboard is accepted
 as a multilingual text encoded in a coding system set by
 \\[set-keyboard-coding-system]."
-  :global t
+  :global t :group 'keyboard :group 'mule
 
   (if encoded-kbd-mode
       ;; We are turning on Encoded-kbd mode.