Fixes

2 files changed, 19 insertions, 15 deletions

diff --git a/class.lisp b/class.lisp
index fdc0beb..93fc4d9 100644
--- a/class.lisp
+++ b/class.lisp
@@ -1,6 +1,6 @@
 (uiop:define-package
     :solar-short/class
-    (:export #:book #:display-haiku)
+    (:export #:book #:display-haiku #:next-haiku)
     (:import-from :asdf))
 
 (in-package :solar-short/class)
@@ -14,11 +14,15 @@
 
 (defmethod display-haiku ((obj book) stream)
   (with-slots (haikus current) obj
+    (format *standard-output* "haiku num: ~a" current)
     (princ (nth current haikus) stream)))
 
-;; (defmethod next-haiku ((book book))
-;;   (setf (current book)
-;; 	(+ (if (= (current book) (length (haikus book)))
-;; 	       0
-;; 	       1)
-;; 	   (current book))))
+(defmethod next-haiku ((obj book))
+  (with-slots (haikus current) obj
+    (format *standard-output* "increasing current")
+    (let ((factor (if (= current (length haikus)) 0 1)))
+      (format *standard-output* "increment factor: ~a" factor)
+      (finish-output *standard-output*)
+      (setf current
+	    (+ factor
+	       current)))))
diff --git a/frame.lisp b/frame.lisp
index b65c631..2f3cc91 100644
--- a/frame.lisp
+++ b/frame.lisp
@@ -13,14 +13,14 @@
   (:panes
    (title :title :display-string "Solar short")
    (app :application :display-function 'display-haiku)
-   (action-next :push-button :label "Next"))
+   (action-next :push-button :label "Next"
+			     :activate-callback (lambda (gadget) (com-next))))
   (:layouts
    (default
     (vertically () title app action-next))))
-    
-;; (define-read-haiku-command (com-next :name t)
-;;     ((book 'book))
-;;   (with-application-frame (frame)
-;;     (let ((book (book frame)))
-;;       (when book
-;; 	(next-haiku book)))))
+
+(define-read-haiku-command (com-next :name "Next")
+    ()
+  (with-application-frame (frame)
+    (next-haiku frame)
+    (redisplay-frame frame)))