Hiroyuki Komatsu
komat****@users*****
2004年 12月 11日 (土) 16:42:26 JST
Index: prime/uim/prime.scm
diff -u prime/uim/prime.scm:1.1.2.7 prime/uim/prime.scm:1.1.2.8
--- prime/uim/prime.scm:1.1.2.7 Fri Dec 10 19:52:04 2004
+++ prime/uim/prime.scm Sat Dec 11 16:42:26 2004
@@ -260,7 +260,7 @@
(prime-go-right-edge-key? . prime-command-preedit-cursor-right-edge)
(prime-go-left-key? . prime-command-preedit-cursor-left)
(prime-go-right-key? . prime-command-preedit-cursor-right)
- (prime-cand-select-key? . prime-command-register-preedit-commit-candidate)
+ (prime-cand-select-key? . prime-command-register-preedit-commit-candidate)
;; Typing mode key bindings
(prime-typing-mode-hiragana-key? . prime-command-mode-hiragana)
(prime-typing-mode-katakana-key? . prime-command-mode-katakana)
@@ -282,6 +282,12 @@
(prime-backspace-key? . prime-command-conv-cancel)
(prime-commit-key? . prime-command-conv-commit)
(prime-cand-select-key? . prime-command-conv-select)
+ ;; Typing mode key bindings
+ (prime-typing-mode-hiragana-key? . prime-command-mode-hiragana)
+ (prime-typing-mode-katakana-key? . prime-command-mode-katakana)
+ (prime-typing-mode-hankana-key? . prime-command-mode-hankana)
+ (prime-typing-mode-wideascii-key? . prime-command-mode-wideascii)
+ (prime-typing-mode-ascii-key? . prime-command-mode-ascii)
(prime-symbol-key? . prime-command-pass)
(prime-with-control-key? . prime-command-pass)
(prime-any-key? . prime-command-conv-input)
@@ -295,6 +301,12 @@
(prime-backspace-key? . prime-command-conv-cancel)
(prime-commit-key? . prime-command-register-conv-commit)
(prime-cand-select-key? . prime-command-register-conv-select)
+ ;; Typing mode key bindings
+ (prime-typing-mode-hiragana-key? . prime-command-mode-hiragana)
+ (prime-typing-mode-katakana-key? . prime-command-mode-katakana)
+ (prime-typing-mode-hankana-key? . prime-command-mode-hankana)
+ (prime-typing-mode-wideascii-key? . prime-command-mode-wideascii)
+ (prime-typing-mode-ascii-key? . prime-command-mode-ascii)
(prime-symbol-key? . prime-command-pass)
(prime-with-control-key? . prime-command-pass)
(prime-any-key? . prime-command-register-conv-input)
@@ -662,31 +674,38 @@
;;;; prime-command: modes
+;; This changes the typing mode specified by mode-string.
+(define prime-mode-set-mode
+ (lambda (context mode-string)
+ (print "prime-mode-set-mode")
+ (if (= (prime-context-state context) 'prime-state-converting)
+ (prime-convert-cancel context))
+ (prime-engine-edit-set-mode (prime-context-session context) mode-string)))
+
;; This sets the typing mode to the default/Hiragana mode.
(define prime-command-mode-hiragana
(lambda (context key key-state)
- (prime-engine-edit-set-mode (prime-context-session context) "default")))
+ (prime-mode-set-mode context "default")))
;; This sets the typing mode to the Katakana mode.
(define prime-command-mode-katakana
(lambda (context key key-state)
- (prime-engine-edit-set-mode (prime-context-session context) "katakana")))
+ (prime-mode-set-mode context "katakana")))
;; This sets the typing mode to the hankaku(half-width) Katakana mode.
(define prime-command-mode-hankana
(lambda (context key key-state)
- (prime-engine-edit-set-mode (prime-context-session context)
- "half_katakana")))
+ (prime-mode-set-mode context "half_katakana")))
;; This sets the typing mode to the zenkaku(wide-width) ASCII mode.
(define prime-command-mode-wideascii
(lambda (context key key-state)
- (prime-engine-edit-set-mode (prime-context-session context) "wide_ascii")))
+ (prime-mode-set-mode context "wide_ascii")))
;; This sets the typing mode to the raw/ASCII mode.
(define prime-command-mode-ascii
(lambda (context key key-state)
- (prime-engine-edit-set-mode (prime-context-session context) "raw")))
+ (prime-mode-set-mode context "raw")))
(define prime-command-japanese-mode
(lambda (context key key-state)
@@ -750,9 +769,7 @@
(define prime-command-conv-cancel
(lambda (context key key-state)
- (prime-context-set-state! context 'prime-state-preedit)
- (prime-context-set-nth! context 0)
- ))
+ (prime-convert-calcel context)))
(define prime-command-conv-commit
(lambda (context key key-state)
@@ -1207,6 +1224,14 @@
(prime-context-set-nth! context 0)))
))
+;; This resets the converting mode and goes to the preediting mode.
+(define prime-convert-cancel
+ (lambda (context)
+ (print "prime-convert-cancel")
+ (prime-context-set-state! context 'prime-state-preedit)
+ (prime-context-set-nth! context 0)))
+
+
(define prime-begin-conversion-internal
(lambda (context init-idx)
(print "prime-begin-conversion-internal")
Index: prime/uim/ChangeLog
diff -u prime/uim/ChangeLog:1.1.2.7 prime/uim/ChangeLog:1.1.2.8
--- prime/uim/ChangeLog:1.1.2.7 Fri Dec 10 19:52:04 2004
+++ prime/uim/ChangeLog Sat Dec 11 16:42:26 2004
@@ -1,3 +1,8 @@
+2004-12-11 Hiroyuki Komatsu <komat****@taiya*****>
+
+ * prime.scm (prime-mode-set-mode):
+ Added F6 - F10 functions to the state prime-state-converting.
+
2004-12-10 Hiroyuki Komatsu <komat****@taiya*****>
* prime.scm (prime-command-register-fund-commit):
@@ -9,7 +14,7 @@
- Supported new protocols of a PRIME server for a preedition.
- Supported displaying usages of candidate words.
- * prime.scm: (prime-engine-get-version):
+ * prime.scm (prime-engine-get-version):
This function gets a verstion string of the PRIME server.
2004-12-08 Hiroyuki Komatsu <komat****@taiya*****>