X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_widgets.scm;h=b5ddc478e2563cf940cd98e29ccc519e8b46b1e5;hb=500b68bdf16918b05f859830cc83d5a429d5b447;hp=a0e022357accb8c90aa16d1d62cc3916490790dd;hpb=09fa5781bfe3e7b8406a4cee4eb24923e14527b0;p=gacela.git

diff --git a/src/gacela_widgets.scm b/src/gacela_widgets.scm
index a0e0223..b5ddc47 100755
--- a/src/gacela_widgets.scm
+++ b/src/gacela_widgets.scm
@@ -17,27 +17,49 @@
 
 ;;; Timers
 
-(defstruct timer (start 0) (paused 0) (state 'stopped))
+(define (make-timer)
+  (let ((start 0) (paused 0) (state 'stopped))
+    (lambda (op)
+      (case 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))
+	((stop-timer)
+	 (set! state 'stopped))
 
-(defun stop-timer (timer)
-  (setf (timer-state timer) 'stopped))
+	((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)))))
+	((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))))
+	((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))))
+	((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))