Controllers list for views

diff --git a/src/views.scm b/src/views.scm
index b45fa91f4c24e387be36cb344b3ad6312bbd28e2..887c65cb9cbdeeecbee760f5e895493fa0b6629e 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -40,7 +40,10 @@
 (define view-controllers-set! (record-modifier view-type 'controllers))
 (define view-priority (record-accessor view-type 'priority))
 
-;(defmacro* view (#:key (priority 0) . elements)
+(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
@@ -53,19 +56,13 @@
                             (cadr l)))
                      (else l)))))))
 
-(define* (view2 #:key (priority 0) . elements)
-  (let ((controllers '())
-       (meshes '()))
-    (define (f elements)
-      (cond ((not (null? elements))
-            (cond ((mesh? (car elements)) (set! meshes (cons (car elements) meshes)))
-                  ((procedure? (car elements)) (set! controllers (cons (car elements) controllers))))
-            (f (cdr elements)))))
-    (f elements)
-    (display controllers)
-    (newline)
-    (display meshes)
-    (newline)))
+(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 '())