Hiroyuki Komatsu
komat****@users*****
2005年 3月 5日 (土) 10:25:50 JST
Index: prime/uim/ChangeLog diff -u prime/uim/ChangeLog:1.1.2.21 prime/uim/ChangeLog:1.1.2.22 --- prime/uim/ChangeLog:1.1.2.21 Fri Mar 4 17:41:02 2005 +++ prime/uim/ChangeLog Sat Mar 5 10:25:50 2005 @@ -1,3 +1,11 @@ +2005-03-05 Hiroyuki Komatsu <komat****@taiya*****> + + * prime-custom.scm: + - Added the option prime-custom-number-selection to toggle candidate + selection by pressing number keys in a preediting mode. + - Hidden the options default-widget_prime_input_mode and + prime-input-mode-actions, and related operations. + 2005-03-04 Hiroyuki Komatsu <komat****@taiya*****> * prime-custom.scm: Index: prime/uim/prime-custom.scm diff -u prime/uim/prime-custom.scm:1.1.2.2 prime/uim/prime-custom.scm:1.1.2.3 --- prime/uim/prime-custom.scm:1.1.2.2 Fri Mar 4 17:41:02 2005 +++ prime/uim/prime-custom.scm Sat Mar 5 10:25:50 2005 @@ -47,7 +47,7 @@ (_ "Japanese specific settings")) (define-custom 'prime-custom-default-language 'Japanese - '(prime) + '(prime global) (list 'choice (list 'Japanese (_ "Japanese") (_ "Japanese")) (list 'English (_ "English") (_ "English"))) @@ -55,17 +55,11 @@ (_ "long description will be here.")) (define-custom 'prime-auto-register-mode? #t - '(prime) + '(prime global) '(boolean) (_ "Enable auto register mode") (_ "long description will be here.")) -(define-custom 'prime-use-unixdomain? #f - '(prime) - '(boolean) - (_ "Use Unix Domain Socket to communicate with PRIME") - (_ "long description will be here.")) - (define-custom 'prime-custom-japanese-space 'wide '(prime japanese) (list 'choice @@ -74,6 +68,12 @@ (_ "Space character") (_ "long description will be here.")) +(define-custom 'prime-use-unixdomain? #f + '(prime advanced) + '(boolean) + (_ "Use Unix Domain Socket to communicate with PRIME") + (_ "long description will be here.")) + ;(define-custom 'prime-use-candidate-window? #t ; '(prime candwin) ; '(boolean) @@ -122,10 +122,10 @@ ;; ------------------------------------------------------------ -(define-custom 'prime-pseudo-mode-cursor? #f +(define-custom 'prime-custom-number-selection? #f '(prime-advanced special-op) '(boolean) - (_ "Enable pseudo mode cursor") + (_ "Select candidate by numeral keys") (_ "long description will be here.")) (define-custom 'prime-custom-app-mode-vi? #f @@ -134,19 +134,18 @@ (_ "Friendly for vi user") (_ "long description will be here.")) +(define-custom 'prime-pseudo-mode-cursor? #f + '(prime-advanced special-op) + '(boolean) + (_ "Enable pseudo mode cursor") + (_ "long description will be here.")) + ;(define-custom 'prime-mask-pending-preedit? #f ; '(prime) ; '(boolean) ; (_ "Mask preedit strings (For T-Code users)") ; (_ "long description will be here.")) -;(define-custom 'prime-use-numeral-key-to-select-cand? #t -; '(prime) -; '(boolean) -; "Use numeral key to select candidate directly" -; "long description will be here.") - - ;; ;; toolbar ;; @@ -175,46 +174,46 @@ ;;; Input mode -;(define default-widget_prime_input_mode 'action_prime_mode_latin) +(define default-widget_prime_input_mode 'action_prime_mode_latin) ;; Users don't care this option. ;; (2005-03-03) <Hiroyuki Komatsu> -(define-custom 'default-widget_prime_input_mode 'action_prime_mode_latin - '(prime-advanced toolbar) - (cons 'choice - (map indication-alist-entry-extract-choice - prime-input-mode-indication-alist)) - (_ "Default input mode") - (_ "long description will be here.")) +;(define-custom 'default-widget_prime_input_mode 'action_prime_mode_latin +; '(prime-advanced toolbar) +; (cons 'choice +; (map indication-alist-entry-extract-choice +; prime-input-mode-indication-alist)) +; (_ "Default input mode") +; (_ "long description will be here.")) -;(define prime-input-mode-actions (map car prime-input-mode-indication-alist)) +(define prime-input-mode-actions (map car prime-input-mode-indication-alist)) ;; Users don't care this option. ;; (2005-03-03) <Hiroyuki Komatsu> -(define-custom 'prime-input-mode-actions - (map car prime-input-mode-indication-alist) - '(prime-advanced toolbar) - (cons 'ordered-list - (map indication-alist-entry-extract-choice - prime-input-mode-indication-alist)) - (_ "Input mode menu items") - (_ "long description will be here.")) +;(define-custom 'prime-input-mode-actions +; (map car prime-input-mode-indication-alist) +; '(prime-advanced toolbar) +; (cons 'ordered-list +; (map indication-alist-entry-extract-choice +; prime-input-mode-indication-alist)) +; (_ "Input mode menu items") +; (_ "long description will be here.")) ;; value dependency -(if custom-full-featured? - (custom-add-hook 'prime-input-mode-actions - 'custom-set-hooks - (lambda () - (custom-choice-range-reflect-olist-val - 'default-widget_prime_input_mode - 'prime-input-mode-actions - prime-input-mode-indication-alist)))) +;(if custom-full-featured? +; (custom-add-hook 'prime-input-mode-actions +; 'custom-set-hooks +; (lambda () +; (custom-choice-range-reflect-olist-val +; 'default-widget_prime_input_mode +; 'prime-input-mode-actions +; prime-input-mode-indication-alist)))) ;; dynamic reconfiguration -(custom-add-hook 'default-widget_prime_input_mode - 'custom-set-hooks - (lambda () - (prime-configure-widgets))) - -(custom-add-hook 'prime-input-mode-actions - 'custom-set-hooks - (lambda () - (prime-configure-widgets))) +;(custom-add-hook 'default-widget_prime_input_mode +; 'custom-set-hooks +; (lambda () +; (prime-configure-widgets))) + +;(custom-add-hook 'prime-input-mode-actions +; 'custom-set-hooks +; (lambda () +; (prime-configure-widgets))) Index: prime/uim/prime.scm diff -u prime/uim/prime.scm:1.1.2.24 prime/uim/prime.scm:1.1.2.25 --- prime/uim/prime.scm:1.1.2.24 Thu Mar 3 18:02:54 2005 +++ prime/uim/prime.scm Sat Mar 5 10:25:50 2005 @@ -46,9 +46,6 @@ (require-custom "prime-custom.scm") (require-custom "prime-key-custom.scm") -;; configs -(define prime-always-number-selection? #f) - ;; config function ;; should be replaced with boolean custom variable -- YamaKen 2005-01-15 (define prime-dont-use-numeral-key-to-select-cand @@ -1279,7 +1276,7 @@ (define prime-command-preedit-commit-candidate (lambda (context key key-state) - (if prime-always-number-selection? + (if prime-custom-number-selection? (let* ((nth (number->candidate-index (numeral-char->number key))) (cand (prime-get-nth-candidate context nth))) (if cand
