propane 3.3.1-java → 3.6.0-java

data/src/main/java/processing/core/PStyle.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -17,44 +19,45 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
+
 package processing.core;
 
-public class PStyle implements PConstants {
 
-    public int imageMode;
-    public int rectMode;
-    public int ellipseMode;
-    public int shapeMode;
-
-    public int blendMode;
-
-    public int colorMode;
-    public float colorModeX;
-    public float colorModeY;
-    public float colorModeZ;
-    public float colorModeA;
-
-    public boolean tint;
-    public int tintColor;
-    public boolean fill;
-    public int fillColor;
-    public boolean stroke;
-    public int strokeColor;
-    public float strokeWeight;
-    public int strokeCap;
-    public int strokeJoin;
-
-    // TODO these fellas are inconsistent, and may need to go elsewhere
-    public float ambientR, ambientG, ambientB;
-    public float specularR, specularG, specularB;
-    public float emissiveR, emissiveG, emissiveB;
-    public float shininess;
-
-    public PFont textFont;
-    public int textAlign;
-    public int textAlignY;
-    public int textMode;
-    public float textSize;
-    public float textLeading;
+public class PStyle implements PConstants {
+  public int imageMode;
+  public int rectMode;
+  public int ellipseMode;
+  public int shapeMode;
+
+  public int blendMode;
+
+  public int colorMode;
+  public float colorModeX;
+  public float colorModeY;
+  public float colorModeZ;
+  public float colorModeA;
+
+  public boolean tint;
+  public int tintColor;
+  public boolean fill;
+  public int fillColor;
+  public boolean stroke;
+  public int strokeColor;
+  public float strokeWeight;
+  public int strokeCap;
+  public int strokeJoin;
+
+  // TODO these fellas are inconsistent, and may need to go elsewhere
+  public float ambientR, ambientG, ambientB;
+  public float specularR, specularG, specularB;
+  public float emissiveR, emissiveG, emissiveB;
+  public float shininess;
+
+  public PFont textFont;
+  public int textAlign;
+  public int textAlignY;
+  public int textMode;
+  public float textSize;
+  public float textLeading;
 }

data/src/main/java/processing/core/PSurface.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -16,84 +18,113 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
+
 package processing.core;
 
+import java.io.File;
+
 public interface PSurface {
+  /**
+   * Minimum dimensions for the window holding an applet. This varies between
+   * platforms, Mac OS X 10.3 (confirmed with 10.7 and Java 6) can do any
+   * height but requires at least 128 pixels width. Windows XP has another
+   * set of limitations. And for all I know, Linux probably allows window
+   * sizes to be negative numbers.
+   */
+  static public final int MIN_WINDOW_WIDTH = 128;
+  static public final int MIN_WINDOW_HEIGHT = 128;
+
+  //public int displayDensity();
+
+  //public int displayDensity(int display);
 
-    /**
-     * Minimum dimensions for the window holding an applet. This varies between
-     * platforms, Mac OS X 10.3 (confirmed with 10.7 and Java 6) can do any
-     * height but requires at least 128 pixels width. Windows XP has another set
-     * of limitations. And for all I know, Linux probably allows window sizes to
-     * be negative numbers.
-     */
-    static public final int MIN_WINDOW_WIDTH = 128;
-    static public final int MIN_WINDOW_HEIGHT = 128;
-
-    // renderer that doesn't draw to the screen
-    public void initOffscreen(PApplet sketch);
-
-    // considering removal in favor of separate Component classes for appropriate renderers
-    // (i.e. for Java2D or a generic Image surface, but not PDF, debatable for GL or )
-    //public Component initComponent(PApplet sketch);
-    //public Frame initFrame(PApplet sketch, Color backgroundColor,
+  //
+
+  // renderer that doesn't draw to the screen
+  public void initOffscreen(PApplet sketch);
+
+  // considering removal in favor of separate Component classes for appropriate renderers
+  // (i.e. for Java2D or a generic Image surface, but not PDF, debatable for GL or FX)
+  //public Component initComponent(PApplet sketch);
+
+  //public Frame initFrame(PApplet sketch, Color backgroundColor,
 //  public void initFrame(PApplet sketch, int backgroundColor,
 //                        int deviceIndex, boolean fullScreen, boolean spanDisplays);
-    public void initFrame(PApplet sketch);
-
-    /**
-     * Get the native window object associated with this drawing surface. For
-     * Java2D, this will be an AWT Frame object. For OpenGL, the window. The
-     * data returned here is subject to the whims of the renderer, and using
-     * this method means you're willing to deal with underlying implementation
-     * changes and that you won't throw a fit like a toddler if your code breaks
-     * sometime in the future.
-     */
-    public Object getNative();
-
-    //
-    // Just call these on an AWT Frame object stored in PApplet.
-    // Silly, but prevents a lot of rewrite and extra methods for little benefit.
-    // However, maybe prevents us from having to document the 'frame' variable?
-    /**
-     * Set the window (and dock, or whatever necessary) title.
-     */
-    public void setTitle(String title);
-
-    /**
-     * Show or hide the window.
-     */
-    public void setVisible(boolean visible);
-
-    /**
-     * Set true if we want to resize things (default is not resizable)
-     */
-    public void setResizable(boolean resizable);
-
-    /**
-     * Dumb name, but inherited from Frame and no better ideas.
-     */
-    public void setAlwaysOnTop(boolean always);
-
-    public void setIcon(PImage icon);
-
-    //
+  public void initFrame(PApplet sketch);
+
+  //
+
+  public PImage loadImage(String path, Object... args);
+
+  //
+
+  public void selectInput(String prompt, String callback,
+                          File file, Object callbackObject);
+
+  public void selectOutput(String prompt, String callback,
+                           File file, Object callbackObject);
+
+  public void selectFolder(String prompt, String callback,
+                           File file, Object callbackObject);
+
+  //
+
+  /**
+   * Get the native window object associated with this drawing surface.For Java2D, this will be an AWT Frame object.
+   * For OpenGL, the window.
+ The data returned here is subject to the whims of the renderer,
+ and using this method means you're willing to deal with underlying
+ implementation changes and that you won't throw a fit like a toddler
+ if your code breaks sometime in the future.
+   * @return 
+   */
+  public Object getNative();
+
+  //
+
+  // Just call these on an AWT Frame object stored in PApplet.
+  // Silly, but prevents a lot of rewrite and extra methods for little benefit.
+  // However, maybe prevents us from having to document the 'frame' variable?
+
+  /** Set the window (and dock, or whatever necessary) title.
+   * @param title */
+  public void setTitle(String title);
+
+  /** Show or hide the window.
+   * @param visible */
+  public void setVisible(boolean visible);
+
+  /** Set true if we want to resize things (default is not resizable)
+   * @param resizable */
+  public void setResizable(boolean resizable);
+
+  /** Dumb name, but inherited from Frame and no better ideas.
+   * @param always */
+  public void setAlwaysOnTop(boolean always);
+
+  public void setIcon(PImage icon);
+
+  //
+
 //  public void placeWindow(int[] location);
-    public void placeWindow(int[] location, int[] editorLocation);
 
-    //public void placeFullScreen(boolean hideStop);
-    public void placePresent(int stopColor);
+  public void placeWindow(int[] location, int[] editorLocation);
+
+  //public void placeFullScreen(boolean hideStop);
+  public void placePresent(int stopColor);
+
+  // Sketch is running from the PDE, set up messaging back to the PDE
+  public void setupExternalMessages();
+
+  //
 
-    // Sketch is running from the PDE, set up messaging back to the PDE
-    public void setupExternalMessages();
+  // sets displayWidth/Height inside PApplet
+  //public void checkDisplaySize();
 
-    //
-    // sets displayWidth/Height inside PApplet
-    //public void checkDisplaySize();
-    public void setLocation(int x, int y);
+  public void setLocation(int x, int y);
 
-    public void setSize(int width, int height);
+  public void setSize(int width, int height);
 
 //  /**
 //   * Called by {@link PApplet#createGraphics} to initialize the
@@ -103,54 +134,65 @@ public interface PSurface {
 //   * @param wide
 //   * @param high
 //   */
-    // create pixel buffer (pulled out for offscreen graphics)
-    //public void initImage(PGraphics gr, int wide, int high);
-    // create pixel buffer, called from allocate() to produce a compatible image for rendering efficiently
+  // create pixel buffer (pulled out for offscreen graphics)
+  //public void initImage(PGraphics gr, int wide, int high);
+  // create pixel buffer, called from allocate() to produce a compatible image for rendering efficiently
 //  public void initImage(PGraphics gr);
-    //public Component getComponent();
+
+  //public Component getComponent();
+
 //  /**
 //   * Sometimes smoothing must be set at the drawing surface level
 //   * not just inside the renderer itself.
 //   */
 //  public void setSmooth(int level);
-    public void setFrameRate(float fps);
+
+  public void setFrameRate(float fps);
 
 //  // called on the first frame so that the now-visible drawing surface can
 //  // receive key and mouse events
 //  public void requestFocus();
+
 //  // finish rendering to the screen (called by PApplet)
 //  public void blit();
-    //
-    public void setCursor(int kind);
 
-    public void setCursor(PImage image, int hotspotX, int hotspotY);
+  //
+
+  public void setCursor(int kind);
+
+  public void setCursor(PImage image, int hotspotX, int hotspotY);
+
+  public void showCursor();
+
+  public void hideCursor();
+
+  //
 
-    public void showCursor();
+  /**
+   * @param url the link to open
+   * @return false if unable to find a viable way to open
+   */
+  public boolean openLink(String url);
 
-    public void hideCursor();
+  //
 
-    //
-    /**
-     * Start the animation thread
-     */
-    public void startThread();
+  /** Start the animation thread */
+  public void startThread();
 
-    /**
-     * On the next trip through the animation thread, things should go
-     * sleepy-bye. Does not pause the thread immediately because that needs to
-     * happen on the animation thread itself, so fires on the next trip through
-     * draw().
-     */
-    public void pauseThread();
+  /**
+   * On the next trip through the animation thread, things should go sleepy-bye.
+   * Does not pause the thread immediately because that needs to happen on the
+   * animation thread itself, so fires on the next trip through draw().
+   */
+  public void pauseThread();
 
-    public void resumeThread();
+  public void resumeThread();
 
-    /**
-     * Stop the animation thread (set it null)
-     *
-     * @return false if already stopped
-     */
-    public boolean stopThread();
+  /**
+   * Stop the animation thread (set it null)
+   * @return false if already stopped
+   */
+  public boolean stopThread();
 
-    public boolean isStopped();
+  public boolean isStopped();
 }

data/src/main/java/processing/core/PSurfaceNone.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -16,238 +18,320 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
+
 package processing.core;
 
+import java.io.File;
+
+import processing.awt.ShimAWT;
+
 /**
  * Surface that's not really visible. Used for PDF and friends, or as a base
  * class for other drawing surfaces. It includes the standard rendering loop.
  */
 public class PSurfaceNone implements PSurface {
+  protected PApplet sketch;
+  protected PGraphics graphics;
 
-    protected PApplet sketch;
-    protected PGraphics graphics;
+  protected Thread thread;
+  protected boolean paused;
+  protected Object pauseObject = new Object();
 
-    protected Thread thread;
-    protected boolean paused;
-    protected Object pauseObject = new Object();
+  protected float frameRateTarget = 60;
+  protected long frameRatePeriod = 1000000000L / 60L;
 
-    protected float frameRateTarget = 60;
-    protected long frameRatePeriod = 1000000000L / 60L;
 
-    public PSurfaceNone(PGraphics graphics) {
-        this.graphics = graphics;
-    }
+  public PSurfaceNone(PGraphics graphics) {
+    this.graphics = graphics;
+  }
 
-    @Override
-    public void initOffscreen(PApplet sketch) {
-        this.sketch = sketch;
 
-        setSize(sketch.sketchWidth(), sketch.sketchHeight());
-    }
+  public int displayDensity() {
+    return 1;
+  }
+
+
+  public int displayDensity(int display) {
+    return 1;
+  }
+
+
+  @Override
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
+  @Override
+  public void selectInput(String prompt, String callback, File file,
+                          Object callbackObject) {
+  }
+
+
+  @Override
+  public void selectOutput(String prompt, String callback, File file,
+                           Object callbackObject) {
+  }
+
+
+  @Override
+  public void selectFolder(String prompt, String callback, File file,
+                           Object callbackObject) {
+  }
+
+
+  @Override
+  public void initOffscreen(PApplet sketch) {
+    this.sketch = sketch;
+
+    setSize(sketch.sketchWidth(), sketch.sketchHeight());
+  }
+
 
 //  public Component initComponent(PApplet sketch) {
 //    return null;
 //  }
-    @Override
-    public void initFrame(PApplet sketch) {
-        throw new IllegalStateException("initFrame() not available with "
-                + getClass().getSimpleName());
-    }
 
-    public Object getNative() {
-        return null;
-    }
 
-    /**
-     * Set the window (and dock, or whatever necessary) title.
-     */
-    @Override
-    public void setTitle(String title) {
-        // You're in a utopian PSurface implementation where titles don't exist.
-    }
+  @Override
+  public void initFrame(PApplet sketch) {
+    throw new IllegalStateException("initFrame() not available with " +
+                                    getClass().getSimpleName());
+  }
 
-    @Override
-    public void setIcon(PImage image) {
-        // I ain't visible, man.
-    }
 
-    /**
-     * Show or hide the window.
-     */
-    @Override
-    public void setVisible(boolean visible) {
-        // I'm always invisible. You can't catch me.
-    }
+  @Override
+  public Object getNative() {
+    return null;
+  }
 
-    /**
-     * Set true if we want to resize things (default is not resizable)
-     */
-    @Override
-    public void setResizable(boolean resizable) {
-        // I don't need size to know my worth.
-    }
 
-    @Override
-    public void placeWindow(int[] location, int[] editorLocation) {
-    }
+  /** Set the window (and dock, or whatever necessary) title.
+   * @param title */
+  @Override
+  public void setTitle(String title) {
+    // You're in a utopian PSurface implementation where titles don't exist.
+  }
 
-    @Override
-    public void placePresent(int stopColor) {
-    }
 
-    @Override
-    public void setupExternalMessages() {
-    }
+  @Override
+  public void setIcon(PImage image) {
+    // I ain't visible, man.
+  }
 
-    @Override
-    public void setAlwaysOnTop(boolean always) {
-    }
 
-    //
-    @Override
-    public void setLocation(int x, int y) {
-        // I'm everywhere, because I'm nowhere.
-    }
+  /** Show or hide the window.
+   * @param visible */
+  @Override
+  public void setVisible(boolean visible) {
+    // I'm always invisible. You can't catch me.
+  }
 
-    @Override
-    public void setSize(int wide, int high) {
-        if (PApplet.DEBUG) {
-            //System.out.format("frame visible %b, setSize(%d, %d) %n", frame.isVisible(), wide, high);
-            new Exception(String.format("setSize(%d, %d)", wide, high)).printStackTrace(System.out);
-        }
 
-        //if (wide == sketchWidth && high == sketchHeight) {  // doesn't work on launch
-        if (wide == sketch.width && high == sketch.height) {
-            if (PApplet.DEBUG) {
-                new Exception("w/h unchanged " + wide + " " + high).printStackTrace(System.out);
-            }
-            return;  // unchanged, don't rebuild everything
-        }
+  /** Set true if we want to resize things (default is not resizable)
+   * @param resizable */
+  @Override
+  public void setResizable(boolean resizable) {
+    // I don't need size to know my worth.
+  }
+
+
+  @Override
+  public void placeWindow(int[] location, int[] editorLocation) { }
+
+
+  @Override
+  public void placePresent(int stopColor) { }
+
+
+  @Override
+  public void setupExternalMessages() { }
+
+
+  @Override
+  public void setAlwaysOnTop(boolean always) { }
+
+
+  //
+
+
+  @Override
+  public void setLocation(int x, int y) {
+    // I'm everywhere, because I'm nowhere.
+  }
 
-        //throw new RuntimeException("implement me, see readme.md");
-        sketch.width = wide;
-        sketch.height = high;
 
-        // set PGraphics variables for width/height/pixelWidth/pixelHeight
-        graphics.setSize(wide, high);
+  @Override
+  public void setSize(int wide, int high) {
+    if (PApplet.DEBUG) {
+      //System.out.format("frame visible %b, setSize(%d, %d) %n", frame.isVisible(), wide, high);
+      new Exception(String.format("setSize(%d, %d)", wide, high)).printStackTrace(System.out);
     }
 
+    //if (wide == sketchWidth && high == sketchHeight) {  // doesn't work on launch
+    if (wide == sketch.width && high == sketch.height) {
+      if (PApplet.DEBUG) {
+        new Exception("w/h unchanged " + wide + " " + high).printStackTrace(System.out);
+      }
+      return;  // unchanged, don't rebuild everything
+    }
+
+    //throw new RuntimeException("implement me, see readme.md");
+    sketch.width = wide;
+    sketch.height = high;
+
+    // set PGraphics variables for width/height/pixelWidth/pixelHeight
+    graphics.setSize(wide, high);
+  }
+
+
 //  public void initImage(PGraphics graphics) {
 //    // TODO Auto-generated method stub
 //
 //  }
+
 //  public Component getComponent() {
 //    return null;
 //  }
+
+
 //  public void setSmooth(int level) {
 //    // TODO Auto-generated method stub
 //  }
+
 //  void requestFocus() {
 //  }
+
 //  public void blit() {
 //    // TODO Auto-generated method stub
 //  }
-    public void setCursor(int kind) {
-    }
 
-    public void setCursor(PImage image, int hotspotX, int hotspotY) {
-    }
+  @Override
+  public void setCursor(int kind) { }
 
-    public void showCursor() {
-    }
+  @Override
+  public void setCursor(PImage image, int hotspotX, int hotspotY) { }
 
-    public void hideCursor() {
-    }
+  @Override
+  public void showCursor() { }
 
-    //
-    public Thread createThread() {
-        return new AnimationThread();
-    }
+  @Override
+  public void hideCursor() { }
 
-    public void startThread() {
-        if (thread == null) {
-            thread = createThread();
-            thread.start();
-        } else {
-            throw new IllegalStateException("Thread already started in "
-                    + getClass().getSimpleName());
-        }
-    }
 
-    public boolean stopThread() {
-        if (thread == null) {
-            return false;
-        }
-        thread = null;
-        return true;
-    }
+  //
+
+
+  @Override
+  public boolean openLink(String url) {
+    return false;
+  }
+
+
+  //
 
-    public boolean isStopped() {
-        return thread == null || !thread.isAlive();
+
+  public Thread createThread() {
+    return new AnimationThread();
+  }
+
+
+  @Override
+  public void startThread() {
+    if (thread == null) {
+      thread = createThread();
+      thread.start();
+    } else {
+      throw new IllegalStateException("Thread already started in " +
+                                      getClass().getSimpleName());
     }
+  }
+
 
-    // sets a flag to pause the thread when ready
-    public void pauseThread() {
-        PApplet.debug("PApplet.run() paused, calling object wait...");
-        paused = true;
+  @Override
+  public boolean stopThread() {
+    if (thread == null) {
+      return false;
     }
+    thread = null;
+    return true;
+  }
+
+
+  @Override
+  public boolean isStopped() {
+    return thread == null || !thread.isAlive();
+  }
+
+
+  // sets a flag to pause the thread when ready
+  @Override
+  public void pauseThread() {
+    PApplet.debug("PApplet.run() paused, calling object wait...");
+    paused = true;
+  }
 
-    // halts the animation thread if the pause flag is set
-    protected void checkPause() {
-        if (paused) {
-            synchronized (pauseObject) {
-                try {
-                    pauseObject.wait();
+
+  // halts the animation thread if the pause flag is set
+  protected void checkPause() {
+    if (paused) {
+      synchronized (pauseObject) {
+        try {
+          pauseObject.wait();
 //          PApplet.debug("out of wait");
-                } catch (InterruptedException e) {
-                    // waiting for this interrupt on a start() (resume) call
-                }
-            }
+        } catch (InterruptedException e) {
+          // waiting for this interrupt on a start() (resume) call
         }
-//    PApplet.debug("done with pause");
+      }
     }
+//    PApplet.debug("done with pause");
+  }
 
-    public void resumeThread() {
-        paused = false;
-        synchronized (pauseObject) {
-            pauseObject.notifyAll();  // wake up the animation thread
-        }
+
+  @Override
+  public void resumeThread() {
+    paused = false;
+    synchronized (pauseObject) {
+      pauseObject.notifyAll();  // wake up the animation thread
     }
+  }
 
-    public void setFrameRate(float fps) {
-        frameRateTarget = fps;
-        frameRatePeriod = (long) (1000000000.0 / frameRateTarget);
-        //g.setFrameRate(fps);
+
+  @Override
+  public void setFrameRate(float fps) {
+    frameRateTarget = fps;
+    frameRatePeriod = (long) (1000000000.0 / frameRateTarget);
+    //g.setFrameRate(fps);
+  }
+
+
+  public class AnimationThread extends Thread {
+
+    public AnimationThread() {
+      super("Animation Thread");
     }
 
-    public class AnimationThread extends Thread {
+    // broken out so it can be overridden by Danger et al
+    public void callDraw() {
+      sketch.handleDraw();
+    }
 
-        public AnimationThread() {
-            super("Animation Thread");
-        }
+    /**
+     * Main method for the primary animation thread.
+     * <A HREF="http://java.sun.com/products/jfc/tsc/articles/painting/">Painting in AWT and Swing</A>
+     */
+    @Override
+    public void run() {  // not good to make this synchronized, locks things up
+      long beforeTime = System.nanoTime();
+      long overSleepTime = 0L;
 
-        // broken out so it can be overridden by Danger et al
-        public void callDraw() {
-            sketch.handleDraw();
-        }
+      int noDelays = 0;
+      // Number of frames with a delay of 0 ms before the
+      // animation thread yields to other running threads.
+      final int NO_DELAYS_PER_YIELD = 15;
 
-        /**
-         * Main method for the primary animation thread.
-         * <A HREF="http://java.sun.com/products/jfc/tsc/articles/painting/">Painting
-         * in AWT and Swing</A>
-         */
-        @Override
-        public void run() {  // not good to make this synchronized, locks things up
-            long beforeTime = System.nanoTime();
-            long overSleepTime = 0L;
-
-            int noDelays = 0;
-            // Number of frames with a delay of 0 ms before the
-            // animation thread yields to other running threads.
-            final int NO_DELAYS_PER_YIELD = 15;
-
-            /*
+      /*
       // If size un-initialized, might be a Canvas. Call setSize() here since
       // we now have a parent object that this Canvas can use as a peer.
       if (graphics.image == null) {
@@ -265,26 +349,28 @@ public class PSurfaceNone implements PSurface {
         }
 //        System.out.format("  but now, sketchW/H changed to %d %d%n", sketchWidth, sketchHeight);
       }
-             */
-            // un-pause the sketch and get rolling
-            sketch.start();
+      */
 
-            while ((Thread.currentThread() == thread) && !sketch.finished) {
-                checkPause();
+      // un-pause the sketch and get rolling
+      sketch.start();
 
-                // Don't resize the renderer from the EDT (i.e. from a ComponentEvent),
-                // otherwise it may attempt a resize mid-render.
+      while ((Thread.currentThread() == thread) && !sketch.finished) {
+        checkPause();
+
+        // Don't resize the renderer from the EDT (i.e. from a ComponentEvent),
+        // otherwise it may attempt a resize mid-render.
 //        Dimension currentSize = canvas.getSize();
 //        if (currentSize.width != sketchWidth || currentSize.height != sketchHeight) {
 //          System.err.format("need to resize from %s to %d, %d%n", currentSize, sketchWidth, sketchHeight);
 //        }
-                // render a single frame
+
+        // render a single frame
 //        try {
 //          EventQueue.invokeAndWait(new Runnable() {
 //            public void run() {
 //        System.out.println("calling draw, finished = " + sketch.finished);
-                //System.out.println("calling draw, looping = " + sketch.looping + ", frameCount = " + sketch.frameCount);
-                callDraw();
+        //System.out.println("calling draw, looping = " + sketch.looping + ", frameCount = " + sketch.frameCount);
+        callDraw();
 
 //        EventQueue.invokeLater(new Runnable() {
 //          public void run() {
@@ -293,6 +379,7 @@ public class PSurfaceNone implements PSurface {
 //        }
 //          }
 //        });
+
 //            }
 //          });
 //        } catch (InterruptedException ie) {
@@ -300,44 +387,45 @@ public class PSurfaceNone implements PSurface {
 //        } catch (InvocationTargetException ite) {
 //          ite.getTargetException().printStackTrace();
 //        }
-                // wait for update & paint to happen before drawing next frame
-                // this is necessary since the drawing is sometimes in a
-                // separate thread, meaning that the next frame will start
-                // before the update/paint is completed
-                long afterTime = System.nanoTime();
-                long timeDiff = afterTime - beforeTime;
-                //System.out.println("time diff is " + timeDiff);
-                long sleepTime = (frameRatePeriod - timeDiff) - overSleepTime;
-
-                if (sleepTime > 0) {  // some time left in this cycle
-                    try {
-                        Thread.sleep(sleepTime / 1000000L, (int) (sleepTime % 1000000L));
-                        noDelays = 0;  // Got some sleep, not delaying anymore
-                    } catch (InterruptedException ex) {
-                    }
-
-                    overSleepTime = (System.nanoTime() - afterTime) - sleepTime;
-
-                } else {    // sleepTime <= 0; the frame took longer than the period
-                    overSleepTime = 0L;
-                    noDelays++;
-
-                    if (noDelays > NO_DELAYS_PER_YIELD) {
-                        Thread.yield();   // give another thread a chance to run
-                        noDelays = 0;
-                    }
-                }
-
-                beforeTime = System.nanoTime();
-            }
 
-            sketch.dispose();  // call to shutdown libs?
+        // wait for update & paint to happen before drawing next frame
+        // this is necessary since the drawing is sometimes in a
+        // separate thread, meaning that the next frame will start
+        // before the update/paint is completed
 
-            // If the user called the exit() function, the window should close,
-            // rather than the sketch just halting.
-            if (sketch.exitCalled) {
-                sketch.exitActual();
-            }
+        long afterTime = System.nanoTime();
+        long timeDiff = afterTime - beforeTime;
+        //System.out.println("time diff is " + timeDiff);
+        long sleepTime = (frameRatePeriod - timeDiff) - overSleepTime;
+
+        if (sleepTime > 0) {  // some time left in this cycle
+          try {
+            Thread.sleep(sleepTime / 1000000L, (int) (sleepTime % 1000000L));
+            noDelays = 0;  // Got some sleep, not delaying anymore
+          } catch (InterruptedException ex) { }
+
+          overSleepTime = (System.nanoTime() - afterTime) - sleepTime;
+
+        } else {    // sleepTime <= 0; the frame took longer than the period
+          overSleepTime = 0L;
+          noDelays++;
+
+          if (noDelays > NO_DELAYS_PER_YIELD) {
+            Thread.yield();   // give another thread a chance to run
+            noDelays = 0;
+          }
         }
+
+        beforeTime = System.nanoTime();
+      }
+
+      sketch.dispose();  // call to shutdown libs?
+
+      // If the user called the exit() function, the window should close,
+      // rather than the sketch just halting.
+      if (sketch.exitCalled) {
+        sketch.exitActual();
+      }
     }
+  }
 }