(no commit message)

[gacela.git] / src / gacela_widgets.scm

diff --git a/src/gacela_widgets.scm b/src/gacela_widgets.scm
index a0e022357accb8c90aa16d1d62cc3916490790dd..9d6cea4976ca72d7154430a410f0260cf5c29fb7 100755 (executable)
--- a/src/gacela_widgets.scm
+++ b/src/gacela_widgets.scm
@@ -17,27 +17,48 @@
 
 ;;; Timers
 
-(defstruct timer (start 0) (paused 0) (state 'stopped))
+(define (make-timer)
+  (let ((start 0) (paused 0) (state 'stopped))
+    (lambda (op)
+      (cond ((eq? op 'start-timer)
+            (set! start (SDL_GetTicks))
+            (set! state 'running))
 
-(defun start-timer (timer)
-  (setf (timer-start timer) (SDL_GetTicks))
-  (setf (timer-state timer) 'running))
+           ((eq? op 'stop-timer)
+            (set! state 'stopped))
 
-(defun stop-timer (timer)
-  (setf (timer-state timer) 'stopped))
+           ((eq? op 'get-time)
+            (cond ((eq? state 'stopped) 0)
+                  ((eq? state 'paused) paused)
+                  (else (- (SDL_GetTicks) start))))
 
-(defun get-time (timer)
-  (cond ((eq (timer-state timer) 'stopped) 0)
-        ((eq (timer-state timer) 'paused) (timer-paused timer))
-        (t (- (SDL_GetTicks) (timer-start timer)))))
+           ((eq? op 'get-state)
+            state)
 
-(defun pause-timer (timer)
-  (cond ((eq (timer-state timer) 'running)
-         (setf (timer-paused timer) (- (SDL_GetTicks) (timer-start timer)))
-         (setf (timer-state timer) 'paused))))
+           ((eq? op 'pause-timer)
+            (cond ((eq? state 'running)
+                   (set! paused (- (SDL_GetTicks) start))
+                   (set! state 'paused))))
 
-(defun resume-timer (timer)
-  (cond ((eq (timer-state timer) 'paused)
-         (setf (timer-start timer) (- (SDL_GetTicks) (timer-paused timer)))
-         (setf (timer-state timer) 'running))))
+           ((eq? op 'resume-timer)
+            (cond ((eq? state 'paused)
+                   (set! start (- (SDL_GetTicks) paused))
+                   (set! state 'running))))))))
 
+(define (start-timer timer)
+  (timer 'start-timer))
+
+(define (stop-timer timer)
+  (timer 'stop-timer))
+
+(define (get-time timer)
+  (timer 'get-time))
+
+(define (get-state timer)
+  (timer 'get-state))
+
+(define (pause-timer timer)
+  (timer 'pause-timer))
+
+(define (resume-timer timer)
+  (timer 'resume-timer))