propane 3.4.2-java → 3.5.0-java

data/src/main/java/processing/awt/PSurfaceAWT.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -16,7 +18,8 @@
   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.awt;
 
 import java.awt.Canvas;
@@ -38,6 +41,7 @@ import java.awt.Toolkit;
 import java.awt.event.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.*;
+import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -46,7 +50,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.JFrame;
-import processing.core.ThinkDifferent;
 
 import processing.core.PApplet;
 import processing.core.PConstants;
@@ -56,12 +59,13 @@ import processing.core.PSurfaceNone;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
 
-public class PSurfaceAWT extends PSurfaceNone {
 
+public class PSurfaceAWT extends PSurfaceNone {
   GraphicsDevice displayDevice;
 
   // used for canvas to determine whether resizable or not
 //  boolean resizable;  // default is false
+
   // Internally, we know it's always a JFrame (not just a Frame)
 //  JFrame frame;
   // Trying Frame again with a11 to see if this avoids some Swing nastiness.
@@ -79,15 +83,18 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   // 3.0a5 didn't use strategy, and active was shut off during init() w/ retina
 //  boolean useStrategy = true;
+
   Canvas canvas;
 //  Component canvas;
 
 //  PGraphics graphics;  // moved to PSurfaceNone
+
   int sketchWidth;
   int sketchHeight;
 
   int windowScaleFactor;
 
+
   public PSurfaceAWT(PGraphics graphics) {
     //this.graphics = graphics;
     super(graphics);
@@ -113,7 +120,7 @@ public class PSurfaceAWT extends PSurfaceNone {
       // flicker--pushing pixels out before the screen has finished rendering.
 //      useStrategy = false;
     }
-     */
+    */
     canvas = new SmoothCanvas();
 //    if (useStrategy) {
     //canvas.setIgnoreRepaint(true);
@@ -129,8 +136,8 @@ public class PSurfaceAWT extends PSurfaceNone {
           // make sure this is a real resize event, not just initial setup
           // https://github.com/processing/processing/issues/3310
           Dimension canvasSize = canvas.getSize();
-          if (canvasSize.width != sketch.sketchWidth()
-            || canvasSize.height != sketch.sketchHeight()) {
+          if (canvasSize.width != sketch.sketchWidth() ||
+              canvasSize.height != sketch.sketchHeight()) {
             sketch.redraw();
           }
         }
@@ -139,6 +146,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     addListeners();
   }
 
+
 //  /**
 //   * Handle grabbing the focus on startup. Other renderers can override this
 //   * if handling needs to be different. For the AWT, the request is invoked
@@ -173,33 +181,41 @@ public class PSurfaceAWT extends PSurfaceNone {
 //      }
 //    });
 //  }
+
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-  public class SmoothCanvas extends Canvas {
 
+
+  public class SmoothCanvas extends Canvas {
     private Dimension oldSize = new Dimension(0, 0);
     private Dimension newSize = new Dimension(0, 0);
 
+
     // Turns out getParent() returns a JPanel on a JFrame. Yech.
     public Frame getFrame() {
       return frame;
     }
 
+
     @Override
     public Dimension getPreferredSize() {
       return new Dimension(sketchWidth, sketchHeight);
     }
 
+
     @Override
     public Dimension getMinimumSize() {
       return getPreferredSize();
     }
 
+
     @Override
     public Dimension getMaximumSize() {
       //return resizable ? super.getMaximumSize() : getPreferredSize();
       return frame.isResizable() ? super.getMaximumSize() : getPreferredSize();
     }
 
+
     @Override
     public void validate() {
       super.validate();
@@ -221,12 +237,14 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
 
+
     @Override
     public void update(Graphics g) {
 //      System.out.println("updating");
       paint(g);
     }
 
+
     @Override
     public void paint(Graphics screen) {
 //      System.out.println("painting");
@@ -237,7 +255,7 @@ public class PSurfaceAWT extends PSurfaceNone {
         System.out.println("drawing to screen " + canvas);
         screen.drawImage(graphics.image, 0, 0, sketchWidth, sketchHeight, null);
       }
-       */
+      */
 
 //      } else {
 ////        new Exception("painting").printStackTrace(System.out);
@@ -254,7 +272,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
-  /*
+    /*
     @Override
     public void addNotify() {
 //      System.out.println("adding notify");
@@ -262,10 +280,12 @@ public class PSurfaceAWT extends PSurfaceNone {
       // prior to Java 7 on OS X, this no longer works [121222]
 //    createBufferStrategy(2);
     }
-   */
+    */
+
+
   synchronized protected void render() {
-    if (canvas.isDisplayable()
-      && graphics.image != null) {
+    if (canvas.isDisplayable() &&
+        graphics.image != null) {
       if (canvas.getBufferStrategy() == null) {
         canvas.createBufferStrategy(2);
       }
@@ -335,7 +355,44 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
   }
-   */
+  */
+
+
+  /*
+  @Override
+  public int displayDensity() {
+    return shim.displayDensity();
+  }
+
+
+  @Override
+  public int displayDensity(int display) {
+    return shim.displayDensity(display);
+  }
+  */
+
+
+  @Override
+  public void selectInput(String prompt, String callback,
+                          File file, Object callbackObject) {
+    ShimAWT.selectInput(prompt, callback, file, callbackObject);
+  }
+
+
+  @Override
+  public void selectOutput(String prompt, String callback,
+                           File file, Object callbackObject) {
+    ShimAWT.selectOutput(prompt, callback, file, callbackObject);
+  }
+
+
+  @Override
+  public void selectFolder(String prompt, String callback,
+                           File file, Object callbackObject) {
+    ShimAWT.selectFolder(prompt, callback, file, callbackObject);
+  }
+
+
   // what needs to happen here?
   @Override
   public void initOffscreen(PApplet sketch) {
@@ -349,9 +406,9 @@ public class PSurfaceAWT extends PSurfaceNone {
     // but don't show it
     return dummy;
   }
-   */
+  */
 
- /*
+  /*
   @Override
   public Component initComponent(PApplet sketch) {
     this.sketch = sketch;
@@ -362,14 +419,16 @@ public class PSurfaceAWT extends PSurfaceNone {
 
     return canvas;
   }
-   */
+  */
+
+
   @Override
   public void initFrame(final PApplet sketch) {/*, int backgroundColor,
                         int deviceIndex, boolean fullScreen, boolean spanDisplays) {*/
     this.sketch = sketch;
 
-    GraphicsEnvironment environment
-      = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    GraphicsEnvironment environment =
+      GraphicsEnvironment.getLocalGraphicsEnvironment();
 
     int displayNum = sketch.sketchDisplay();
 //    System.out.println("display from sketch is " + displayNum);
@@ -378,10 +437,10 @@ public class PSurfaceAWT extends PSurfaceNone {
       if (displayNum <= devices.length) {
         displayDevice = devices[displayNum - 1];
       } else {
-        System.err.format("Display %d does not exist, "
-          + "using the default display instead.%n", displayNum);
+        System.err.format("Display %d does not exist, " +
+          "using the default display instead.%n", displayNum);
         for (int i = 0; i < devices.length; i++) {
-          System.err.format("Display %d is %s%n", (i + 1), devices[i]);
+          System.err.format("Display %d is %s%n", (i+1), devices[i]);
         }
       }
     }
@@ -393,8 +452,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     // because pack() will cause the bounds to go to zero.
     // http://dev.processing.org/bugs/show_bug.cgi?id=923
     boolean spanDisplays = sketch.sketchDisplay() == PConstants.SPAN;
-    screenRect = spanDisplays ? getDisplaySpan()
-      : displayDevice.getDefaultConfiguration().getBounds();
+    screenRect = spanDisplays ? getDisplaySpan() :
+      displayDevice.getDefaultConfiguration().getBounds();
     // DisplayMode doesn't work here, because we can't get the upper-left
     // corner of the display, which is important for multi-display setups.
 
@@ -403,8 +462,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     sketch.displayWidth = screenRect.width;
     sketch.displayHeight = screenRect.height;
 
-    windowScaleFactor = PApplet.platform == PConstants.MACOSX
-      ? 1 : sketch.pixelDensity;
+    windowScaleFactor = PApplet.platform == PConstants.MACOS ?
+        1 : sketch.pixelDensity;
 
     sketchWidth = sketch.sketchWidth() * windowScaleFactor;
     sketchHeight = sketch.sketchHeight() * windowScaleFactor;
@@ -422,7 +481,7 @@ public class PSurfaceAWT extends PSurfaceNone {
       fullScreen = true;
       sketch.fullScreen();  // won't change the renderer
     }
-     */
+    */
 
     if (fullScreen || spanDisplays) {
       sketchWidth = screenRect.width;
@@ -462,6 +521,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     // and launches the Thread that will kick off setup().
     // http://dev.processing.org/bugs/show_bug.cgi?id=891
     // http://dev.processing.org/bugs/show_bug.cgi?id=908
+
     frame.add(canvas);
     setSize(sketchWidth / windowScaleFactor, sketchHeight / windowScaleFactor);
 
@@ -488,7 +548,7 @@ public class PSurfaceAWT extends PSurfaceNone {
       // will be set visible in placeWindow() [3.0a10]
       //frame.setVisible(true);  // re-add native resources
     }
-     */
+    */
     frame.setLayout(null);
     //frame.add(applet);
 
@@ -497,7 +557,9 @@ public class PSurfaceAWT extends PSurfaceNone {
     // spanScreens was in use.
 //    pg = sketch.makePrimaryGraphics(sketchWidth, sketchHeight);
 //    pg = sketch.makePrimaryGraphics();
+
     // resize sketch to sketchWidth/sketchHeight here
+
     if (fullScreen) {
       frame.invalidate();
     } else {
@@ -506,6 +568,7 @@ public class PSurfaceAWT extends PSurfaceNone {
 
     // insufficient, places the 100x100 sketches offset strangely
     //frame.validate();
+
     // disabling resize has to happen after pack() to avoid apparent Apple bug
     // http://code.google.com/p/processing/issues/detail?id=467
     frame.setResizable(false);
@@ -520,37 +583,34 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    sketch.setFrame(frame);
   }
 
+
   @Override
   public Object getNative() {
     return canvas;
   }
 
+
 //  public Toolkit getToolkit() {
 //    return canvas.getToolkit();
 //  }
-  /**
-   * Set the window (and dock, or whatever necessary) title.
-   *
-   * @param title
-   */
+
+
+  /** Set the window (and dock, or whatever necessary) title. */
   @Override
   public void setTitle(String title) {
     frame.setTitle(title);
     // Workaround for apparent Java bug on OS X?
     // https://github.com/processing/processing/issues/3472
-    if (cursorVisible
-      && (PApplet.platform == PConstants.MACOSX)
-      && (cursorType != PConstants.ARROW)) {
+    if (cursorVisible &&
+        (PApplet.platform == PConstants.MACOS) &&
+        (cursorType != PConstants.ARROW)) {
       hideCursor();
       showCursor();
     }
   }
 
-  /**
-   * Set true if we want to resize things (default is not resizable)
-   *
-   * @param resizable
-   */
+
+  /** Set true if we want to resize things (default is not resizable) */
   @Override
   public void setResizable(boolean resizable) {
     //this.resizable = resizable;  // really only used for canvas
@@ -560,80 +620,103 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
+
   @Override
   public void setIcon(PImage image) {
     Image awtImage = (Image) image.getNative();
-    ThinkDifferent.init(sketch);
-    ThinkDifferent.setIconImage(awtImage);
+
+    if (PApplet.platform != PConstants.MACOS) {
+      frame.setIconImage(awtImage);
+
+    } else {
+      try {
+        final String td = "processing.core.ThinkDifferent";
+        Class<?> thinkDifferent =
+          Thread.currentThread().getContextClassLoader().loadClass(td);
+        Method method =
+          thinkDifferent.getMethod("setIconImage", Image.class);
+        method.invoke(null, awtImage);
+      } catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException | NoSuchMethodException | SecurityException | InvocationTargetException e) {
+        // That's unfortunate
+        
+      }
+    }
   }
 
+
   @Override
   public void setAlwaysOnTop(boolean always) {
     frame.setAlwaysOnTop(always);
   }
 
+
   @Override
   public void setLocation(int x, int y) {
     frame.setLocation(x, y);
   }
 
+
   List<Image> iconImages;
 
   protected void setProcessingIcon(Frame frame) {
     // On OS X, this only affects what shows up in the dock when minimized.
     // So replacing it is actually a step backwards. Brilliant.
-    if (PApplet.platform != PConstants.MACOSX) {
+    if (PApplet.platform != PConstants.MACOS) {
       //Image image = Toolkit.getDefaultToolkit().createImage(ICON_IMAGE);
       //frame.setIconImage(image);
-      // try {
-      if (iconImages == null) {
-        iconImages = new ArrayList<>();
-        final int[] sizes = {16, 32, 48, 64, 128, 256, 512};
-
-        for (int sz : sizes) {
-          //URL url = getClass().getResource("/icon/icon-" + sz + ".png");
-          URL url = PApplet.class.getResource("/icon/icon-" + sz + ".png");
-          Image image = Toolkit.getDefaultToolkit().getImage(url);
-          iconImages.add(image);
-          //iconImages.add(Toolkit.getLibImage("icons/pde-" + sz + ".png", frame));
+      try {
+        if (iconImages == null) {
+          iconImages = new ArrayList<>();
+          final int[] sizes = { 16, 32, 48, 64, 128, 256, 512 };
+
+          for (int sz : sizes) {
+            //URL url = getClass().getResource("/icon/icon-" + sz + ".png");
+            URL url = PApplet.class.getResource("/icon/icon-" + sz + ".png");
+            Image image = Toolkit.getDefaultToolkit().getImage(url);
+            iconImages.add(image);
+            //iconImages.add(Toolkit.getLibImage("icons/pde-" + sz + ".png", frame));
+          }
         }
-      }
-      frame.setIconImages(iconImages);
+        frame.setIconImages(iconImages);
+
+      } catch (Exception e) { }  // harmless; keep this to ourselves
 
-//            } catch (Exception e) {
-//            }  // harmless; keep this to ourselves
     } else {  // handle OS X differently
       if (!dockIconSpecified()) {  // don't override existing -Xdock param
         // On OS X, set this for AWT surfaces, which handles the dock image
         // as well as the cmd-tab image that's shown. Just one size, I guess.
         URL url = PApplet.class.getResource("/icon/icon-512.png");
         // Seems dangerous to have this in code instead of using reflection, no?
-        // ThinkDifferent.setIconImage(Toolkit.getDefaultToolkit().getImage(url));
+        //ThinkDifferent.setIconImage(Toolkit.getDefaultToolkit().getImage(url));
         try {
           final String td = "processing.core.ThinkDifferent";
-          Class<?> thinkDifferent
-            = Thread.currentThread().getContextClassLoader().loadClass(td);
-          Method method
-            = thinkDifferent.getMethod("setIconImage", new Class[]{java.awt.Image.class});
-          method.invoke(null, new Object[]{Toolkit.getDefaultToolkit().getImage(url)});
+          Class<?> thinkDifferent =
+            Thread.currentThread().getContextClassLoader().loadClass(td);
+          Method method =
+            thinkDifferent.getMethod("setIconImage", Image.class);
+          method.invoke(null, Toolkit.getDefaultToolkit().getImage(url));
         } catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException | NoSuchMethodException | SecurityException | InvocationTargetException e) {
           // That's unfortunate
+          
         }
       }
     }
   }
 
+
   /**
    * @return true if -Xdock:icon was specified on the command line
    */
   private boolean dockIconSpecified() {
     // TODO This is incomplete... Haven't yet found a way to figure out if
     //      the app has an icns file specified already. Help?
-    List<String> jvmArgs
-      = ManagementFactory.getRuntimeMXBean().getInputArguments();
-    return (jvmArgs.stream().anyMatch((arg) -> (arg.startsWith("-Xdock:icon"))));
+    List<String> jvmArgs =
+      ManagementFactory.getRuntimeMXBean().getInputArguments();
+    // dock image already set
+    return jvmArgs.stream().anyMatch((arg) -> (arg.startsWith("-Xdock:icon")));
   }
 
+
   @Override
   public void setVisible(boolean visible) {
     frame.setVisible(visible);
@@ -659,9 +742,10 @@ public class PSurfaceAWT extends PSurfaceNone {
                       insets.top + insets.bottom);
       }
     }
-     */
+*/
   }
 
+
   //public void placeFullScreen(boolean hideStop) {
   @Override
   public void placePresent(int stopColor) {
@@ -670,13 +754,14 @@ public class PSurfaceAWT extends PSurfaceNone {
     // After the pack(), the screen bounds are gonna be 0s
 //    frame.setBounds(screenRect);  // already called in setFullFrame()
     canvas.setBounds((screenRect.width - sketchWidth) / 2,
-      (screenRect.height - sketchHeight) / 2,
-      sketchWidth, sketchHeight);
+                     (screenRect.height - sketchHeight) / 2,
+                     sketchWidth, sketchHeight);
 
 //    if (PApplet.platform == PConstants.MACOSX) {
 //      macosxFullScreenEnable(frame);
 //      macosxFullScreenToggle(frame);
 //    }
+
     if (stopColor != 0) {
       Label label = new Label("stop");
       label.setForeground(new Color(stopColor, false));
@@ -746,21 +831,22 @@ public class PSurfaceAWT extends PSurfaceNone {
       frame.setVisible(true);
     }
   }
-   */
+  */
+
+
   private void setCanvasSize() {
 //    System.out.format("setting canvas size %d %d%n", sketchWidth, sketchHeight);
 //    new Exception().printStackTrace(System.out);
     int contentW = Math.max(sketchWidth, MIN_WINDOW_WIDTH);
     int contentH = Math.max(sketchHeight, MIN_WINDOW_HEIGHT);
 
-    canvas.setBounds((contentW - sketchWidth) / 2,
-      (contentH - sketchHeight) / 2,
-      sketchWidth, sketchHeight);
+    canvas.setBounds((contentW - sketchWidth)/2,
+                     (contentH - sketchHeight)/2,
+                     sketchWidth, sketchHeight);
   }
 
-  /**
-   * Resize frame for these sketch (canvas) dimensions.
-   */
+
+  /** Resize frame for these sketch (canvas) dimensions. */
   private Dimension setFrameSize() {  //int sketchWidth, int sketchHeight) {
     // https://github.com/processing/processing/pull/3162
     frame.addNotify();  // using instead of show() to add the peer [fry]
@@ -768,24 +854,24 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    System.out.format("setting frame size %d %d %n", sketchWidth, sketchHeight);
 //    new Exception().printStackTrace(System.out);
     currentInsets = frame.getInsets();
-    int windowW = Math.max(sketchWidth, MIN_WINDOW_WIDTH)
-      + currentInsets.left + currentInsets.right;
-    int windowH = Math.max(sketchHeight, MIN_WINDOW_HEIGHT)
-      + currentInsets.top + currentInsets.bottom;
+    int windowW = Math.max(sketchWidth, MIN_WINDOW_WIDTH) +
+      currentInsets.left + currentInsets.right;
+    int windowH = Math.max(sketchHeight, MIN_WINDOW_HEIGHT) +
+      currentInsets.top + currentInsets.bottom;
     frame.setSize(windowW, windowH);
     return new Dimension(windowW, windowH);
   }
 
+
   private void setFrameCentered() {
     // Can't use frame.setLocationRelativeTo(null) because it sends the
     // frame to the main display, which undermines the --display setting.
     frame.setLocation(screenRect.x + (screenRect.width - sketchWidth) / 2,
-      screenRect.y + (screenRect.height - sketchHeight) / 2);
+                      screenRect.y + (screenRect.height - sketchHeight) / 2);
   }
 
-  /**
-   * Hide the menu bar, make the Frame undecorated, set it to screenRect.
-   */
+
+  /** Hide the menu bar, make the Frame undecorated, set it to screenRect. */
   private void setFullFrame() {
     // Called here because the graphics device is needed before we can
     // determine whether the sketch wants size(displayWidth, displayHeight),
@@ -795,6 +881,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     // Tried to use this to fix the 'present' mode issue.
     // Did not help, and the screenRect setup seems to work fine.
     //frame.setExtendedState(Frame.MAXIMIZED_BOTH);
+
     // https://github.com/processing/processing/pull/3162
     //frame.dispose();  // release native resources, allows setUndecorated()
     frame.removeNotify();
@@ -807,6 +894,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     //frame.setVisible(true);  // re-add native resources
   }
 
+
   @Override
   public void placeWindow(int[] location, int[] editorLocation) {
     //Dimension window = setFrameSize(sketchWidth, sketchHeight);
@@ -850,7 +938,7 @@ public class PSurfaceAWT extends PSurfaceNone {
             locationX = (sketch.displayWidth - window.width) / 2;
             locationY = (sketch.displayHeight - window.height) / 2;
           }
-           */
+          */
           frame.setLocation(locationX, locationY);
         }
       } else {  // just center on screen
@@ -864,9 +952,9 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
 
-    canvas.setBounds((contentW - sketchWidth) / 2,
-      (contentH - sketchHeight) / 2,
-      sketchWidth, sketchHeight);
+    canvas.setBounds((contentW - sketchWidth)/2,
+                     (contentH - sketchHeight)/2,
+                     sketchWidth, sketchHeight);
 
     // handle frame resizing events
     setupFrameResizeListener();
@@ -882,12 +970,13 @@ public class PSurfaceAWT extends PSurfaceNone {
 //        canvas.requestFocus();
 //      }
     }
-     */
+    */
 //    if (sketch.getGraphics().displayable()) {
 //      setVisible(true);
 //    }
   }
 
+
   // needs to resize the frame, which will resize the canvas, and so on...
   @Override
   public void setSize(int wide, int high) {
@@ -905,9 +994,10 @@ public class PSurfaceAWT extends PSurfaceNone {
 //      //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
-      && (frame == null || currentInsets.equals(frame.getInsets()))) {
+    if (wide == sketch.width && high == sketch.height &&
+        (frame == null || currentInsets.equals(frame.getInsets()))) {
 //      if (PApplet.DEBUG) {
 //        new Exception("w/h unchanged " + wide + " " + high).printStackTrace(System.out);
 //      }
@@ -928,6 +1018,7 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    }
 
     //initImage(graphics, wide, high);
+
     //throw new RuntimeException("implement me, see readme.md");
     sketch.setSize(wide, high);
 //    sketch.width = wide;
@@ -938,6 +1029,7 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    System.out.println("out of setSize()");
   }
 
+
   //public void initImage(PGraphics gr, int wide, int high) {
   /*
   @Override
@@ -956,14 +1048,20 @@ public class PSurfaceAWT extends PSurfaceNone {
     int high = graphics.height * graphics.pixelFactor;
     graphics.image = gc.createCompatibleImage(wide, high);
   }
-   */
+  */
+
+
 //  @Override
 //  public Component getComponent() {
 //    return canvas;
 //  }
+
+
 //  @Override
 //  public void setSmooth(int level) {
 //  }
+
+
   /*
   private boolean checkRetina() {
     if (PApplet.platform == PConstants.MACOSX) {
@@ -990,14 +1088,14 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
     return false;
   }
-   */
-  /**
-   * Get the bounds rectangle for all displays.
-   */
+  */
+
+
+  /** Get the bounds rectangle for all displays. */
   static Rectangle getDisplaySpan() {
     Rectangle bounds = new Rectangle();
-    GraphicsEnvironment environment
-      = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    GraphicsEnvironment environment =
+      GraphicsEnvironment.getLocalGraphicsEnvironment();
     for (GraphicsDevice device : environment.getScreenDevices()) {
       for (GraphicsConfiguration config : device.getConfigurations()) {
         Rectangle2D.union(bounds, config.getBounds(), bounds);
@@ -1021,13 +1119,15 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
   }
-   */
+  */
+
+
   /**
    * Set this sketch to communicate its state back to the PDE.
    * 
-   * This uses the stderr stream to write positions of the window (so that it
-   * will be saved by the PDE for the next run) and notify on quit. See more
-   * notes in the Worker class.
+   * This uses the stderr stream to write positions of the window
+   * (so that it will be saved by the PDE for the next run) and
+   * notify on quit. See more notes in the Worker class.
    */
   @Override
   public void setupExternalMessages() {
@@ -1040,9 +1140,10 @@ public class PSurfaceAWT extends PSurfaceNone {
     });
   }
 
+
   /**
-   * Set up a listener that will fire proper component resize events in cases
-   * where frame.setResizable(true) is called.
+   * Set up a listener that will fire proper component resize events
+   * in cases where frame.setResizable(true) is called.
    */
   private void setupFrameResizeListener() {
     frame.addWindowStateListener((WindowEvent e) -> {
@@ -1097,6 +1198,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     });
   }
 
+
 //  /**
 //   * (No longer in use) Use reflection to call
 //   * <code>com.apple.eawt.FullScreenUtilities.setWindowCanFullScreen(window, true);</code>
@@ -1111,7 +1213,7 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    } catch (ClassNotFoundException cnfe) {
 //      // ignored
 //    } catch (Exception e) {
-//      e.printStackTrace();
+//
 //    }
 //  }
 //
@@ -1134,10 +1236,14 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    } catch (ClassNotFoundException cnfe) {
 //      // ignored
 //    } catch (Exception e) {
-//      e.printStackTrace();
+//
 //    }
 //  }
+
+
   //////////////////////////////////////////////////////////////
+
+
   /*
   // disabling for now; requires Java 1.7 and "precise" semantics are odd...
   // returns 0.1 for tick-by-tick scrolling on OS X, but it's not a matter of
@@ -1151,13 +1257,13 @@ public class PSurfaceAWT extends PSurfaceNone {
       // ignored, the method will just be set to null
     }
   }
-   */
+  */
+
+
   /**
-   * Figure out how to process a mouse event.When loop() has been called, the
-   * events will be queued up until drawing is complete. If noLoop() has been
-   * called, then events will happen immediately.
-   *
-   * @param nativeEvent
+   * Figure out how to process a mouse event. When loop() has been
+   * called, the events will be queued up until drawing is complete.
+   * If noLoop() has been called, then events will happen immediately.
    */
   protected void nativeMouseEvent(java.awt.event.MouseEvent nativeEvent) {
     // the 'amount' is the number of button clicks for a click event,
@@ -1166,31 +1272,31 @@ public class PSurfaceAWT extends PSurfaceNone {
 
     int peAction = 0;
     switch (nativeEvent.getID()) {
-      case java.awt.event.MouseEvent.MOUSE_PRESSED:
-        peAction = MouseEvent.PRESS;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_RELEASED:
-        peAction = MouseEvent.RELEASE;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_CLICKED:
-        peAction = MouseEvent.CLICK;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_DRAGGED:
-        peAction = MouseEvent.DRAG;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_MOVED:
-        peAction = MouseEvent.MOVE;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_ENTERED:
-        peAction = MouseEvent.ENTER;
-        break;
-      case java.awt.event.MouseEvent.MOUSE_EXITED:
-        peAction = MouseEvent.EXIT;
-        break;
-      //case java.awt.event.MouseWheelEvent.WHEEL_UNIT_SCROLL:
-      case java.awt.event.MouseEvent.MOUSE_WHEEL:
-        peAction = MouseEvent.WHEEL;
-        /*
+    case java.awt.event.MouseEvent.MOUSE_PRESSED:
+      peAction = MouseEvent.PRESS;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_RELEASED:
+      peAction = MouseEvent.RELEASE;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_CLICKED:
+      peAction = MouseEvent.CLICK;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_DRAGGED:
+      peAction = MouseEvent.DRAG;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_MOVED:
+      peAction = MouseEvent.MOVE;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_ENTERED:
+      peAction = MouseEvent.ENTER;
+      break;
+    case java.awt.event.MouseEvent.MOUSE_EXITED:
+      peAction = MouseEvent.EXIT;
+      break;
+    //case java.awt.event.MouseWheelEvent.WHEEL_UNIT_SCROLL:
+    case java.awt.event.MouseEvent.MOUSE_WHEEL:
+      peAction = MouseEvent.WHEEL;
+      /*
       if (preciseWheelMethod != null) {
         try {
           peAmount = ((Double) preciseWheelMethod.invoke(nativeEvent, (Object[]) null)).floatValue();
@@ -1198,95 +1304,71 @@ public class PSurfaceAWT extends PSurfaceNone {
           preciseWheelMethod = null;
         }
       }
-         */
-        peCount = ((MouseWheelEvent) nativeEvent).getWheelRotation();
-        break;
+      */
+      peCount = ((MouseWheelEvent) nativeEvent).getWheelRotation();
+      break;
     }
 
-    //System.out.println(nativeEvent);
-    //int modifiers = nativeEvent.getModifiersEx();
-    // If using getModifiersEx(), the regular modifiers don't set properly.
-    int modifiers = nativeEvent.getModifiers();
-
-    int peModifiers = modifiers
-      & (InputEvent.SHIFT_MASK
-      | InputEvent.CTRL_MASK
-      | InputEvent.META_MASK
-      | InputEvent.ALT_MASK);
-
-    // Windows and OS X seem to disagree on how to handle this. Windows only
-    // sets BUTTON1_DOWN_MASK, while OS X seems to set BUTTON1_MASK.
-    // This is an issue in particular with mouse release events:
+    // Switching to getModifiersEx() for 4.0a2 because of Java 9 deprecation.
+    // Had trouble with this in the past and rolled it back because it was
+    // optional at the time. This time around, just need to iron out the issue.
     // http://code.google.com/p/processing/issues/detail?id=1294
-    // The fix for which led to a regression (fixed here by checking both):
     // http://code.google.com/p/processing/issues/detail?id=1332
+    int modifiers = nativeEvent.getModifiersEx();
+
     int peButton = 0;
-//    if ((modifiers & InputEvent.BUTTON1_MASK) != 0 ||
-//        (modifiers & InputEvent.BUTTON1_DOWN_MASK) != 0) {
-//      peButton = LEFT;
-//    } else if ((modifiers & InputEvent.BUTTON2_MASK) != 0 ||
-//               (modifiers & InputEvent.BUTTON2_DOWN_MASK) != 0) {
-//      peButton = CENTER;
-//    } else if ((modifiers & InputEvent.BUTTON3_MASK) != 0 ||
-//               (modifiers & InputEvent.BUTTON3_DOWN_MASK) != 0) {
-//      peButton = RIGHT;
-//    }
-    if ((modifiers & InputEvent.BUTTON1_MASK) != 0) {
+    if ((modifiers & InputEvent.BUTTON1_DOWN_MASK) != 0) {
       peButton = PConstants.LEFT;
-    } else if ((modifiers & InputEvent.BUTTON2_MASK) != 0) {
+    } else if ((modifiers & InputEvent.BUTTON2_DOWN_MASK) != 0) {
       peButton = PConstants.CENTER;
-    } else if ((modifiers & InputEvent.BUTTON3_MASK) != 0) {
+    } else if ((modifiers & InputEvent.BUTTON3_DOWN_MASK) != 0) {
       peButton = PConstants.RIGHT;
     }
 
-    // If running on Mac OS, allow ctrl-click as right mouse. Prior to 0215,
-    // this used isPopupTrigger() on the native event, but that doesn't work
-    // for mouseClicked and mouseReleased (or others).
-    if (PApplet.platform == PConstants.MACOSX) {
-      //if (nativeEvent.isPopupTrigger()) {
-      if ((modifiers & InputEvent.CTRL_MASK) != 0) {
-        peButton = PConstants.RIGHT;
-      }
-    }
-
     sketch.postEvent(new MouseEvent(nativeEvent, nativeEvent.getWhen(),
-      peAction, peModifiers,
-      nativeEvent.getX() / windowScaleFactor,
-      nativeEvent.getY() / windowScaleFactor,
-      peButton,
-      peCount));
+                                    peAction, modifiers,
+                                    nativeEvent.getX() / windowScaleFactor,
+                                    nativeEvent.getY() / windowScaleFactor,
+                                    peButton,
+                                    peCount));
   }
 
+
   protected void nativeKeyEvent(java.awt.event.KeyEvent event) {
     int peAction = 0;
     switch (event.getID()) {
-      case java.awt.event.KeyEvent.KEY_PRESSED:
-        peAction = KeyEvent.PRESS;
-        break;
-      case java.awt.event.KeyEvent.KEY_RELEASED:
-        peAction = KeyEvent.RELEASE;
-        break;
-      case java.awt.event.KeyEvent.KEY_TYPED:
-        peAction = KeyEvent.TYPE;
-        break;
+    case java.awt.event.KeyEvent.KEY_PRESSED:
+      peAction = KeyEvent.PRESS;
+      break;
+    case java.awt.event.KeyEvent.KEY_RELEASED:
+      peAction = KeyEvent.RELEASE;
+      break;
+    case java.awt.event.KeyEvent.KEY_TYPED:
+      peAction = KeyEvent.TYPE;
+      break;
     }
 
+    int modifiers = event.getModifiersEx();
+
+    /*
 //    int peModifiers = event.getModifiersEx() &
 //      (InputEvent.SHIFT_DOWN_MASK |
 //       InputEvent.CTRL_DOWN_MASK |
 //       InputEvent.META_DOWN_MASK |
 //       InputEvent.ALT_DOWN_MASK);
-    int peModifiers = event.getModifiers()
-      & (InputEvent.SHIFT_MASK
-      | InputEvent.CTRL_MASK
-      | InputEvent.META_MASK
-      | InputEvent.ALT_MASK);
+    int peModifiers = event.getModifiers() &
+      (InputEvent.SHIFT_MASK |
+       InputEvent.CTRL_MASK |
+       InputEvent.META_MASK |
+       InputEvent.ALT_MASK);
+     */
 
     sketch.postEvent(new KeyEvent(event, event.getWhen(),
-      peAction, peModifiers,
-      event.getKeyChar(), event.getKeyCode()));
+                                  peAction, modifiers,
+                                  event.getKeyChar(), event.getKeyCode()));
   }
 
+
   // listeners, for all my men!
   protected void addListeners() {
 
@@ -1325,6 +1407,7 @@ public class PSurfaceAWT extends PSurfaceNone {
         nativeMouseEvent(e);
       }
 
+      @Override
       public void mouseMoved(java.awt.event.MouseEvent e) {
         nativeMouseEvent(e);
       }
@@ -1341,11 +1424,13 @@ public class PSurfaceAWT extends PSurfaceNone {
         nativeKeyEvent(e);
       }
 
+
       @Override
       public void keyReleased(java.awt.event.KeyEvent e) {
         nativeKeyEvent(e);
       }
 
+
       @Override
       public void keyTyped(java.awt.event.KeyEvent e) {
         nativeKeyEvent(e);
@@ -1386,7 +1471,9 @@ public class PSurfaceAWT extends PSurfaceNone {
     comp.removeKeyListener(this);
     comp.removeFocusListener(this);
   }
-   */
+  */
+
+
 //  /**
 //   * Call to remove, then add, listeners to a component.
 //   * Avoids issues with double-adding.
@@ -1395,16 +1482,22 @@ public class PSurfaceAWT extends PSurfaceNone {
 //    removeListeners(comp);
 //    addListeners(comp);
 //  }
+
+
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
   int cursorType = PConstants.ARROW;
   boolean cursorVisible = true;
   Cursor invisibleCursor;
 
+
   @Override
   public void setCursor(int kind) {
     // Swap the HAND cursor because MOVE doesn't seem to be available on OS X
     // https://github.com/processing/processing/issues/2358
-    if (PApplet.platform == PConstants.MACOSX && kind == PConstants.MOVE) {
+    if (PApplet.platform == PConstants.MACOS && kind == PConstants.MOVE) {
       kind = PConstants.HAND;
     }
     canvas.setCursor(Cursor.getPredefinedCursor(kind));
@@ -1412,6 +1505,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     this.cursorType = kind;
   }
 
+
   @Override
   public void setCursor(PImage img, int x, int y) {
     // Don't set cursorType, instead use cursorType to save the last
@@ -1424,14 +1518,15 @@ public class PSurfaceAWT extends PSurfaceNone {
       return;
     }
 
-    Cursor cursor
-      = canvas.getToolkit().createCustomCursor((Image) img.getNative(),
-        new Point(x, y),
-        "custom");
+    Cursor cursor =
+      canvas.getToolkit().createCustomCursor((Image) img.getNative(),
+                                             new Point(x, y),
+                                             "custom");
     canvas.setCursor(cursor);
     cursorVisible = true;
   }
 
+
   @Override
   public void showCursor() {
     // Maybe should always set here? Seems dangerous, since it's likely that
@@ -1443,27 +1538,29 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
+
   @Override
   public void hideCursor() {
     // Because the OS may have shown the cursor on its own,
     // don't return if 'cursorVisible' is set to true. [rev 0216]
 
     if (invisibleCursor == null) {
-      BufferedImage cursorImg
-        = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+      BufferedImage cursorImg =
+        new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
       // this is a temporary workaround for the CHIP, will be removed
       Dimension cursorSize = Toolkit.getDefaultToolkit().getBestCursorSize(16, 16);
       if (cursorSize.width == 0 || cursorSize.height == 0) {
         invisibleCursor = Cursor.getDefaultCursor();
       } else {
-        invisibleCursor
-          = canvas.getToolkit().createCustomCursor(cursorImg, new Point(8, 8), "blank");
+        invisibleCursor =
+          canvas.getToolkit().createCustomCursor(cursorImg, new Point(8, 8), "blank");
       }
     }
     canvas.setCursor(invisibleCursor);
     cursorVisible = false;
   }
 
+
   @Override
   public Thread createThread() {
     return new AnimationThread() {
@@ -1475,7 +1572,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     };
   }
 
-  void debug(String format, Object... args) {
+
+  void debug(String format, Object ... args) {
     System.out.format(format + "%n", args);
   }
 }