@@ -68,7 +68,7 @@ public void initFrame(PApplet sketch, int backgroundColor,
 
   //
 
-  public void placeWindow(int[] location);
+//  public void placeWindow(int[] location);
 
   public void placeWindow(int[] location, int[] editorLocation);
 
 
@@ -596,6 +596,7 @@ public void mousePressed(java.awt.event.MouseEvent e) {
   }
 
 
+  /*
   @Override
   public void placeWindow(int[] location) {
     setFrameSize(); //sketchWidth, sketchHeight);
@@ -639,6 +640,7 @@ public void windowClosing(WindowEvent e) {
       frame.setVisible(true);
     }
   }
+  */
 
 
   private void setCanvasSize() {
 
@@ -256,6 +256,7 @@ public void start(final Stage stage) {
   */
 
 
+  /*
   @Override
   public void placeWindow(int[] location) {
     //setFrameSize();
@@ -296,11 +297,68 @@ public void placeWindow(int[] location) {
       setVisible(true);
     }
   }
+  */
 
 
+  @Override
   public void placeWindow(int[] location, int[] editorLocation) {
-    // TODO Auto-generated method stub
+    //Dimension window = setFrameSize();
+
+//    int contentW = Math.max(sketchWidth, MIN_WINDOW_WIDTH);
+//    int contentH = Math.max(sketchHeight, MIN_WINDOW_HEIGHT);
+
+    if (location != null) {
+      // a specific location was received from the Runner
+      // (applet has been run more than once, user placed window)
+      stage.setX(location[0]);
+      stage.setY(location[1]);
 
+    } else if (editorLocation != null) {
+      int locationX = editorLocation[0] - 20;
+      int locationY = editorLocation[1];
+
+      if (locationX - stage.getWidth() > 10) {
+        // if it fits to the left of the window
+        stage.setX(locationX - stage.getWidth());
+        stage.setY(locationY);
+
+      } else {  // doesn't fit
+        // if it fits inside the editor window,
+        // offset slightly from upper lefthand corner
+        // so that it's plunked inside the text area
+        locationX = editorLocation[0] + 66;
+        locationY = editorLocation[1] + 66;
+
+        if ((locationX + stage.getWidth() > sketch.displayWidth - 33) ||
+            (locationY + stage.getHeight() > sketch.displayHeight - 33)) {
+          // otherwise center on screen
+          locationX = (int) ((sketch.displayWidth - stage.getWidth()) / 2);
+          locationY = (int) ((sketch.displayHeight - stage.getHeight()) / 2);
+        }
+        stage.setX(locationX);
+        stage.setY(locationY);
+      }
+    } else {  // just center on screen
+      //setFrameCentered();
+    }
+    if (stage.getY() < 0) {
+      // Windows actually allows you to place frames where they can't be
+      // closed. Awesome. http://dev.processing.org/bugs/show_bug.cgi?id=1508
+      //frame.setLocation(frameLoc.x, 30);
+      stage.setY(30);
+    }
+
+    //canvas.setBounds((contentW - sketchWidth)/2,
+    //                 (contentH - sketchHeight)/2,
+    //                 sketchWidth, sketchHeight);
+
+    // handle frame resizing events
+    //setupFrameResizeListener();
+
+    // TODO this is much too late... why even create the enormous frame for PDF?
+    if (sketch.getGraphics().displayable()) {
+      setVisible(true);
+    }
   }
 
 
 
@@ -80,12 +80,17 @@ public void setResizable(boolean resizable) {
   }
 
 
-  public void placeWindow(int[] location) { }
+//  public void placeWindow(int[] location) { }
 
+  @Override
   public void placeWindow(int[] location, int[] editorLocation) { }
 
+
+  @Override
   public void placePresent(int stopColor) { }
 
+
+  @Override
   public void setupExternalMessages() { }
 
 
 
@@ -307,9 +307,9 @@ public void setResizable(boolean resizable) {
   }
 
 
+  /*
   @Override
   public void placeWindow(int[] location) {
-    /*
     if (location != null) {
       // a specific location was received from the Runner
       // (applet has been run more than once, user placed window)
@@ -325,8 +325,8 @@ public void placeWindow(int[] location) {
       // closed. Awesome. http://dev.processing.org/bugs/show_bug.cgi?id=1508
       Display.setLocation(Display.getX(), 30);
     }
-    */
   }
+  */
 
 
   @Override
Original file line number	Diff line number	Diff line change
@@ -596,6 +596,7 @@ public void mousePressed(java.awt.event.MouseEvent e) {
596	596	}
597	597
598	598
	599	+ /*
599	600	@Override
600	601	public void placeWindow(int[] location) {
601	602	setFrameSize(); //sketchWidth, sketchHeight);
@@ -639,6 +640,7 @@ public void windowClosing(WindowEvent e) {
639	640	frame.setVisible(true);
640	641	}
641	642	}
	643	+ */
642	644
643	645
644	646	private void setCanvasSize() {
Original file line number	Diff line number	Diff line change
@@ -307,9 +307,9 @@ public void setResizable(boolean resizable) {
307	307	}
308	308
309	309
	310	+ /*
310	311	@Override
311	312	public void placeWindow(int[] location) {
312		- /*
313	313	if (location != null) {
314	314	// a specific location was received from the Runner
315	315	// (applet has been run more than once, user placed window)
@@ -325,8 +325,8 @@ public void placeWindow(int[] location) {
325	325	// closed. Awesome. http://dev.processing.org/bugs/show_bug.cgi?id=1508
326	326	Display.setLocation(Display.getX(), 30);
327	327	}
328		- */
329	328	}
	329	+ */
330	330
331	331
332	332	@Override