[uim-commit] r1226 - branches/r5rs/scm

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-18 10:09:29 -0700 (Thu, 18 Aug 2005)
New Revision: 1226

Modified:
   branches/r5rs/scm/im-custom.scm
   branches/r5rs/scm/uim-sh.scm
Log:
* OK, now "uim-sh" temporally work on SigScheme!
  - TODO
    * work "define-key" properly
    * creating "installed-modules.scm" and "loader.scm" successfully
    * uncomment some codes in im-custom.scm

* scm/uim-sh.scm
  - (uim-sh-loop): use "display" and "eof-object?", instead of "puts"
    and "(eq? (eof-val) expr)"
  - (uim-sh-usage): use "print" instead of "puts"
  - (uim-sh): SigScheme doesn't support *catch
* scm/im-custom.scm
  - (define-custom 'custom-preserved-default-im-name): comment out
    bacause this code turns into infinite loop
  - (define-key switch-im-key? '()): comment out
  - (define-custom 'candidate-window-position): comment out


Modified: branches/r5rs/scm/im-custom.scm
===================================================================
--- branches/r5rs/scm/im-custom.scm	2005-08-18 17:00:53 UTC (rev 1225)
+++ branches/r5rs/scm/im-custom.scm	2005-08-18 17:09:29 UTC (rev 1226)
@@ -116,15 +116,21 @@
   (_ "Specify default IM")
   (_ "long description will be here."))
 
-(define-custom 'custom-preserved-default-im-name
-  (and (not (null? im-list))
-       (im-name (find-default-im #f)))
-  '(global im-deployment)
-  (cons
-   'choice
-   (custom-im-list-as-choice-rec (reverse im-list)))
-  (_ "Default input method")
-  (_ "long description will be here."))
+;
+; TODO : fix me! Kazuki Ohta <mover at hct.zaq.ne.jp>
+;
+; This code becomes an error for some reason.
+; May be SigScheme's bug.
+;
+;(define-custom 'custom-preserved-default-im-name
+;  (and (not (null? im-list))
+;       (im-name (find-default-im #f)))
+;  '(global im-deployment)
+;  (cons
+;   'choice
+;   (custom-im-list-as-choice-rec (reverse im-list)))
+;  (_ "Default input method")
+;  (_ "long description will be here."))
 
 ;; activity dependency
 (custom-add-hook 'custom-preserved-default-im-name
@@ -269,7 +275,9 @@
 ;;		 (lambda ()
 ;;		   enable-im-switch))
 
-(define-key switch-im-key? '())
+; TODO : fixme! Kazuki Ohta <mover at hct.zaq.ne.jp>
+;
+;(define-key switch-im-key? '())
 
 (define-custom 'uim-color 'uim-color-uim
   '(global visual-preference)
@@ -279,21 +287,26 @@
   (_ "Preedit color")
   (_ "long description will be here."))
 
-;; referred by some bridges
-(define-custom 'candidate-window-position 'caret
-  '(global visual-preference)
-  (list 'choice
-	(list 'caret
-	      (_ "Adjacent to cursor")
-	      (_ "Adjacent to cursor"))
-	(list 'left
-	      (_ "Left end of preedit area")
-	      (_ "Left end of preedit area"))
-	(list 'right
-	      (_ "Right end of preedit area")
-	      (_ "Right end of preedit area")))
-  (_ "Candidate window position")
-  (_ "long description will be here."))
+;
+; TODO : fixme! Kazuki Ohta <mover at hct.zaq.ne.jp>
+; This code becomes an error for some reason.
+; May be SigScheme's bug.
+;
+; referred by some bridges
+;(define-custom 'candidate-window-position 'caret
+;  '(global visual-preference)
+;  (list 'choice
+;	(list 'caret
+;	      (_ "Adjacent to cursor")
+;	      (_ "Adjacent to cursor"))
+;	(list 'left
+;	      (_ "Left end of preedit area")
+;	      (_ "Left end of preedit area"))
+;	(list 'right
+;	      (_ "Right end of preedit area")
+;	      (_ "Right end of preedit area")))
+; (_ "Candidate window position")
+; (_ "long description will be here."))
 
 (define-custom 'enable-lazy-loading? #t
   '(global advanced)

Modified: branches/r5rs/scm/uim-sh.scm
===================================================================
--- branches/r5rs/scm/uim-sh.scm	2005-08-18 17:00:53 UTC (rev 1225)
+++ branches/r5rs/scm/uim-sh.scm	2005-08-18 17:09:29 UTC (rev 1226)
@@ -38,15 +38,15 @@
 (define uim-sh-loop
   (lambda ()
     (if (not uim-sh-opt-batch)
-	(puts uim-sh-prompt))
+	(display uim-sh-prompt))
     (let* ((expr (read))
-	   (eof (eq? (eof-val) expr)))
+	   (eof  (eof-object? expr)))
       (if (not eof)
 	  (begin
 	    ((if  uim-sh-opt-strict-batch
 		  (lambda () #f)
 		  print)
-	     (eval expr))
+	     (eval expr '()))
 	    (uim-sh-loop))
 	  #f))))
 
@@ -64,7 +64,7 @@
 
 (define uim-sh-usage
   (lambda ()
-    (puts "Usage: uim-sh [options]
+    (print "Usage: uim-sh [options]
   -b        batch mode. suppress shell prompts
   -B        strict batch mode, implies -b. suppress shell prompts and
             evaluated results
@@ -76,7 +76,8 @@
     (uim-sh-parse-args args)
     (if uim-sh-opt-help
 	(uim-sh-usage)
-	(if (*catch
-	     'all
-	     (uim-sh-loop))
-	    (uim-sh args)))))
+;	(if (*catch
+;	     'all
+;	     (uim-sh-loop))
+;	    (uim-sh args)))))
+	(uim-sh-loop))))