[uim] r7304 committed - * scm/tutcode-custom.scm...

[codesite-noreply]

Revision: 7304
Author:   deton.kih
Date:     Tue Sep 13 04:03:38 2011
Log:      * scm/tutcode-custom.scm
  - (tutcode-show-stroke-help-window-on-no-input?): New custom.
* scm/tutcode.scm
  - (tutcode-stroke-help-top-page-alist,
     tutcode-stroke-help-top-page-katakana-alist):
    Change initial value.
  - (tutcode-check-stroke-help-window-begin):
    Add check of tutcode-show-stroke-help-window-on-no-input?.
    Change to make help if tutcode-stroke-help-top-page-alist is #f.
http://code.google.com/p/uim/source/detail?r=7304

Modified:
 /trunk/scm/tutcode-custom.scm
 /trunk/scm/tutcode.scm

=======================================
--- /trunk/scm/tutcode-custom.scm       Sun Sep 11 15:12:28 2011
+++ /trunk/scm/tutcode-custom.scm       Tue Sep 13 04:03:38 2011
@@ -250,6 +250,12 @@
   (N_ "Use stroke help window")
   (N_ "long description will be here."))

+(define-custom 'tutcode-show-stroke-help-window-on-no-input? #t
+  '(tutcode candwin)
+  '(boolean)
+  (N_ "Show stroke help window on no input")
+  (N_ "long description will be here."))
+
 (define-custom 'tutcode-use-auto-help-window? #f
   '(tutcode candwin)
   '(boolean)
=======================================
--- /trunk/scm/tutcode.scm      Sun Sep 11 15:12:28 2011
+++ /trunk/scm/tutcode.scm      Tue Sep 13 04:03:38 2011
@@ -326,14 +326,16 @@
 ;;;  
(¼«Æ°¥Ø¥ë¥×ÍѤÎÉô¼ó¹çÀ®ÊÑ´¹¸õÊ両º÷»þ¤Î¹â®²½ÍÑ¡£¤¿¤À¤·½é²óºîÀ®»þ¤¬ÃÙ¤¤)
 (define tutcode-reverse-bushudic-hash-table ())
 ;;; stroke-help¤Ç¡¢²¿¤â¥­¡¼ÆþÎϤ¬Ìµ¤¤¾ì¹ç¤Ëɽ¼¨¤¹¤ëÆâÍƤÎalist¡£
+;;; ɽ¼¨¤·¤¿¤¯¤Ê¤¤¾ì¹ç¤Ï~/.uim¤Ç()¤ËÀßÄꤹ¤ë¤«¡¢
+;;; tutcode-show-stroke-help-window-on-no-input?¤ò#f¤ËÀßÄꤹ¤ë¡£
 ;;; (Ëè²ótutcode-rule¤òÁ´¤Æ¤Ê¤á¤ÆºîÀ®¤¹¤ë¤ÈÃÙ¤¤¤·¡¢
 ;;; ºÇ½é¤Î¥Ú¡¼¥¸¤Ï¸ÇÄêÆâÍƤʤΤǡ¢°ìÅÙºîÀ®¤·¤¿¤â¤Î¤ò»È¤¤²ó¤¹)
-(define tutcode-stroke-help-top-page-alist ())
+(define tutcode-stroke-help-top-page-alist #f)
 ;;; stroke-help¤Ç¡¢²¿¤â¥­¡¼ÆþÎϤ¬Ìµ¤¤¾ì¹ç¤Ëɽ¼¨¤¹¤ëÆâÍƤÎalist¡£
 ;;; ¥«¥¿¥«¥Ê¥â¡¼¥ÉÍÑ¡£
 ;;; (XXX:¥­¡¼ÆþÎÏÍ­¤Î¾ì¹ç¤â¥­¥ã¥Ã¥·¥å¤ò»È¤¦¤è¤¦¤Ë¤¹¤ë?
 ;;;  ¤â¤·¤½¤¦¤¹¤ì¤Ð¡¢~/.uim¤Ç²¾ÁÛ¸°È×ɽ¼¨ÆâÍƤΥ«¥¹¥¿¥Þ¥¤¥º¤âÍưפˤʤë)
-(define tutcode-stroke-help-top-page-katakana-alist ())
+(define tutcode-stroke-help-top-page-katakana-alist #f)

 ;;; ¥³¡¼¥Éɽ¤ò¾å½ñ¤­Êѹ¹/Äɲ乤뤿¤á¤Î¥³¡¼¥Éɽ¡£
 ;;; ~/.uim¤Çtutcode-rule-set-sequences!¤ÇÅÐÏ¿¤·¤Æ¡¢
@@ -1662,16 +1664,18 @@
              (label-cand-alist
               (if (null? seq) ;  
tutcode-ruleÁ´Éô¤Ê¤á¤ÆºîÀ®¢ªÃÙ¤¤¤Î¤Ç¥­¥ã¥Ã¥·¥å
                 (cond
+                  ((not tutcode-show-stroke-help-window-on-no-input?)
+                    ())
                   ((tutcode-kigou2-mode? pc)
                     tutcode-kigou-rule-stroke-help-top-page-alist)
                   (katakana?
-                    (if (null? tutcode-stroke-help-top-page-katakana-alist)
+                    (if (not tutcode-stroke-help-top-page-katakana-alist)
                       (set! tutcode-stroke-help-top-page-katakana-alist
                         (tutcode-stroke-help-update-alist
                           () seqlen katakana? ret)))
                     tutcode-stroke-help-top-page-katakana-alist)
                   (else
-                    (if (null? tutcode-stroke-help-top-page-alist)
+                    (if (not tutcode-stroke-help-top-page-alist)
                       (set! tutcode-stroke-help-top-page-alist
                         (tutcode-stroke-help-update-alist
                           () seqlen katakana? ret)))