Implement size() and fullscree() methods

As done in the main repo, fullscreen() and size() are now called from the
settings() method.

Signed-off-by: Umair Khan <[email protected]>

Author: omerjerk

core/src/processing/core/PApplet.java

@@ -417,6 +417,14 @@ static public class RendererChangeException extends RuntimeException { }
 
   static final String ERROR_MIN_MAX =
     "Cannot use min() or max() on an empty array.";
+  
+  boolean insideSettings;
+  
+  String renderer = JAVA2D;
+  
+  int smooth = 1;  // default smoothing (whatever that means for the renderer)
+  
+  boolean fullScreen = false;
 
 
   //////////////////////////////////////////////////////////////
@@ -448,6 +456,10 @@ public void onCreate(Bundle savedInstanceState) {
     getWindowManager().getDefaultDisplay().getMetrics(dm);
     displayWidth = dm.widthPixels;
     displayHeight = dm.heightPixels;
+    
+    //Setting the default height and width to be fullscreen
+    width = displayWidth;
+    height = displayHeight;
 //    println("density is " + dm.density);
 //    println("densityDpi is " + dm.densityDpi);
     if (DEBUG) println("display metrics: " + dm);
@@ -464,6 +476,8 @@ public void onCreate(Bundle savedInstanceState) {
 //    RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.FILL_PARENT);
 //lp.addRule(RelativeLayout.RIGHT_OF, tv1.getId());
 //    layout.setGravity(RelativeLayout.CENTER_IN_PARENT);
+    
+    handleSettings();
 
     int sw = sketchWidth();
     int sh = sketchHeight();
@@ -638,6 +652,41 @@ protected void onPause() {
 //}
 //    surfaceView.onPause();
   }
+  
+  
+  /**
+   * @param method "size" or "fullScreen"
+   * @param args parameters passed to the function so we can show the user
+   * @return true if safely inside the settings() method
+   */
+  boolean insideSettings(String method, Object... args) {
+    if (insideSettings) {
+      return true;
+    }
+    final String url = "https://processing.org/reference/" + method + "_.html";
+    if (!external) {  // post a warning for users of Eclipse and other IDEs
+      StringList argList = new StringList(args);
+      System.err.println("When not using the PDE, " + method + "() can only be used inside settings().");
+      System.err.println("Remove the " + method + "() method from setup(), and add the following:");
+      System.err.println("public void settings() {");
+      System.err.println("  " + method + "(" + argList.join(", ") + ");");
+      System.err.println("}");
+    }
+    throw new IllegalStateException(method + "() cannot be used here, see " + url);
+  }
+  
+  
+  void handleSettings() {
+    insideSettings = true;
+    //Do stuff
+    settings();
+    insideSettings = false;
+  }
+  
+  
+  public void settings() {
+    //It'll be empty. Will be overridden by user's sketch class.
+  }
 
 
   /**
@@ -1040,17 +1089,23 @@ public int sketchQuality() {
 
 
   public int sketchWidth() {
-    return displayWidth;
+    if (fullScreen) {
+      return displayWidth;
+    }
+    return width;
   }
 
 
   public int sketchHeight() {
-    return displayHeight;
+    if (fullScreen) {
+      return displayHeight;
+    }
+    return height;
   }
 
 
   public String sketchRenderer() {
-    return JAVA2D;
+    return renderer;
   }
 
 
@@ -1465,6 +1520,54 @@ public void draw() {
 //      layout.invalidate();
 //    }
 //  }
+  
+  
+  /**
+   * Create a full-screen sketch using the default renderer.
+   */
+  public void fullScreen() {
+    if (!fullScreen) {
+      if (insideSettings("fullScreen")) {
+        this.fullScreen = true;
+      }
+    }
+  }
+
+
+  public void fullScreen(int display) {
+    //Display index doesn't make sense in Android.
+    //Should we throw some error in log ?
+    if (!fullScreen /*|| display != this.display*/) {
+      if (insideSettings("fullScreen", display)) {
+        this.fullScreen = true;
+//        this.display = display;
+      }
+    }
+  }
+
+
+  public void fullScreen(String renderer) {
+    if (!fullScreen ||
+        !renderer.equals(this.renderer)) {
+      if (insideSettings("fullScreen", renderer)) {
+        this.fullScreen = true;
+        this.renderer = renderer;
+      }
+    }
+  }
+
+
+  public void fullScreen(String renderer, int display) {
+    if (!fullScreen ||
+        !renderer.equals(this.renderer) /*||
+        display != this.display*/) {
+      if (insideSettings("fullScreen", renderer, display)) {
+        this.fullScreen = true;
+        this.renderer = renderer;
+//        this.display = display;
+      }
+    }
+  }
 
 
   /**
@@ -1477,12 +1580,24 @@ public void draw() {
    * previous renderer and simply resize it.
    */
   public void size(int iwidth, int iheight) {
-    size(iwidth, iheight, P2D, null);
+    if (iwidth != this.width || iheight != this.height) {
+      if (insideSettings("size", iwidth, iheight)) {
+        this.width = iwidth;
+        this.height = iheight;
+      }
+    }
   }
 
 
   public void size(int iwidth, int iheight, String irenderer) {
-    size(iwidth, iheight, irenderer, null);
+    if (iwidth != this.width || iheight != this.height ||
+        !this.renderer.equals(irenderer)) {
+      if (insideSettings("size", iwidth, iheight, irenderer)) {
+        this.width = iwidth;
+        this.height = iheight;
+        this.renderer = irenderer;
+      }
+    }
   }
 
 
@@ -1519,82 +1634,15 @@ public void renderer(String name) {
    */
   public void size(final int iwidth, final int iheight,
                    final String irenderer, final String ipath) {
-    System.out.println("This size() method is ignored on Android.");
-    System.out.println("See http://wiki.processing.org/w/Android for more information.");
-
-    /*
-//    Looper.prepare();
-    // Run this from the EDT, just cuz it's AWT stuff (or maybe later Swing)
-//    new Handler().post(new Runnable() {
-    handler.post(new Runnable() {
-      public void run() {
-        println("Handler is on thread " + Thread.currentThread().getName());
-//        // Set the preferred size so that the layout managers can handle it
-////        setPreferredSize(new Dimension(iwidth, iheight));
-////        setSize(iwidth, iheight);
-//        g.setSize(iwidth, iheight);
-//      }
-//    });
-
-    // ensure that this is an absolute path
-//    if (ipath != null) ipath = savePath(ipath);
-        // no path renderers supported yet
-
-    println("I'm the ole thread " + Thread.currentThread().getName());
-    String currentRenderer = g.getClass().getName();
-    if (currentRenderer.equals(irenderer)) {
-      println("resizing renderer inside size(....)");
-      // Avoid infinite loop of throwing exception to reset renderer
-      resizeRenderer(iwidth, iheight);
-      //redraw();  // will only be called insize draw()
-
-    } else {  // renderer is being changed
-      println("changing renderer inside size(....)");
-
-      // otherwise ok to fall through and create renderer below
-      // the renderer is changing, so need to create a new object
-//      g = makeGraphics(iwidth, iheight, irenderer, ipath, true);
-//      width = iwidth;
-//      height = iheight;
-//      if ()
-
-      // Remove the old view from the layout
-      layout.removeView(surfaceView);
-
-      if (irenderer.equals(A2D)) {
-        surfaceView = new SketchSurfaceView2D(PApplet.this, iwidth, iheight);
-      } else if (irenderer.equals(A3D)) {
-        surfaceView = new SketchSurfaceView3D(PApplet.this, iwidth, iheight);
+    if (iwidth != this.width || iheight != this.height ||
+        !this.renderer.equals(irenderer)) {
+      if (insideSettings("size", iwidth, iheight, irenderer, 
+          ipath)) {
+        this.width = iwidth;
+        this.height = iheight;
+        this.renderer = irenderer;
       }
-      g = ((SketchSurfaceView) surfaceView).getGraphics();
-
-      // these don't seem like a good idea
-//      width = screenWidth;
-//      height = screenHeight;
-
-//      println("getting window");
-//      Window window = getWindow();
-//      window.setContentView(surfaceView);  // set full screen
-//      layout.removeAllViews();
-      layout.addView(surfaceView);
-
-      // fire resize event to make sure the applet is the proper size
-//      setSize(iwidth, iheight);
-      // this is the function that will run if the user does their own
-      // size() command inside setup, so set defaultSize to false.
-//      defaultSize = false;
-
-      // throw an exception so that setup() is called again
-      // but with a properly sized render
-      // this is for opengl, which needs a valid, properly sized
-      // display before calling anything inside setup().
-//      throw new RendererChangeException();
-      println("interrupting animation thread");
-      thread.interrupt();
     }
-      }
-    });
-*/
   }
 
 

src/processing/mode/android/AndroidPreprocessor.java

@@ -204,7 +204,7 @@ protected int writeImports(final PrintWriter out,
     return 2 + super.writeImports(out, programImports, codeFolderImports);
   }
 
-
+/*
   protected void writeFooter(PrintWriter out, String className) {
     if (mode == Mode.STATIC) {
       // close off draw() definition
@@ -233,7 +233,7 @@ protected void writeFooter(PrintWriter out, String className) {
       out.println("}");
     }
   }
-
+*/
 
   // As of revision 0215 (2.0b7-ish), the default imports are now identical
   // between desktop and Android (to avoid unintended incompatibilities).