*: block start button

Signed-off-by: Ce Gao <[email protected]>

Author: gaocegege

raw-docs/howto.md

@@ -29,7 +29,7 @@ Configure `./scripts/generate-ant-file.sh`:
 - `modes`: the destination for installing the mode once it is built.  
    -  MacOSX: `/Users/[MyUserName]/Documents/Processing/modes/`
    -  Windows: `%homepath%\Documents\modes\`
-   -  Linux: `~/sketchbook/modes/`
+   -  Linux: `${HOME}/sketchbook/modes/`
 - `core` and `pde`: paths to pde.jar and core.jar. They are be used to build RLangMode.
    -  MacOSX: `/Applications/Processing.app/Contents/Java/core.jar` and `/Applications/Processing.app/Contents/Java/pde.jar`
    -  Linux: `[MyPDE]/core/library/core.jar` and `[MyPDE]/lib/pde.jar`
@@ -65,7 +65,7 @@ $ ant build
 Then set the two paths accordingly in `./scripts/generate-ant-file.sh`:
 
 ```
-modes="~/Documents/Processing/modes"
+modes="${HOME}/Documents/Processing/modes"
 core="../processing/core/library/"
 pde="../processing/app/"
 executable="/Applications/Processing.app/Contents/MacOS/Processing"

scripts/generate-ant-file.sh

@@ -3,7 +3,7 @@
 source "$(dirname "${BASH_SOURCE}")/utils/generator-util.sh"
 
 # Path to be changed
-modes="~/Documents/Processing/modes"
+modes="${HOME}/Documents/Processing/modes"
 executable="/Applications/Processing.app/Contents/MacOS/Processing"
 core="/Applications/Processing.app/Contents/Java/core.jar"
 pde="/Applications/Processing.app/Contents/Java/pde.jar"

src/rprocessing/RLangPApplet.java

@@ -1,5 +1,13 @@
 package rprocessing;
 
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
@@ -12,11 +20,19 @@
 import org.renjin.sexp.SEXP;
 import org.renjin.sexp.Symbol;
 
+import processing.awt.PSurfaceAWT;
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PSurface;
+import processing.javafx.PSurfaceFX;
+import processing.opengl.PSurfaceJOGL;
 import rprocessing.applet.BuiltinApplet;
 import rprocessing.exception.NotFoundException;
 import rprocessing.util.Constant;
 import rprocessing.util.Printer;
 
