Write window declarations using a syntax

diff --git a/examples/01-hello-world/01-hello-world.scm b/examples/01-hello-world/01-hello-world.scm
index cc5e0f3a506094116925b08b072cc16c0afeedf4..61263f13ed08f72a263e2a54b8a66181c602e3c8 100644 (file)
--- a/examples/01-hello-world/01-hello-world.scm
+++ b/examples/01-hello-world/01-hello-world.scm
@@ -20,5 +20,5 @@
 (use-modules (gacela))
 
 (display-scene
- (window '(#:resolution (640 480))
-        (bitmap "hello-world.bmp")))
+ (window ((resolution '(640 480)))
+   (bitmap "hello-world.bmp")))

diff --git a/examples/02-event-driven-programming/02-event-driven-programming.scm b/examples/02-event-driven-programming/02-event-driven-programming.scm
index 2fcd3ababc46925c9ad0f78d8b1a4c0860ee4ef1..505f4b052a2b59f32e8278a1696a2608eb106def 100644 (file)
--- a/examples/02-event-driven-programming/02-event-driven-programming.scm
+++ b/examples/02-event-driven-programming/02-event-driven-programming.scm
@@ -20,5 +20,6 @@
 (use-modules (gacela))
 
 (display-scene
- (window '(#:resolution (640 480))
-        (bitmap "x.bmp")))
+ (window ((resolution '(640 480))
+         (when-quit (lambda () (format #t "Quit clicked!!~%"))))
+   (bitmap "x.bmp")))

diff --git a/gacela/window.scm b/gacela/window.scm
index eeed32d2beba1c6cc33a4adb928a7f48545f06b7..6d43ce600971c29f18be332dcc4ca2d8de7ec0be 100644 (file)
--- a/gacela/window.scm
+++ b/gacela/window.scm
@@ -20,8 +20,13 @@
   #:export (window))
 
 
-(define* (window window-properties #:optional scene)
-  (make-scene
-   "window"
-   (lambda ()
-     (apply run-scene (cons scene window-properties)))))
+(define-syntax window
+  (lambda (x)
+    (syntax-case x ()
+      ((_ ((property-name property-value) ...) scene)
+       #'(make-scene
+         "window"
+         (lambda ()
+           (apply run-scene (cons scene
+                                  (append (list (symbol->keyword 'property-name) property-value)
+                                          ...)))))))))