defapplet takes :size instead of :width, :height

examples/example2.clj

@@ -35,7 +35,7 @@
 ;; Now we just need to define an applet:
 
 (defapplet example2 :title "An example."
-  :setup setup :draw draw :width 200 :height 200)
+  :setup setup :draw draw :size [200 200])
 
 (run example2)
 

src/rosado/processing.clj

@@ -17,9 +17,9 @@
 ;; to an instance of processing.core.PApplet
 (def #^PApplet *applet*)
 
-(def #^{:private true} toupper (memfn toUpperCase))
+(def toupper (memfn toUpperCase))
 
-(defn- tosymb [kw]
+(defn tosymb [kw]
   (-> kw name toupper symbol))
 
 (defn abs-int [n] (PApplet/abs (int n)))

src/rosado/processing/applet.clj

@@ -1,5 +1,5 @@
 (ns rosado.processing.applet
-  (:use [rosado.processing])
+  (:use [rosado.processing :except (size)])
   (:import (javax.swing JFrame)))
 
 (defn- bind-applets
@@ -14,7 +14,7 @@
   "Define an applet. Takes an app-name and a map of options."
   [app-name & opts]
   (let [options (assoc (apply hash-map opts) :name (str app-name))
-        fns (dissoc options :name :title :height :width)
+        fns (dissoc options :name :title :size)
         methods (reduce bind-applets {} fns)]
     `(def ~app-name
           (let [frame# (atom nil)
@@ -30,12 +30,14 @@
   [applet & interactive?]
   (.init applet)
   (let [m (.meta applet)
-        width (or (:width m) 200)
-        height (or (:height m) 200)
+        [width height & mode] (or (:size m) [200 200])
+        mode (if-let [kw (first mode)]
+               (tosymb kw)
+               JAVA2D)
         close-op (if (first interactive?)
                    JFrame/DISPOSE_ON_CLOSE
                    JFrame/EXIT_ON_CLOSE)]
-    (.size applet width height)
+    (.size applet width height mode)
     (reset! (:frame m)
             (doto (JFrame. (or (:title m) (:name m)))
               (.setDefaultCloseOperation close-op)