+import com.jogamp.newt.opengl.GLWindow;
+
 /**
  * RlangPApplet
  * PApplet for R language, powered by Renjin.
@@ -25,8 +41,8 @@
  */
 public class RLangPApplet extends BuiltinApplet {
 
-    private static final boolean     VERBOSE = Boolean
-        .parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
+    private static final boolean     VERBOSE       = Boolean.parseBoolean(System
+                                                       .getenv("VERBOSE_RLANG_MODE"));
 
     // A static-mode sketch must be interpreted from within the setup() method.
     // All others are interpreted during construction in order to harvest method
@@ -41,13 +57,15 @@ public class RLangPApplet extends BuiltinApplet {
 
     private final Printer            stdout;
 
+    private final CountDownLatch     finishedLatch = new CountDownLatch(1);
+
     /**
      * Mode for Processing.
      * 
      * @author github.com/gaocegege
      */
     private enum Mode {
-                       STATIC, ACTIVE, MIXED
+        STATIC, ACTIVE, MIXED
     }
 
     private static void log(String msg) {
@@ -89,8 +107,8 @@ public void prePassCode() {
                  */
                 if (isSameClass(ev.get(i), FunctionCall.class)
                     && isSameClass(((FunctionCall) ev.get(i)).getFunction(), Symbol.class)
-                    && ((Symbol) ((FunctionCall) ev.get(i)).getFunction()).getPrintName()
-                        .equals("<-")) {
+                    && ((Symbol) ((FunctionCall) ev.get(i)).getFunction()).getPrintName().equals(
+                        "<-")) {
                     this.renjinEngine.getTopLevelContext().evaluate(ev.get(i),
                         this.renjinEngine.getTopLevelContext().getEnvironment());
                 }
@@ -123,6 +141,105 @@ public void addPAppletToRContext() {
         this.renjinEngine.put("stdout", stdout);
     }
 
+    public void runBlock(final String[] arguments) {
+        log("runBlock");
+        PApplet.runSketch(arguments, this);
+        try {
+            finishedLatch.await();
+            log("Down");
+        } catch (final InterruptedException interrupted) {
+            // Treat an interruption as a request to the applet to terminate.
+            exit();
+            try {
+                finishedLatch.await();
+                log("Down");
+            } catch (final InterruptedException e) {
+                log(e.toString());
+            }
+        } finally {
+            Thread.setDefaultUncaughtExceptionHandler(null);
+            if (PApplet.platform == PConstants.MACOSX
+                && Arrays.asList(arguments).contains("fullScreen")) {
+                // Frame should be OS-X fullscreen, and it won't stop being that unless the jvm
+                // exits or we explicitly tell it to minimize.
+                // (If it's disposed, it'll leave a gray blank window behind it.)
+                log("Disabling fullscreen.");
+                macosxFullScreenToggle(frame);
+            }
+            if (surface instanceof PSurfaceFX) {
+                // Sadly, JavaFX is an abomination, and there's no way to run an FX sketch more than once,
+                // so we must actually exit.
+                log("JavaFX requires SketchRunner to terminate. Farewell!");
+                System.exit(0);
+            }
+            final Object nativeWindow = surface.getNative();
+            if (nativeWindow instanceof com.jogamp.newt.Window) {
+                ((com.jogamp.newt.Window) nativeWindow).destroy();
+            } else {
+                surface.setVisible(false);
+            }
+        }
+        //        if (terminalException != null) {
+        //            throw terminalException;
+        //        }
+    }
+
+    static private void macosxFullScreenToggle(final Window window) {
+        try {
+            final Class<?> appClass = Class.forName("com.apple.eawt.Application");
+            final Method getAppMethod = appClass.getMethod("getApplication");
+            final Object app = getAppMethod.invoke(null);
+            final Method requestMethod = appClass
+                .getMethod("requestToggleFullScreen", Window.class);
+            requestMethod.invoke(app, window);
+        } catch (final ClassNotFoundException cnfe) {
+            // ignored
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 
+     * @see processing.core.PApplet#initSurface()
+     */
+    @Override
+    protected PSurface initSurface() {
+        final PSurface s = super.initSurface();
+        this.frame = null; // eliminate a memory leak from 2.x compat hack
+        //        s.setTitle(pySketchPath.getFileName().toString().replaceAll("\\..*$", ""));
+        if (s instanceof PSurfaceAWT) {
+            final PSurfaceAWT surf = (PSurfaceAWT) s;
+            final Component c = (Component) surf.getNative();
+            c.addComponentListener(new ComponentAdapter() {
+                @Override
+                public void componentHidden(final ComponentEvent e) {
+                    log("initSurface");
+                    finishedLatch.countDown();
+                }
+            });
+        } else if (s instanceof PSurfaceJOGL) {
+            final PSurfaceJOGL surf = (PSurfaceJOGL) s;
+            final GLWindow win = (GLWindow) surf.getNative();
+            win.addWindowListener(new com.jogamp.newt.event.WindowAdapter() {
+                @Override
+                public void windowDestroyed(final com.jogamp.newt.event.WindowEvent arg0) {
+                    log("initSurface");
+                    finishedLatch.countDown();
+                }
+            });
+        } else if (s instanceof PSurfaceFX) {
+            System.err.println("I don't know how to watch FX2D windows for close.");
+        }
+        return s;
+    }
+
+    @Override
+    public void exitActual() {
+        log("exitActual");
+        finishedLatch.countDown();
+    }
+
     /**
      * @see processing.core.PApplet#settings()
      */

src/rprocessing/Runner.java

@@ -3,7 +3,6 @@
 import org.renjin.eval.EvalException;
 import org.renjin.parser.ParseException;
 
-import processing.core.PApplet;
 import rprocessing.exception.NotFoundException;
 import rprocessing.exception.REvalException;
 import rprocessing.lancher.StandaloneSketch;
@@ -21,10 +20,10 @@ public class Runner {
 
     @SuppressWarnings("unused")
     private static final String  CORE_TEXT = RScriptReader.readResourceAsText(Runner.class,
-        "r/core.R");
+                                               "r/core.R");
 
-    private static final boolean VERBOSE   = Boolean
-        .parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
+    private static final boolean VERBOSE   = Boolean.parseBoolean(System
+                                               .getenv("VERBOSE_RLANG_MODE"));
 
     private static void log(final Object... objs) {
         if (!VERBOSE) {
@@ -50,16 +49,18 @@ public static void main(final String[] args) throws Exception {
     }
 
     public synchronized static void runSketchBlocking(final RunnableSketch sketch,
-                                                      final Printer stdout,
-                                                      final Printer stderr) throws REvalException,
-                                                                            NotFoundException {
+                                                      final Printer stdout, final Printer stderr)
+                                                                                                 throws REvalException,
+                                                                                                 NotFoundException {
         runSketchBlocking(sketch, stdout, stderr, null);
     }
 
     public synchronized static void runSketchBlocking(final RunnableSketch sketch,
-                                                      final Printer stdout, final Printer stderr,
-                                                      final SketchPositionListener sketchPositionListener) throws REvalException,
-                                                                                                           NotFoundException {
+                                                      final Printer stdout,
+                                                      final Printer stderr,
+                                                      final SketchPositionListener sketchPositionListener)
+                                                                                                          throws REvalException,
+                                                                                                          NotFoundException {
         final String[] args = sketch.getPAppletArguments();
 
         log("Tring to initialize RLangPApplet.");
@@ -69,7 +70,7 @@ public synchronized static void runSketchBlocking(final RunnableSketch sketch,
 
         try {
             // Run Sketch.
-            PApplet.runSketch(args, rp);
+            rp.runBlock(args);
         } catch (ParseException pe) {
             throw new REvalException(pe.getMessage());
         } catch (EvalException ee) {

src/rprocessing/mode/RLangEditor.java

@@ -46,8 +46,8 @@
  */
 public class RLangEditor extends Editor {
 
-    private static final boolean      VERBOSE          = Boolean
-        .parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
+    private static final boolean      VERBOSE          = Boolean.parseBoolean(System
+                                                           .getenv("VERBOSE_RLANG_MODE"));
 
     /**  */
     private static final long         serialVersionUID = -5993950683909551427L;
@@ -82,8 +82,8 @@ public String getId() {
      * @param mode
      * @throws EditorException
      */
-    protected RLangEditor(Base base, String path, EditorState state,
-                          Mode mode) throws EditorException {
+    protected RLangEditor(Base base, String path, EditorState state, Mode mode)
+                                                                               throws EditorException {
         super(base, path, state, mode);
         log("Initialize RLangEditor now.");
 
@@ -205,6 +205,7 @@ public EditorToolbar createToolbar() {
      */
     @Override
     public void deactivateRun() {
+        log("deactivateRun");
         restoreToolbar();
         cleanupTempSketch();
     }
@@ -272,6 +273,7 @@ public void handlePresent() {
     }
 
     public void handleStop() {
+        log("handleStop");
         toolbar.activateStop();
         internalCloseRunner();
         restoreToolbar();
@@ -299,8 +301,8 @@ private void runSketch(final DisplayType displayType) {
                 tempSketch = createTempSketch();
                 sketchPath = tempSketch.resolve(sketchMainFileName).toFile();
             } catch (final IOException e) {
-                Messages.showError("Sketchy Behavior",
-                    "I can't copy your unsaved work\n" + "to a temp directory.", e);
+                Messages.showError("Sketchy Behavior", "I can't copy your unsaved work\n"
+                                                       + "to a temp directory.", e);
                 return;
             }
         } else {
@@ -318,8 +320,8 @@ private void runSketch(final DisplayType displayType) {
         }
 
         try {
-            sketchService
-                .runSketch(new PdeSketch(sketch, sketchPath, displayType, location, locationType));
+            sketchService.runSketch(new PdeSketch(sketch, sketchPath, displayType, location,
+                locationType));
         } catch (final SketchException e) {
             statusError(e);
         }

src/rprocessing/mode/RLangMode.java

@@ -18,16 +18,16 @@
  */
 public class RLangMode extends Mode {
 
-    private static final boolean       VERBOSE             = Boolean
-        .parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
+    private static final boolean       VERBOSE             = Boolean.parseBoolean(System
+                                                               .getenv("VERBOSE_RLANG_MODE"));
 
     /**
      * If the environment variable SKETCH_RUNNER_FIRST is equal to the string "true", then
      * {@link RLangMode} expects that the {@link SketchRunner} is already running and waiting
      * to be communicated with (as when you're debugging it in Eclipse, for example).
      */
-    public static final boolean        SKETCH_RUNNER_FIRST = Boolean
-        .parseBoolean(System.getenv("SKETCH_RUNNER_FIRST"));
+    public static final boolean        SKETCH_RUNNER_FIRST = Boolean.parseBoolean(System
+                                                               .getenv("SKETCH_RUNNER_FIRST"));
 
     private final SketchServiceManager sketchServiceManager;
 
@@ -40,7 +40,7 @@ private static void log(final String msg) {
 
     public RLangMode(final Base base, final File folder) {
         super(base, folder);
-
+        log("DEBUG the RLangMode");
         sketchServiceManager = new SketchServiceManager(this);
     }
 
@@ -52,8 +52,8 @@ public SketchServiceManager getSketchServiceManager() {
      * @see processing.app.Mode#createEditor(processing.app.Base, java.lang.String, processing.app.ui.EditorState)
      */
     @Override
-    public Editor createEditor(Base base, final String path,
-                               final EditorState state) throws EditorException {
+    public Editor createEditor(Base base, final String path, final EditorState state)
+                                                                                     throws EditorException {
         // Lazily start the sketch running service only when an editor is required.
         if (!sketchServiceManager.isStarted()) {
             sketchServiceManager.start();