Controllers list for views

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index 052442b0520eaf5ece9199e119f6455716cc2dde..887c65cb9cbdeeecbee760f5e895493fa0b6629e 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,27 +26,46 @@
 
 (define view-type
   (make-record-type "view" 
-                   '(id body meshes priority)
+                   '(id controllers 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 controllers meshes priority) ((record-constructor view-type) (gensym) controllers meshes priority))
 (define view? (record-predicate view-type))
 (define view-id (record-accessor view-type 'id))
-(define view-body (record-accessor view-type 'body))
 (define view-meshes (record-accessor view-type 'meshes))
+(define view-meshes-set! (record-modifier view-type 'meshes))
+(define view-controllers (record-accessor view-type 'controllers))
+(define view-controllers-set! (record-modifier view-type 'controllers))
 (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)))
+(defmacro* view (#:key (priority 0) . elements)
+  `(let ((e (view-elements ,@elements)))
+     (make-view (car e) (cadr e) ,priority)))
+
+(define-macro (view-elements . elements)
+  (cond ((null? elements) `'(() ()))
+       (else
+        `(let ((l (view-elements ,@(cdr elements))))
+           ,(let ((e (car elements)))
+              `(cond ((mesh? ,e)
+                      (list (car l) (cons ,e (cadr l))))
+                     ((procedure? ,e)
+                      (list (cons ,(if (list? e) e `(lambda () (,e))) (car l))
+                            (cadr l)))
+                     (else l)))))))
+
+(define (controllers-list list controllers)
+  (cond ((null? controllers)
+        list)
+       ((list? (car controllers))
+        (assoc-set! (controllers-list list (cdr controllers)) (caar controllers) (cadar controllers)))
+       (else
+        (assoc-set! (controllers-list list (cdr controllers)) (gensym) (car controllers)))))
 
 (define activated-views '())
+
 (define (sort-views views-alist)
   (sort views-alist
        (lambda (v1 v2)
@@ -62,12 +81,16 @@
 
 (define (view-priority-set! view priority)
   ((record-modifier view-type 'priority) view priority)
-  (set! activated-views (sort-views activated-views)))
+  (if (view-actived? view)
+      (set! activated-views (sort-views activated-views))))
+
+(define current-view #f)
 
 (define* (run-views #:optional (views activated-views))
   (cond ((not (null? views))
-        ; controllers go here
-        (draw-meshes (view-meshes (cdar views)))
+        (set! current-view (cdar views))
+        ;((view-body current-view))
+        (draw-meshes (view-meshes current-view))
         (run-views (cdr views)))))
 
 (define (draw-meshes meshes)
@@ -78,7 +101,7 @@
         (draw-meshes (cdr meshes)))))
 
 
-;(define default-view (activate-view (make-view)))
+;(define default-view (activate-view (make-view (lambda () #f))))
 
 
 ;;; Meshes
@@ -171,15 +194,19 @@
 (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))))
+    (if (not (assoc-ref table id))
+       (view-meshes-set! view (assoc-set! table id mesh))))
+  mesh)
 
-(define* (hide mesh #:optional (view default-view))
-  (let ((table (view-meshes view)))
-    (hash-remove! table (mesh-inner-property mesh 'id))))
+(define* (hide mesh #:optional (view current-view))
+  (let ((id (mesh-inner-property mesh 'id))
+       (table (view-meshes view)))
+    (if (assoc-ref table id)
+       (view-meshes-set! view (assoc-remove! table id))))
+  mesh)
 
 (define* (translate mesh x y #:optional (z 0))
   (((record-accessor mesh-type 'translate) mesh) x y z)