Repair term + add --help.

2 files changed, 16 insertions, 8 deletions

diff --git a/module/entry-points/terminal.scm b/module/entry-points/terminal.scm
index 9f486d90..a2c41f44 100644
--- a/module/entry-points/terminal.scm
+++ b/module/entry-points/terminal.scm
@@ -6,21 +6,25 @@
   :use-module (datetime)
   :use-module (datetime util)
   :use-module (vulgar)
+  :use-module (util options)
   )
 
 (define options
-  '((date (value #t) (single-char #\d))
-    (file (value #t) (single-char #\f))))
+  '((date (value #t) (single-char #\d)
+          (description "Which date to start on."))
+    (help (single-char #\t) (description "Print this help."))
+    ))
 
 (define (main args)
-  (define opts (getopt-long args options))
-  (define-values (calendars events)
-    (cond [(option-ref opts 'file #f) => (compose load-calendars list)]
-          [else (load-calendars)]))
+  (define opts (getopt-long args (getopt-opt options)))
+
+  (when (option-ref opts 'help #f)
+    (print-arg-help options)
+    (throw 'return))
 
   (let ((date (or (and=> (option-ref opts 'date #f) parse-freeform-date)
                   (current-date))))
     ;; (format (current-error-port) "len(events) = ~a~%" (stream-length events))
     (with-vulgar
-     (lambda () (main-loop date events))))
+     (lambda () (main-loop date))))
 )
diff --git a/module/output/terminal.scm b/module/output/terminal.scm
index 47367095..ddd5df9b 100644
--- a/module/output/terminal.scm
+++ b/module/output/terminal.scm
@@ -8,6 +8,7 @@
   #:use-module (srfi srfi-41)
   #:use-module (srfi srfi-41 util)
   #:use-module (util)
+  #:use-module (util app)
   #:use-module (vulgar)
   #:use-module (vulgar info)
   #:use-module (vulgar color)
@@ -69,7 +70,10 @@
 (define (displayln a)
   (display a) (newline))
 
-(define (main-loop date event-stream)
+(define-method (main-loop date)
+
+  (define event-stream (getf 'event-set))
+
   (define cur-event 0)
 
   (define-values (height width) (get-terminal-size))