Defining views

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index 052442b0520eaf5ece9199e119f6455716cc2dde..46657293c54d94bd5ee0509b43dd1a06fd9aeb4d 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,25 +26,21 @@
 
 (define view-type
   (make-record-type "view" 
-                   '(id body meshes priority)
+                   '(id constructor body meshes priority)
                    (lambda (record port)
                      (format port "#<view: ~a meshes>"
                              (length (view-meshes record))))))
 
-(define (make-view body meshes) ((record-constructor view-type) (gensym) body meshes 0))
+(define (make-view constructor) ((record-constructor view-type) (gensym) constructor #f '() 0))
 (define view? (record-predicate view-type))
 (define view-id (record-accessor view-type 'id))
+(define view-constructor (record-accessor view-type 'constructor))
 (define view-body (record-accessor view-type 'body))
 (define view-meshes (record-accessor view-type 'meshes))
 (define view-priority (record-accessor view-type 'priority))
 
-(define-macro (view meshes . body)
-  `(make-view
-    ,(cond ((null? body) `(lambda () #f))
-          (else `(lambda () ,@body)))
-    (map (lambda (m)
-          `(,(mesh-inner-property m 'id) . ,m))
-        meshes)))
+(define-macro (define-view body)
+  `(make-view (lambda () ,body)))
 
 (define activated-views '())
 (define (sort-views views-alist)
@@ -64,10 +60,13 @@
   ((record-modifier view-type 'priority) view priority)
   (set! activated-views (sort-views activated-views)))
 
+(define current-view #f)
+
 (define* (run-views #:optional (views activated-views))
   (cond ((not (null? views))
+        (set! current-view (cdar views))
         ; controllers go here
-        (draw-meshes (view-meshes (cdar views)))
+        (draw-meshes (view-meshes current-view))
         (run-views (cdr views)))))
 
 (define (draw-meshes meshes)
@@ -78,7 +77,7 @@
         (draw-meshes (cdr meshes)))))
 
 
-;(define default-view (activate-view (make-view)))
+(define default-view (activate-view (define-view '())))
 
 
 ;;; Meshes
@@ -171,13 +170,13 @@
 (define (mesh-property-set! mesh prop-name value)
   (((record-accessor mesh-type 'property-set!) mesh) prop-name value))
 
-(define* (show mesh #:optional (view default-view))
+(define* (show mesh #:optional (view current-view))
   (let ((id (mesh-inner-property mesh 'id))
        (table (view-meshes view)))
     (if (not (hash-ref table id))
        (hash-set! table id mesh))))
 
-(define* (hide mesh #:optional (view default-view))
+(define* (hide mesh #:optional (view current-view))
   (let ((table (view-meshes view)))
     (hash-remove! table (mesh-inner-property mesh 'id))))