X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=egg%2Fcannarpc.el;h=41fa7c028036297f72f46128c6ca99f154bfe9a6;hb=15b912a12c39651c5e7b4deecaa75f24a45fb4ba;hp=8cd2aa027461468ad963cc158ff348e57a5ca96c;hpb=987321355d887006c6429ef7868873182f21ff3c;p=elisp%2Ftamago.git

diff --git a/egg/cannarpc.el b/egg/cannarpc.el
index 8cd2aa0..41fa7c0 100644
--- a/egg/cannarpc.el
+++ b/egg/cannarpc.el
@@ -45,17 +45,31 @@
 	  ((eq c 'GetDirectoryList)      7)
 	  ((eq c 'MountDictionary)       8)
 	  ((eq c 'UnmountDictionary)       9)
+	  ((eq c 'GetMountDictionaryList) 11)
+	  ((eq c 'DefineWord)		  13)
+	  ((eq c 'DeleteWord)		  14)
 	  ((eq c 'BeginConvert)         15)
 	  ((eq c 'EndConvert)           16)
 	  ((eq c 'GetCandidacyList)     17)
 	  ((eq c 'GetYomi)              18)
 	  ((eq c 'ResizePause)          26)
+	  ((eq c 'GetHinshi)		  27)
+	  ((eq c 'GetLex)		  28)
+	  ((eq c 'SetApplicationName)	  33)
+	  ((eq c 'NoticeGroupName)        34)
 
 	  ((eq c 'CreateDictionary)      3)
+	  ((eq c 'Sync)			   8)
 	  (t (error "No such constant")))))
 
+;; XXX
+(defconst cannarpc-error-message (vector ))
+
 (defun cannarpc-get-error-message (errno)
-  (or (aref cannarpc-error-message errno) (format "#%d" errno)))
+  (or (and (>= errno 0)
+	   (< errno (length cannarpc-error-message))
+	   (aref cannarpc-error-message errno))
+      (format "#%d" errno)))
 
 (defmacro cannarpc-call-with-environment (e vlist send-expr &rest receive-exprs)
   (let ((v (append
@@ -73,54 +87,101 @@
 	   (goto-char (prog1 (point) (accept-process-output proc))))
 	receive-exprs))))
 
-(defconst canna-version-fmt "2.0:%s")
+(defconst canna-version-fmt "3.3:%s")
 
 (defun cannarpc-open (proc username)
   "Open the session.  Return 0 on success, error code on failure."
   (let ((verusr (format canna-version-fmt username)))
-    (comm-call-with-proc proc (result)
-      (comm-format (u u v) (canna-const Initialize) (length verusr) verusr)
-      (comm-unpack (u) result)
-      result)))
+    (comm-call-with-proc proc (minor context)
+      (comm-format (u u s) (canna-const Initialize) (+ (length verusr) 1)
+		   verusr)
+      (comm-unpack (w w) minor context)
+      (cond ((and (= minor 65535) (= context 65535))
+	     -1)			; failure
+	    ((and (= minor 65535) (= context 65534))
+	     -1)			; version miss match
+	    (t context)))))
 
 (defun cannarpc-close (proc)
   (comm-call-with-proc proc (dummy result)
     (comm-format (b b w) (canna-const Finalize) 0 0)
-    (comm-unpack (b b w b) dummy dummy dummy result)
-    result))
+    (comm-unpack (u b) dummy result)
+    (if (= result 255)
+	-1				; failure
+      result)))
 
 (defun cannarpc-create-context (proc)
   (comm-call-with-proc proc (dummy result)
     (comm-format (b b w) (canna-const CreateContext) 0 0)
-    (comm-unpack (b b w w) dummy dummy dummy result)
-    result))
+    (comm-unpack (u w) dummy result)
+    (if (= result 65535)
+	-1				; failure
+      result)))
 
-(defun cannarpc-close-context (proc context)
-  (comm-call-with-proc proc (dummy result)
+(defun cannarpc-close-context (env)
+  (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w w) (canna-const CloseContext) 0 2 context)
-    (comm-unpack (b b w b) dummy dummy dummy result)
-    result))
+    (comm-unpack (u b) dummy result)
+    (if (= result 255)
+	-1				; failure
+      result)))
 
-;; XXX: Not implemented fully
 (defun cannarpc-get-dictionary-list (env)
-  (cannarpc-call-with-environment env (dymmy result)
+  (let ((i 0)
+	dic dl dic-list)
+    (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w w w) (canna-const GetDictionaryList) 0 4
 		 context 1024)
     (comm-unpack (u w) dummy result)
     ;; follow list of dictionaries
-    result))
+      (if (= result 65535)
+	  -1				; failure
+	(while (< i result)
+	  (comm-unpack (s) dic)
+	  (if dl
+	      (setq dl (setcdr dl (cons dic nil)))
+	    (setq dic-list (setq dl (cons dic nil))))
+	  (setq i (1+ i)))
+	dic-list))))
 
-;; XXX: Not implemented fully
 (defun cannarpc-get-directory-list (env)
-  (cannarpc-call-with-environment env (dymmy result)
+  (let ((i 0)
+	dir dl dir-list)
+    (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w w w) (canna-const GetDirectoryList) 0 4
 		 context 1024)
     (comm-unpack (u w) dummy result)
     ;; follow list of directories
-    result))
+      (if (= result 65535)
+	  -1				; failure
+	(while (< i result)
+	  (comm-unpack (s) dir)
+	  (if dl
+	      (setq dl (setcdr dl (cons dir nil)))
+	    (setq dir-list (setq dl (cons dir nil))))
+	  (setq i (1+ i)))
+	dir-list))))
+
+(defun cannarpc-get-mount-dictionary-list (env)
+  (let ((i 0)
+	dic dl dic-list)
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w w) (canna-const GetMountDictionaryList) 0 4
+		   context 1024)
+      (comm-unpack (u w) dummy result)
+      ;; follow list of dictionaries
+      (if (= result 65535)
+	  -1				; failure
+	(while (< i result)
+	  (comm-unpack (s) dic)
+	  (if dl
+	      (setq dl (setcdr dl (cons dic nil)))
+	    (setq dic-list (setq dl (cons dic nil))))
+	  (setq i (1+ i)))
+	dic-list))))
 
 (defun cannarpc-open-dictionary (env dict-file-name mode)
-  (cannarpc-call-with-environment env (dymmy result)
+  (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w u w s) (canna-const MountDictionary) 0
 		 (+ (length dict-file-name) 7)
 		 mode context dict-file-name)
@@ -128,27 +189,28 @@
     result))
 
 (defun cannarpc-close-dictionary (env dict-file-name mode)
-  (cannarpc-call-with-environment env (dymmy result)
+  (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w u w s) (canna-const UnmountDictionary) 0
-		 (+ (length dict-file-name) 6)
+		 (+ (length dict-file-name) 7)
 		 mode context dict-file-name)
     (comm-unpack (u b) dummy result)
     result))
 
 (defun cannarpc-begin-conversion (env yomi)
   "Begin conversion."
-  (let ((yomi-ext (encode-coding-string yomi 'euc-japan))
+  (let ((yomi-ext (encode-coding-string yomi 'fixed-euc-jp))
+	(mode (or (cannaenv-get-mode env) 19)) ; 19 kana hiragana
 	(i 0)
 	converted bunsetsu-list bl)
     (cannarpc-call-with-environment env (dummy result)
-      (comm-format (b b w u w S) (canna-const BeginConvert) 0
-		   (+ (length yomi-ext) 8) 0 context yomi)
+      (comm-format (b b w i w S) (canna-const BeginConvert) 0
+		   (+ (length yomi-ext) 8) mode context yomi)
       (comm-unpack (u w) dummy result)
       (if (= result 65535)
 	  -1				; failure
 	(while (< i result)
 	  (comm-unpack (S) converted)
-	  (let ((bl1 (cons (canna-make-bunsetsu env converted i)
+	  (let ((bl1 (cons (canna-make-bunsetsu env converted i nil)
 			   nil)))
 	    (if bl
 		(setq bl (setcdr bl bl1))
@@ -156,11 +218,21 @@
 	  (setq i (1+ i)))
 	bunsetsu-list))))
 
+(defun cannarpc-cancel-conversion (env)
+  "Cancel conversion."
+  (cannarpc-call-with-environment env (dummy result)
+    (comm-format (b b w w w u) (canna-const EndConvert) 0 8 context 0 0)
+    (comm-unpack (u b) dummy result)
+    (if (= result 255)
+	-1				; failure
+      result)))
+
 (defun cannarpc-end-conversion (env len zenkouho-pos-vector mode)
   "End conversion."
   (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w w w u v) (canna-const EndConvert) 0
-		 (+ (* len 2) 8) context len mode zenkouho-pos-vector)
+		 (+ (* len 2) 8) context len mode zenkouho-pos-vector
+		 (length zenkouho-pos-vector))
     (comm-unpack (u b) dummy result)
     (if (= result 255)
 	-1				; failure
@@ -173,6 +245,24 @@
     (comm-unpack (u b) dummy result)
     result))
 
+(defun cannarpc-save-dictionary (env dict-name)
+  (cannarpc-call-with-environment env (dummy result)
+    (comm-format (b b w u w s) (canna-const Sync) 1
+		 (+ (length dict-name) 7) 0 context dict-name)
+    (comm-unpack (u b) dummy result)
+    result))
+
+;;; XXX not used
+(defun cannarpc-get-dictionary-data (env dir dic)
+  (cannarpc-call-with-environment env (dummy result)
+    (comm-format (b b w w s s w) 6 1
+		 (+ (length dir) (length dic) 6) context dir dic 4096)
+    (comm-unpack (u w) dummy result)
+    (if (= result 65535)
+	-1
+;;      (comm-unpack (S) result)
+      result)))
+
 (defun cannarpc-get-bunsetsu-source (env bunsetsu-pos)
   (cannarpc-call-with-environment env (dummy result)
     (comm-format (b b w w w w) (canna-const GetYomi) 0 6 context
@@ -183,18 +273,19 @@
       (comm-unpack (S) result)
       result)))
 
-(defun cannarpc-get-bunsetsu-candidates (env bunsetsu-pos)
+(defun cannarpc-get-bunsetsu-candidates (env bunsetsu-pos yomi)
   (let ((i 0)
 	converted bunsetsu-list bl)
     (cannarpc-call-with-environment env (dummy result)
       (comm-format (b b w w w w) (canna-const GetCandidacyList) 0 6 context
 		   bunsetsu-pos 1024)
-      (comm-unpack (u w) dymmy result)
+      (comm-unpack (u w) dummy result)
       (if (= result 65535)
 	  -1				; failure
 	(while (< i result)
 	  (comm-unpack (S) converted)
-	  (let ((bl1 (cons (canna-make-bunsetsu env converted bunsetsu-pos)
+	  (let ((bl1 (cons (canna-make-bunsetsu env converted
+						bunsetsu-pos yomi)
 			   nil)))
 	    (if bl
 		(setq bl (setcdr bl bl1))
@@ -202,4 +293,103 @@
 	  (setq i (1+ i)))
 	bunsetsu-list))))
 
+(defun cannarpc-set-kugiri-changed (env yomi-length bunsetsu-pos)
+  ;; yomi-length -2…文節縮め -1…文節伸ばし
+  (let* ((i bunsetsu-pos)
+	 converted bunsetsu-list bl)
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w w w) (canna-const ResizePause) 0 6 context
+		   bunsetsu-pos yomi-length)
+      (comm-unpack (u w) dummy result)
+      (if (= result 65535)
+	  -1				; failure
+	(while (< i result)
+	  (comm-unpack (S) converted)
+	  (let ((bl1 (cons (canna-make-bunsetsu env converted i nil) nil)))
+	    (if bl
+		(setq bl (setcdr bl bl1))
+	      (setq bunsetsu-list (setq bl bl1))))
+	  (setq i (1+ i)))
+	bunsetsu-list))))
+
+(defun cannarpc-get-hinshi (env bunsetsu-pos kouho-pos)
+  (let (b hinshi)
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w w w w) (canna-const GetHinshi) 0 8 context
+		   bunsetsu-pos kouho-pos 1024)
+      (comm-unpack (u w) dummy result)
+      (if (= result 65535)
+	  -1
+	(while (> result 0)
+	  (comm-unpack (w) b)
+	  (setq hinshi (concat hinshi (char-to-string b)))
+	  (setq result (1- result)))
+	hinshi))))
+
+(defun cannarpc-get-lex (env bunsetsu-pos kouho-pos)
+  (let ((i 0)
+	ylen klen rownum coldnum dicnum lex-list ll)
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w w w w) (canna-const GetLex) 0 8 context
+		   bunsetsu-pos kouho-pos 1024)
+      (comm-unpack (u w) dummy result)
+      (if (= result 65535)
+	  -1
+	(while (< i result)
+	  (comm-unpack (i i i i i) ylen klen rownum coldnum dicnum)
+	  (let ((ll1 (cons (list ylen klen rownum coldnum dicnum) nil)))
+	    (if ll
+		(setq ll (setcdr ll ll1))
+	      (setq lex-list (setq ll ll1))))
+	  (setq i (1+ i)))
+	lex-list))))
+
+(defun cannarpc-add-word (env dictionary yomi kanji hinshi)
+  "Register a word KANJI into DICTIONARY with a pronunciation YOMI and
+a part of speech HINSHI.  Where DICTIONARY should be an integer."
+  (let* ((word-info (concat yomi " " hinshi " " kanji))
+	 (word-info-ext (encode-coding-string word-info 'fixed-euc-jp))
+	 (length (+ (length word-info-ext) (length dictionary) 5)))
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w S s) (canna-const DefineWord) 0 length context
+		   word-info dictionary)
+      (comm-unpack (u b) dummy result)
+      (if (= result 255)
+	  -1		; failure
+	result))))
+
+(defun cannarpc-delete-word (env dictionary yomi kanji hinshi)
+  "Delete the registered word KANJI from DICTIONARY with a
+pronunciation YOMI and a part of speech HINSHI.  Where DICTIONARY
+should be an integer."
+  (let* ((word-info (concat yomi " " hinshi " " kanji))
+	 (word-info-ext (encode-coding-string word-info 'fixed-euc-jp))
+	 (length (+ (length word-info-ext) (length dictionary) 5)))
+    (cannarpc-call-with-environment env (dummy result)
+      (comm-format (b b w w S s) (canna-const DeleteWord) 0 length context
+		   word-info dictionary)
+      (comm-unpack (u b) dummy result)
+      (if (= result 255)
+	  -1		; failure
+	result))))
+
+(defun cannarpc-notice-group-name (proc context group)
+  (comm-call-with-proc proc (dummy result)
+    (comm-format (b b w u w s) (canna-const NoticeGroupName) 0
+		 (+ (length group) 7) 0 ;; mode = 0
+		 context group)
+    (comm-unpack (u b) dummy result)
+    (if (= result 255)
+	-1
+      result)))
+
+(defun cannarpc-set-app-name (proc context name)
+  (comm-call-with-proc proc (dummy result)
+    (comm-format (b b w u w s) (canna-const SetApplicationName) 0
+		 (+ (length name) 7) 0 context name)
+    (comm-unpack (u b) dummy result)
+    (if (= result 255)
+	-1
+      result)))
+
 ;;; egg/cannarpc.el ends here.