propane 3.4.1-java → 3.7.1-java

data/src/main/java/processing/opengl/PSurfaceJOGL.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -18,10 +20,14 @@
   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.opengl;
 
 import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.FileDialog;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Point;
@@ -58,7 +64,6 @@ import com.jogamp.newt.Display.PointerIcon;
 import com.jogamp.newt.NewtFactory;
 import com.jogamp.newt.Screen;
 import com.jogamp.newt.awt.NewtCanvasAWT;
-import com.jogamp.newt.event.InputEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.FPSAnimator;
 
@@ -69,179 +74,264 @@ import processing.core.PImage;
 import processing.core.PSurface;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
+import processing.awt.PImageAWT;
+
+// have this removed by 4.0 final
+import processing.awt.ShimAWT;
+
 
 public class PSurfaceJOGL implements PSurface {
+  /** Selected GL profile */
+  public static GLProfile profile;
 
-    /**
-     * Selected GL profile
-     */
-    public static GLProfile profile;
+  public PJOGL pgl;
 
-    public PJOGL pgl;
+  protected GLWindow window;
+  protected FPSAnimator animator;
+  protected Rectangle screenRect;
 
-    protected GLWindow window;
-    protected FPSAnimator animator;
-    protected Rectangle screenRect;
+  private Thread drawExceptionHandler;
 
-    private Thread drawExceptionHandler;
+  protected PApplet sketch;
+  protected PGraphics graphics;
 
-    protected PApplet sketch;
-    protected PGraphics graphics;
+  protected int sketchWidth0;
+  protected int sketchHeight0;
+  protected int sketchWidth;
+  protected int sketchHeight;
 
-    protected int sketchWidth0;
-    protected int sketchHeight0;
-    protected int sketchWidth;
-    protected int sketchHeight;
+  protected Display display;
+  protected Screen screen;
+  protected Rectangle displayRect;
+  protected Throwable drawException;
+  private final Object drawExceptionMutex = new Object();
 
-    protected Display display;
-    protected Screen screen;
-    protected Rectangle displayRect;
-    protected Throwable drawException;
-    private final Object drawExceptionMutex = new Object();
+  protected NewtCanvasAWT canvas;
 
-    protected NewtCanvasAWT canvas;
+  protected int windowScaleFactor;
 
-    protected int windowScaleFactor;
+  protected float[] currentPixelScale = {0, 0};
 
-    protected float[] currentPixelScale = {0, 0};
+  protected boolean external = false;
 
-    protected boolean external = false;
 
-    public PSurfaceJOGL(PGraphics graphics) {
-        this.graphics = graphics;
-        this.pgl = (PJOGL) ((PGraphicsOpenGL) graphics).pgl;
-    }
+  public PSurfaceJOGL(PGraphics graphics) {
+    this.graphics = graphics;
+    this.pgl = (PJOGL) ((PGraphicsOpenGL)graphics).pgl;
+  }
 
-    public void initOffscreen(PApplet sketch) {
-        this.sketch = sketch;
 
-        sketchWidth = sketch.sketchWidth();
-        sketchHeight = sketch.sketchHeight();
+  /*
+  @Override
+  public int displayDensity() {
+    return shim.displayDensity();
+  }
 
-        if (window != null) {
-            canvas = new NewtCanvasAWT(window);
-            canvas.setBounds(0, 0, window.getWidth(), window.getHeight());
-            canvas.setFocusable(true);
-        }
-    }
 
-    public void initFrame(PApplet sketch) {
-        this.sketch = sketch;
-        initIcons();
-        initDisplay();
-        initGL();
-        initWindow();
-        initListeners();
-        initAnimator();
-    }
+  @Override
+  public int displayDensity(int display) {
+    return shim.displayDensity(display);
+  }
+  */
+
+
+  // TODO rewrite before 4.0 release
+  @Override
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
+  @Override
+  public void selectInput(String prompt, String callbackMethod,
+                          File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+
+      ShimAWT.selectImpl(prompt, callbackMethod, file,
+                         callbackObject, null, FileDialog.LOAD);
+
+      if (hide) setVisible(true);
+    });
+  }
+
+
+  @Override
+  public void selectOutput(String prompt, String callbackMethod,
+                           File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+
+      ShimAWT.selectImpl(prompt, callbackMethod, file,
+                         callbackObject, null, FileDialog.SAVE);
 
-    public Object getNative() {
-        return window;
+      if (hide) setVisible(true);
+    });
+  }
+
+
+  @Override
+  public void selectFolder(String prompt, String callbackMethod,
+                           File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+      
+      ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
+        callbackObject, null);
+      
+      if (hide) setVisible(true);
+    });
+  }
+
+  @Override
+  public void initOffscreen(PApplet sketch) {
+    this.sketch = sketch;
+
+    sketchWidth = sketch.sketchWidth();
+    sketchHeight = sketch.sketchHeight();
+
+    if (window != null) {
+      canvas = new NewtCanvasAWT(window);
+      canvas.setBounds(0, 0, window.getWidth(), window.getHeight());
+      canvas.setFocusable(true);
     }
+  }
 
-    protected void initDisplay() {
-        display = NewtFactory.createDisplay(null);
-        display.addReference();
-        screen = NewtFactory.createScreen(display, 0);
-        screen.addReference();
 
-        GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice[] awtDevices = environment.getScreenDevices();
+  @Override
+  public void initFrame(PApplet sketch) {
+    this.sketch = sketch;
 
-        GraphicsDevice awtDisplayDevice = null;
-        int displayNum = sketch.sketchDisplay();
-        if (displayNum > 0) {  // if -1, use the default device
-            if (displayNum <= awtDevices.length) {
-                awtDisplayDevice = awtDevices[displayNum - 1];
-            } else {
-                System.err.format("Display %d does not exist, "
-                        + "using the default display instead.%n", displayNum);
-                for (int i = 0; i < awtDevices.length; i++) {
-                    System.err.format("Display %d is %s%n", i + 1, awtDevices[i]);
-                }
-            }
-        } else if (0 < awtDevices.length) {
-            awtDisplayDevice = awtDevices[0];
-        }
+    initIcons();
+    initDisplay();
+    initGL();
+    initWindow();
+    initListeners();
+    initAnimator();
+  }
+
+
+  @Override
+  public Object getNative() {
+    return window;
+  }
 
-        if (awtDisplayDevice == null) {
-            awtDisplayDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+
+  protected void initDisplay() {
+    display = NewtFactory.createDisplay(null);
+    display.addReference();
+    screen = NewtFactory.createScreen(display, 0);
+    screen.addReference();
+
+    GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    GraphicsDevice[] awtDevices = environment.getScreenDevices();
+
+    GraphicsDevice awtDisplayDevice = null;
+    int displayNum = sketch.sketchDisplay();
+    if (displayNum > 0) {  // if -1, use the default device
+      if (displayNum <= awtDevices.length) {
+        awtDisplayDevice = awtDevices[displayNum-1];
+      } else {
+        System.err.format("Display %d does not exist, " +
+          "using the default display instead.%n", displayNum);
+        for (int i = 0; i < awtDevices.length; i++) {
+          System.err.format("Display %d is %s%n", i+1, awtDevices[i]);
         }
+      }
+    } else if (0 < awtDevices.length) {
+      awtDisplayDevice = awtDevices[0];
+    }
 
-        displayRect = awtDisplayDevice.getDefaultConfiguration().getBounds();
+    if (awtDisplayDevice == null) {
+      awtDisplayDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
     }
 
-    protected void initGL() {
+    GraphicsConfiguration config = awtDisplayDevice.getDefaultConfiguration();
+    displayRect = config.getBounds();
+  }
+
+
+  protected void initGL() {
 //  System.out.println("*******************************");
-        if (profile == null) {
-            if (PJOGL.profile == 1) {
-                try {
-                    profile = GLProfile.getGL2ES1();
-                } catch (GLException ex) {
-                    profile = GLProfile.getMaxFixedFunc(true);
-                }
-            } else if (PJOGL.profile == 2) {
-                try {
-                    profile = GLProfile.getGL2ES2();
-
-                    // workaround for https://jogamp.org/bugzilla/show_bug.cgi?id=1347
-                    if (!profile.isHardwareRasterizer()) {
-                        GLProfile hardware = GLProfile.getMaxProgrammable(true);
-                        if (hardware.isGL2ES2()) {
-                            profile = hardware;
-                        }
-                    }
-
-                } catch (GLException ex) {
-                    profile = GLProfile.getMaxProgrammable(true);
-                }
-            } else if (PJOGL.profile == 3) {
-                try {
-                    profile = GLProfile.getGL2GL3();
-                } catch (GLException ex) {
-                    profile = GLProfile.getMaxProgrammable(true);
-                }
-                if (!profile.isGL3()) {
-                    PGraphics.showWarning("Requested profile GL3 but is not available, got: " + profile);
-                }
-            } else if (PJOGL.profile == 4) {
-                try {
-                    profile = GLProfile.getGL4ES3();
-                } catch (GLException ex) {
-                    profile = GLProfile.getMaxProgrammable(true);
-                }
-                if (!profile.isGL4()) {
-                    PGraphics.showWarning("Requested profile GL4 but is not available, got: " + profile);
-                }
-            } else {
-                throw new RuntimeException(PGL.UNSUPPORTED_GLPROF_ERROR);
+    if (profile == null) {
+      switch (PJOGL.profile) {
+        case 1:
+          try {
+            profile = GLProfile.getGL2ES1();
+          } catch (GLException ex) {
+            profile = GLProfile.getMaxFixedFunc(true);
+          } break;
+        case 2:
+          try {
+            profile = GLProfile.getGL2ES2();
+            
+            // workaround for https://jogamp.org/bugzilla/show_bug.cgi?id=1347
+            if (!profile.isHardwareRasterizer()) {
+              GLProfile hardware = GLProfile.getMaxProgrammable(true);
+              if (hardware.isGL2ES2()) {
+                profile = hardware;
+              }
             }
-        }
+            
+          } catch (GLException ex) {
+            profile = GLProfile.getMaxProgrammable(true);
+          } break;
+        case 3:
+          try {
+            profile = GLProfile.getGL2GL3();
+          } catch (GLException ex) {
+            profile = GLProfile.getMaxProgrammable(true);
+          } if (!profile.isGL3()) {
+            PGraphics.showWarning("Requested profile GL3 but is not available, got: " + profile);
+          } break;
+        case 4:
+          try {
+            profile = GLProfile.getGL4ES3();
+          } catch (GLException ex) {
+            profile = GLProfile.getMaxProgrammable(true);
+          } if (!profile.isGL4()) {
+            PGraphics.showWarning("Requested profile GL4 but is not available, got: " + profile);
+          } break;
+        default:
+          throw new RuntimeException(PGL.UNSUPPORTED_GLPROF_ERROR);
+      }
+    }
 
-        // Setting up the desired capabilities;
-        GLCapabilities caps = new GLCapabilities(profile);
-        caps.setAlphaBits(PGL.REQUESTED_ALPHA_BITS);
-        caps.setDepthBits(PGL.REQUESTED_DEPTH_BITS);
-        caps.setStencilBits(PGL.REQUESTED_STENCIL_BITS);
+    // Setting up the desired capabilities;
+    GLCapabilities caps = new GLCapabilities(profile);
+    caps.setAlphaBits(PGL.REQUESTED_ALPHA_BITS);
+    caps.setDepthBits(PGL.REQUESTED_DEPTH_BITS);
+    caps.setStencilBits(PGL.REQUESTED_STENCIL_BITS);
 
 //  caps.setPBuffer(false);
 //  caps.setFBO(false);
+
 //    pgl.reqNumSamples = PGL.smoothToSamples(graphics.smooth);
-        caps.setSampleBuffers(true);
-        caps.setNumSamples(PGL.smoothToSamples(graphics.smooth));
-        caps.setBackgroundOpaque(true);
-        caps.setOnscreen(true);
-        pgl.setCaps(caps);
-    }
+    caps.setSampleBuffers(true);
+    caps.setNumSamples(PGL.smoothToSamples(graphics.smooth));
+    caps.setBackgroundOpaque(true);
+    caps.setOnscreen(true);
+    pgl.setCaps(caps);
+  }
 
-    protected void initWindow() {
-        window = GLWindow.create(screen, pgl.getCaps());
 
-        // Make sure that we pass the window close through to exit(), otherwise
-        // we're likely to have OpenGL try to shut down halfway through rendering
-        // a frame. Particularly problematic for complex/slow apps.
-        // https://github.com/processing/processing/issues/4690
-        window.setDefaultCloseOperation(WindowClosingProtocol.WindowClosingMode.DO_NOTHING_ON_CLOSE);
+  protected void initWindow() {
+    window = GLWindow.create(screen, pgl.getCaps());
+
+    // Make sure that we pass the window close through to exit(), otherwise
+    // we're likely to have OpenGL try to shut down halfway through rendering
+    // a frame. Particularly problematic for complex/slow apps.
+    // https://github.com/processing/processing/issues/4690
+    window.setDefaultCloseOperation(WindowClosingProtocol.WindowClosingMode.DO_NOTHING_ON_CLOSE);
 
 //    if (displayDevice == null) {
 //
@@ -249,25 +339,26 @@ public class PSurfaceJOGL implements PSurface {
 //    } else {
 //      window = GLWindow.create(displayDevice.getScreen(), pgl.getCaps());
 //    }
-        windowScaleFactor = PApplet.platform == PConstants.MACOSX
-                ? 1 : sketch.pixelDensity;
 
-        boolean spanDisplays = sketch.sketchDisplay() == PConstants.SPAN;
-        screenRect = spanDisplays
-                ? new Rectangle(screen.getX(), screen.getY(), screen.getWidth(), screen.getHeight())
-                : new Rectangle((int) displayRect.getX(), (int) displayRect.getY(),
-                        (int) displayRect.getWidth(),
-                        (int) displayRect.getHeight());
+    windowScaleFactor = PApplet.platform == PConstants.MACOS ?
+        1 : sketch.pixelDensity;
 
-        // Set the displayWidth/Height variables inside PApplet, so that they're
-        // usable and can even be returned by the sketchWidth()/Height() methods.
-        sketch.displayWidth = screenRect.width;
-        sketch.displayHeight = screenRect.height;
+    boolean spanDisplays = sketch.sketchDisplay() == PConstants.SPAN;
+    screenRect = spanDisplays ?
+      new Rectangle(screen.getX(), screen.getY(), screen.getWidth(), screen.getHeight()) :
+      new Rectangle((int) displayRect.getX(), (int) displayRect.getY(),
+                    (int) displayRect.getWidth(),
+                    (int) displayRect.getHeight());
 
-        sketchWidth0 = sketch.sketchWidth();
-        sketchHeight0 = sketch.sketchHeight();
+    // Set the displayWidth/Height variables inside PApplet, so that they're
+    // usable and can even be returned by the sketchWidth()/Height() methods.
+    sketch.displayWidth = screenRect.width;
+    sketch.displayHeight = screenRect.height;
 
-        /*
+    sketchWidth0 = sketch.sketchWidth();
+    sketchHeight0 = sketch.sketchHeight();
+
+    /*
     // Trying to fix
     // https://github.com/processing/processing/issues/3401
     if (sketch.displayWidth < sketch.width ||
@@ -284,17 +375,18 @@ public class PSurfaceJOGL implements PSurface {
 //      graphics.setSize(w, h - 22 - 22);
       System.err.println("setting width/height to " + w + " "  + h);
     }
-         */
-        sketchWidth = sketch.sketchWidth();
-        sketchHeight = sketch.sketchHeight();
+    */
+
+    sketchWidth = sketch.sketchWidth();
+    sketchHeight = sketch.sketchHeight();
 //    System.out.println("init: " + sketchWidth + " " + sketchHeight);
 
-        boolean fullScreen = sketch.sketchFullScreen();
-        // Removing the section below because sometimes people want to do the
-        // full screen size in a window, and it also breaks insideSettings().
-        // With 3.x, fullScreen() is so easy, that it's just better that way.
-        // https://github.com/processing/processing/issues/3545
-        /*
+    boolean fullScreen = sketch.sketchFullScreen();
+    // Removing the section below because sometimes people want to do the
+    // full screen size in a window, and it also breaks insideSettings().
+    // With 3.x, fullScreen() is so easy, that it's just better that way.
+    // https://github.com/processing/processing/issues/3545
+    /*
     // Sketch has already requested to be the same as the screen's
     // width and height, so let's roll with full screen mode.
     if (screenRect.width == sketchWidth &&
@@ -302,335 +394,310 @@ public class PSurfaceJOGL implements PSurface {
       fullScreen = true;
       sketch.fullScreen();
     }
-         */
-
-        if (fullScreen || spanDisplays) {
-            sketchWidth = screenRect.width / windowScaleFactor;
-            sketchHeight = screenRect.height / windowScaleFactor;
-        }
+    */
 
-        sketch.setSize(sketchWidth, sketchHeight);
-
-        float[] reqSurfacePixelScale;
-        if (graphics.is2X() && PApplet.platform == PConstants.MACOSX) {
-            // Retina
-            reqSurfacePixelScale = new float[]{ScalableSurface.AUTOMAX_PIXELSCALE,
-                ScalableSurface.AUTOMAX_PIXELSCALE};
-        } else {
-            // Non-retina
-            reqSurfacePixelScale = new float[]{ScalableSurface.IDENTITY_PIXELSCALE,
-                ScalableSurface.IDENTITY_PIXELSCALE};
-        }
-        window.setSurfaceScale(reqSurfacePixelScale);
-        window.setSize(sketchWidth * windowScaleFactor, sketchHeight * windowScaleFactor);
-        window.setResizable(false);
-        setSize(sketchWidth, sketchHeight);
-        if (fullScreen) {
-            PApplet.hideMenuBar();
-            if (spanDisplays) {
-                window.setFullscreen(screen.getMonitorDevices());
-            } else {
-                window.setUndecorated(true);
-                window.setTopLevelPosition((int) displayRect.getX(), (int) displayRect.getY());
-                window.setTopLevelSize((int) displayRect.getWidth(), (int) displayRect.getHeight());
-            }
-        }
+    if (fullScreen || spanDisplays) {
+      sketchWidth = screenRect.width / windowScaleFactor;
+      sketchHeight = screenRect.height / windowScaleFactor;
     }
 
-    protected void initListeners() {
-        NEWTMouseListener mouseListener = new NEWTMouseListener();
-        window.addMouseListener(mouseListener);
-        NEWTKeyListener keyListener = new NEWTKeyListener();
-        window.addKeyListener(keyListener);
-        NEWTWindowListener winListener = new NEWTWindowListener();
-        window.addWindowListener(winListener);
-
-        DrawListener drawlistener = new DrawListener();
-        window.addGLEventListener(drawlistener);
-    }
-
-    protected void initAnimator() {
-        if (PApplet.platform == PConstants.WINDOWS) {
-            // Force Windows to keep timer resolution high by
-            // sleeping for time which is not a multiple of 10 ms.
-            // See section "Clocks and Timers on Windows":
-            //   https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
-            Thread highResTimerThread = new Thread(() -> {
-                try {
-                    Thread.sleep(Long.MAX_VALUE);
-                } catch (InterruptedException ignore) {
-                }
-            }, "HighResTimerThread");
-            highResTimerThread.setDaemon(true);
-            highResTimerThread.start();
-        }
-
-        animator = new FPSAnimator(window, 60);
-        drawException = null;
-        animator.setUncaughtExceptionHandler(new GLAnimatorControl.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(final GLAnimatorControl animator,
-                    final GLAutoDrawable drawable,
-                    final Throwable cause) {
-                synchronized (drawExceptionMutex) {
-                    drawException = cause;
-                    drawExceptionMutex.notify();
-                }
-            }
-        });
-
-        drawExceptionHandler = new Thread(new Runnable() {
-            public void run() {
-                synchronized (drawExceptionMutex) {
-                    try {
-                        while (drawException == null) {
-                            drawExceptionMutex.wait();
-                        }
-                        // System.err.println("Caught exception: " + drawException.getMessage());
-                        if (drawException != null) {
-                            Throwable cause = drawException.getCause();
-                            if (cause instanceof ThreadDeath) {
-                                // System.out.println("caught ThreadDeath");
-                                // throw (ThreadDeath)cause;
-                            } else if (cause instanceof RuntimeException) {
-                                throw (RuntimeException) cause;
-                            } else if (cause instanceof UnsatisfiedLinkError) {
-                                throw new UnsatisfiedLinkError(cause.getMessage());
-                            } else if (cause == null) {
-                                throw new RuntimeException(drawException.getMessage());
-                            } else {
-                                throw new RuntimeException(cause);
-                            }
-                        }
-                    } catch (InterruptedException e) {
-                        return;
-                    }
-                }
-            }
-        });
-        drawExceptionHandler.start();
+    sketch.setSize(sketchWidth, sketchHeight);
+
+    float[] reqSurfacePixelScale;
+    if (graphics.is2X() && PApplet.platform == PConstants.MACOS) {
+       // Retina
+       reqSurfacePixelScale = new float[] { ScalableSurface.AUTOMAX_PIXELSCALE,
+                                            ScalableSurface.AUTOMAX_PIXELSCALE };
+    } else {
+      // Non-retina
+      reqSurfacePixelScale = new float[] { ScalableSurface.IDENTITY_PIXELSCALE,
+                                           ScalableSurface.IDENTITY_PIXELSCALE };
     }
-
-    @Override
-    public void setTitle(final String title) {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setTitle(title);
-            }
-        });
+    window.setSurfaceScale(reqSurfacePixelScale);
+    window.setSize(sketchWidth * windowScaleFactor, sketchHeight * windowScaleFactor);
+    window.setResizable(false);
+    setSize(sketchWidth, sketchHeight);
+    if (fullScreen) {
+      PApplet.hideMenuBar();
+      if (spanDisplays) {
+        window.setFullscreen(screen.getMonitorDevices());
+      } else {
+        window.setUndecorated(true);
+        window.setTopLevelPosition((int) displayRect.getX(), (int) displayRect.getY());
+        window.setTopLevelSize((int) displayRect.getWidth(), (int) displayRect.getHeight());
+      }
     }
+  }
 
-    @Override
-    public void setVisible(final boolean visible) {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setVisible(visible);
-            }
-        });
-    }
 
-    @Override
-    public void setResizable(final boolean resizable) {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setResizable(resizable);
-            }
-        });
-    }
+  protected void initListeners() {
+    NEWTMouseListener mouseListener = new NEWTMouseListener();
+    window.addMouseListener(mouseListener);
+    NEWTKeyListener keyListener = new NEWTKeyListener();
+    window.addKeyListener(keyListener);
+    NEWTWindowListener winListener = new NEWTWindowListener();
+    window.addWindowListener(winListener);
 
-    public void setIcon(PImage icon) {
-        PGraphics.showWarning("Window icons for OpenGL sketches can only be set in settings()\n"
-                + "using PJOGL.setIcon(filename).");
-    }
+    DrawListener drawlistener = new DrawListener();
+    window.addGLEventListener(drawlistener);
+  }
 
-    @Override
-    public void setAlwaysOnTop(final boolean always) {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setAlwaysOnTop(always);
-            }
-        });
+
+  protected void initAnimator() {
+    if (PApplet.platform == PConstants.WINDOWS) {
+      // Force Windows to keep timer resolution high by
+      // sleeping for time which is not a multiple of 10 ms.
+      // See section "Clocks and Timers on Windows":
+      //   https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+      Thread highResTimerThread = new Thread(() -> {
+        try {
+          Thread.sleep(Long.MAX_VALUE);
+        } catch (InterruptedException ignore) { }
+      }, "HighResTimerThread");
+      highResTimerThread.setDaemon(true);
+      highResTimerThread.start();
     }
 
-    protected void initIcons() {
-        IOUtil.ClassResources res = null;
-        if (PJOGL.icons == null || PJOGL.icons.length == 0) {
-            // Default Processing icons
-            final int[] sizes = {16, 32, 48, 64, 128, 256, 512};
-            String[] iconImages = new String[sizes.length];
-            for (int i = 0; i < sizes.length; i++) {
-                iconImages[i] = "/icon/icon-" + sizes[i] + ".png";
-            }
-            res = new ClassResources(iconImages,
-                    PApplet.class.getClassLoader(),
-                    PApplet.class);
-        } else {
-            // Loading custom icons from user-provided files.
-            String[] iconImages = new String[PJOGL.icons.length];
-            for (int i = 0; i < PJOGL.icons.length; i++) {
-                iconImages[i] = resourceFilename(PJOGL.icons[i]);
-            }
+    animator = new FPSAnimator(window, 60);
+    drawException = null;
+    animator.setUncaughtExceptionHandler((final GLAnimatorControl animator1, final GLAutoDrawable drawable, final Throwable cause) -> {
+      synchronized (drawExceptionMutex) {
+        drawException = cause;
+        drawExceptionMutex.notify();
+      }
+    });
 
-            res = new ClassResources(iconImages,
-                    sketch.getClass().getClassLoader(),
-                    sketch.getClass());
+    drawExceptionHandler = new Thread(() -> {
+      synchronized (drawExceptionMutex) {
+        try {
+          while (drawException == null) {
+            drawExceptionMutex.wait();
+          }
+          // System.err.println("Caught exception: " + drawException.getMessage());
+          if (drawException != null) {
+            Throwable cause = drawException.getCause();
+            if (cause instanceof ThreadDeath) {
+              // System.out.println("caught ThreadDeath");
+              // throw (ThreadDeath)cause;
+            } else if (cause instanceof RuntimeException) {
+              throw (RuntimeException) cause;
+            } else if (cause instanceof UnsatisfiedLinkError) {
+              throw new UnsatisfiedLinkError(cause.getMessage());
+            } else if (cause == null) {
+              throw new RuntimeException(drawException.getMessage());
+            } else {
+              throw new RuntimeException(cause);
+            }
+          }
+        } catch (InterruptedException e) {
         }
-        NewtFactory.setWindowIcons(res);
+      }
+    });
+    drawExceptionHandler.start();
+  }
+
+
+  @Override
+  public void setTitle(final String title) {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setTitle(title);
+    });
+  }
+
+
+  @Override
+  public void setVisible(final boolean visible) {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setVisible(visible);
+    });
+  }
+
+
+  @Override
+  public void setResizable(final boolean resizable) {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setResizable(resizable);
+    });
+  }
+
+
+  @Override
+  public void setIcon(PImage icon) {
+    PGraphics.showWarning("Window icons for OpenGL sketches can only be set in settings()\n" +
+                          "using PJOGL.setIcon(filename).");
+  }
+
+
+  @Override
+  public void setAlwaysOnTop(final boolean always) {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setAlwaysOnTop(always);
+    });
+  }
+
+
+  protected void initIcons() {
+    IOUtil.ClassResources res = null;
+    if (PJOGL.icons == null || PJOGL.icons.length == 0) {
+      // Default Processing icons
+      final int[] sizes = { 16, 32, 48, 64, 128, 256, 512 };
+      String[] iconImages = new String[sizes.length];
+      for (int i = 0; i < sizes.length; i++) {
+         iconImages[i] = "/icon/icon-" + sizes[i] + ".png";
+       }
+       res = new ClassResources(iconImages,
+                                PApplet.class.getClassLoader(),
+                                PApplet.class);
+    } else {
+      // Loading custom icons from user-provided files.
+      String[] iconImages = new String[PJOGL.icons.length];
+      for (int i = 0; i < PJOGL.icons.length; i++) {
+        iconImages[i] = resourceFilename(PJOGL.icons[i]);
+      }
+
+      res = new ClassResources(iconImages,
+                               sketch.getClass().getClassLoader(),
+                               sketch.getClass());
     }
+    NewtFactory.setWindowIcons(res);
+  }
+
+
+  @SuppressWarnings("resource")
+  private String resourceFilename(String filename) {
+    // The code below comes from PApplet.createInputRaw() with a few adaptations
+    InputStream stream = null;
+    try {
+      // First see if it's in a data folder. This may fail by throwing
+      // a SecurityException. If so, this whole block will be skipped.
+      File file = new File(sketch.dataPath(filename));
+      if (!file.exists()) {
+        // next see if it's just in the sketch folder
+        file = sketch.sketchFile(filename);
+      }
 
-    @SuppressWarnings("resource")
-    private String resourceFilename(String filename) {
-        // The code below comes from PApplet.createInputRaw() with a few adaptations
-        InputStream stream = null;
+      if (file.exists() && !file.isDirectory()) {
         try {
-            // First see if it's in a data folder. This may fail by throwing
-            // a SecurityException. If so, this whole block will be skipped.
-            File file = new File(sketch.dataPath(filename));
-            if (!file.exists()) {
-                // next see if it's just in the sketch folder
-                file = sketch.sketchFile(filename);
-            }
-
-            if (file.exists() && !file.isDirectory()) {
-                try {
-                    // handle case sensitivity check
-                    String filePath = file.getCanonicalPath();
-                    String filenameActual = new File(filePath).getName();
-                    // make sure there isn't a subfolder prepended to the name
-                    String filenameShort = new File(filename).getName();
-                    // if the actual filename is the same, but capitalized
-                    // differently, warn the user.
-                    //if (filenameActual.equalsIgnoreCase(filenameShort) &&
-                    //!filenameActual.equals(filenameShort)) {
-                    if (!filenameActual.equals(filenameShort)) {
-                        throw new RuntimeException("This file is named "
-                                + filenameActual + " not "
-                                + filename + ". Rename the file "
-                                + "or change your code.");
-                    }
-                } catch (IOException e) {
-                }
-            }
+          // handle case sensitivity check
+          String filePath = file.getCanonicalPath();
+          String filenameActual = new File(filePath).getName();
+          // make sure there isn't a subfolder prepended to the name
+          String filenameShort = new File(filename).getName();
+          // if the actual filename is the same, but capitalized
+          // differently, warn the user.
+          //if (filenameActual.equalsIgnoreCase(filenameShort) &&
+          //!filenameActual.equals(filenameShort)) {
+          if (!filenameActual.equals(filenameShort)) {
+            throw new RuntimeException("This file is named " +
+                                       filenameActual + " not " +
+                                       filename + ". Rename the file " +
+                                       "or change your code.");
+          }
+        } catch (IOException e) { }
+      }
 
-            stream = new FileInputStream(file);
-            if (stream != null) {
-                stream.close();
-                return file.getCanonicalPath();
-            }
+      stream = new FileInputStream(file);
+      stream.close();
+      return file.getCanonicalPath();
+      // have to break these out because a general Exception might
+      // catch the RuntimeException being thrown above
+    } catch (IOException | SecurityException ioe) {
+    }
 
-            // have to break these out because a general Exception might
-            // catch the RuntimeException being thrown above
-        } catch (IOException ioe) {
-        } catch (SecurityException se) {
+    ClassLoader cl = sketch.getClass().getClassLoader();
+
+    try {
+      // by default, data files are exported to the root path of the jar.
+      // (not the data folder) so check there first.
+      stream = cl.getResourceAsStream("data/" + filename);
+      if (stream != null) {
+        String cn = stream.getClass().getName();
+        // this is an irritation of sun's java plug-in, which will return
+        // a non-null stream for an object that doesn't exist. like all good
+        // things, this is probably introduced in java 1.5. awesome!
+        // http://dev.processing.org/bugs/show_bug.cgi?id=359
+        if (!cn.equals("sun.plugin.cache.EmptyInputStream")) {
+          stream.close();
+          return "data/" + filename;
         }
+      }
 
-        ClassLoader cl = sketch.getClass().getClassLoader();
+      // When used with an online script, also need to check without the
+      // data folder, in case it's not in a subfolder called 'data'.
+      // http://dev.processing.org/bugs/show_bug.cgi?id=389
+      stream = cl.getResourceAsStream(filename);
+      if (stream != null) {
+        String cn = stream.getClass().getName();
+        if (!cn.equals("sun.plugin.cache.EmptyInputStream")) {
+          stream.close();
+          return filename;
+        }
+      }
+    } catch (IOException e) { }
 
+    try {
+      // attempt to load from a local file, used when running as
+      // an application, or as a signed applet
+      try {  // first try to catch any security exceptions
         try {
-            // by default, data files are exported to the root path of the jar.
-            // (not the data folder) so check there first.
-            stream = cl.getResourceAsStream("data/" + filename);
-            if (stream != null) {
-                String cn = stream.getClass().getName();
-                // this is an irritation of sun's java plug-in, which will return
-                // a non-null stream for an object that doesn't exist. like all good
-                // things, this is probably introduced in java 1.5. awesome!
-                // http://dev.processing.org/bugs/show_bug.cgi?id=359
-                if (!cn.equals("sun.plugin.cache.EmptyInputStream")) {
-                    stream.close();
-                    return "data/" + filename;
-                }
-            }
+          String path = sketch.dataPath(filename);
+          stream = new FileInputStream(path);
+          stream.close();
+          return path;
+        } catch (IOException e2) { }
 
-            // When used with an online script, also need to check without the
-            // data folder, in case it's not in a subfolder called 'data'.
-            // http://dev.processing.org/bugs/show_bug.cgi?id=389
-            stream = cl.getResourceAsStream(filename);
-            if (stream != null) {
-                String cn = stream.getClass().getName();
-                if (!cn.equals("sun.plugin.cache.EmptyInputStream")) {
-                    stream.close();
-                    return filename;
-                }
-            }
-        } catch (IOException e) {
-        }
+        try {
+          String path = sketch.sketchPath(filename);
+          stream = new FileInputStream(path);
+          stream.close();
+          return path;
+        } catch (IOException e) { }  // ignored
 
         try {
-            // attempt to load from a local file, used when running as
-            // an application, or as a signed applet
-            try {  // first try to catch any security exceptions
-                try {
-                    String path = sketch.dataPath(filename);
-                    stream = new FileInputStream(path);
-                    if (stream != null) {
-                        stream.close();
-                        return path;
-                    }
-                } catch (IOException e2) {
-                }
-
-                try {
-                    String path = sketch.sketchPath(filename);
-                    stream = new FileInputStream(path);
-                    if (stream != null) {
-                        stream.close();
-                        return path;
-                    }
-                } catch (Exception e) {
-                }  // ignored
-
-                try {
-                    stream = new FileInputStream(filename);
-                    if (stream != null) {
-                        stream.close();
-                        return filename;
-                    }
-                } catch (IOException e1) {
-                }
-
-            } catch (SecurityException se) {
-            }  // online, whups
-
-        } catch (Exception e) {
-            //die(e.getMessage(), e);
-            e.printStackTrace();
-        }
+          stream = new FileInputStream(filename);
+          stream.close();
+          return filename;
+        
+        } catch (IOException e1) { }
+
+      } catch (SecurityException se) { }  // online, whups
+
+    } catch (Exception e) {
+      //die(e.getMessage(), e);
 
-        return "";
     }
 
-    @Override
-    public void placeWindow(int[] location, int[] editorLocation) {
+    return "";
+  }
 
-        if (sketch.sketchFullScreen()) {
-            return;
-        }
 
-        int x = window.getX() - window.getInsets().getLeftWidth();
-        int y = window.getY() - window.getInsets().getTopHeight();
-        int w = window.getWidth() + window.getInsets().getTotalWidth();
-        int h = window.getHeight() + window.getInsets().getTotalHeight();
+  @Override
+  public void placeWindow(int[] location, int[] editorLocation) {
+
+    if (sketch.sketchFullScreen()) {
+      return;
+    }
+
+    int x = window.getX() - window.getInsets().getLeftWidth();
+    int y = window.getY() - window.getInsets().getTopHeight();
+    int w = window.getWidth() + window.getInsets().getTotalWidth();
+    int h = window.getHeight() + window.getInsets().getTotalHeight();
 
-        if (location != null) {
+    if (location != null) {
 //      System.err.println("place window at " + location[0] + ", " + location[1]);
-            window.setTopLevelPosition(location[0], location[1]);
+      window.setTopLevelPosition(location[0], location[1]);
 
-        } else if (editorLocation != null) {
+    } else if (editorLocation != null) {
 //      System.err.println("place window at editor location " + editorLocation[0] + ", " + editorLocation[1]);
-            int locationX = editorLocation[0] - 20;
-            int locationY = editorLocation[1];
+      int locationX = editorLocation[0] - 20;
+      int locationY = editorLocation[1];
 
-            if (locationX - w > 10) {
-                // if it fits to the left of the window
-                window.setTopLevelPosition(locationX - w, locationY);
+      if (locationX - w > 10) {
+        // if it fits to the left of the window
+        window.setTopLevelPosition(locationX - w, locationY);
 
-            } else {  // doesn't fit
-                /*
+      } 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
@@ -640,659 +707,679 @@ public class PSurfaceJOGL implements PSurface {
         if ((locationX + w > sketch.displayWidth - 33) ||
             (locationY + h > sketch.displayHeight - 33)) {
           // otherwise center on screen
-                 */
-                locationX = (sketch.displayWidth - w) / 2;
-                locationY = (sketch.displayHeight - h) / 2;
-                /*
-        }
-                 */
-                window.setTopLevelPosition(locationX, locationY);
-            }
-        } else {  // just center on screen
-            // Can't use frame.setLocationRelativeTo(null) because it sends the
-            // frame to the main display, which undermines the --display setting.
-            window.setTopLevelPosition(screenRect.x + (screenRect.width - sketchWidth) / 2,
-                    screenRect.y + (screenRect.height - sketchHeight) / 2);
+        */
+        locationX = (sketch.displayWidth - w) / 2;
+        locationY = (sketch.displayHeight - h) / 2;
+        /*
         }
+        */
+        window.setTopLevelPosition(locationX, locationY);
+      }
+    } else {  // just center on screen
+      // Can't use frame.setLocationRelativeTo(null) because it sends the
+      // frame to the main display, which undermines the --display setting.
+      window.setTopLevelPosition(screenRect.x + (screenRect.width - sketchWidth) / 2,
+                                 screenRect.y + (screenRect.height - sketchHeight) / 2);
+    }
 
-        Point frameLoc = new Point(x, y);
-        if (frameLoc.y < 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
-            window.setTopLevelPosition(frameLoc.x, 30);
-        }
+    Point frameLoc = new Point(x, y);
+    if (frameLoc.y < 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
+      window.setTopLevelPosition(frameLoc.x, 30);
     }
+  }
 
-    public void placePresent(int stopColor) {
-        float scale = getPixelScale();
-        pgl.initPresentMode(0.5f * (screenRect.width / scale - sketchWidth),
-                0.5f * (screenRect.height / scale - sketchHeight), stopColor);
-        PApplet.hideMenuBar();
 
-        window.setUndecorated(true);
-        window.setTopLevelPosition((int) displayRect.getX(), (int) displayRect.getY());
-        window.setTopLevelSize((int) displayRect.getWidth(), (int) displayRect.getHeight());
-    }
+  @Override
+  public void placePresent(int stopColor) {
+    float scale = getPixelScale();
+    pgl.initPresentMode(0.5f * (screenRect.width/scale - sketchWidth),
+                        0.5f * (screenRect.height/scale - sketchHeight), stopColor);
+    PApplet.hideMenuBar();
 
-    public void setupExternalMessages() {
-        external = true;
-    }
+    window.setUndecorated(true);
+    window.setTopLevelPosition((int) displayRect.getX(), (int) displayRect.getY());
+    window.setTopLevelSize((int) displayRect.getWidth(), (int) displayRect.getHeight());
+  }
 
-    public void startThread() {
-        if (animator != null) {
-            animator.start();
-        }
-    }
 
-    public void pauseThread() {
-        if (animator != null) {
-            animator.pause();
-        }
-    }
+  @Override
+  public void setupExternalMessages() {
+    external = true;
+  }
 
-    public void resumeThread() {
-        if (animator != null) {
-            animator.resume();
-        }
-    }
 
-    public boolean stopThread() {
-        if (drawExceptionHandler != null) {
-            drawExceptionHandler.interrupt();
-            drawExceptionHandler = null;
-        }
-        if (animator != null) {
-            return animator.stop();
-        } else {
-            return false;
-        }
+  @Override
+  public void startThread() {
+    if (animator != null) {
+      animator.start();
     }
+  }
 
-    public boolean isStopped() {
-        if (animator != null) {
-            return !animator.isAnimating();
-        } else {
-            return true;
-        }
-    }
 
-    public void setLocation(final int x, final int y) {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setTopLevelPosition(x, y);
-            }
-        });
+  @Override
+  public void pauseThread() {
+    if (animator != null) {
+      animator.pause();
     }
+  }
 
-    public void setSize(int wide, int high) {
-        if (pgl.presentMode()) {
-            return;
-        }
 
-        // When the surface is set to resizable via surface.setResizable(true),
-        // a crash may occur if the user sets the window to size zero.
-        // https://github.com/processing/processing/issues/5052
-        if (high <= 0) {
-            high = 1;
-        }
-        if (wide <= 0) {
-            wide = 1;
-        }
+  @Override
+  public void resumeThread() {
+    if (animator != null) {
+      animator.resume();
+    }
+  }
 
-        boolean changed = sketch.width != wide || sketch.height != high;
 
-        sketchWidth = wide;
-        sketchHeight = high;
+  @Override
+  public boolean stopThread() {
+    if (drawExceptionHandler != null) {
+      drawExceptionHandler.interrupt();
+      drawExceptionHandler = null;
+    }
+    if (animator != null) {
+      return animator.stop();
+    } else {
+      return false;
+    }
+  }
 
-        sketch.setSize(wide, high);
-        graphics.setSize(wide, high);
 
-        if (changed) {
-            window.setSize(wide * windowScaleFactor, high * windowScaleFactor);
-        }
+  @Override
+  public boolean isStopped() {
+    if (animator != null) {
+      return !animator.isAnimating();
+    } else {
+      return true;
     }
+  }
 
-    public float getPixelScale() {
-        if (graphics.pixelDensity == 1) {
-            return 1;
-        }
 
-        if (PApplet.platform == PConstants.MACOSX) {
-            return getCurrentPixelScale();
-        }
+  @Override
+  public void setLocation(final int x, final int y) {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setTopLevelPosition(x, y);
+    });
+  }
 
-        return 2;
-    }
-
-    private float getCurrentPixelScale() {
-        // Even if the graphics are retina, the user might have moved the window
-        // into a non-retina monitor, so we need to check
-        window.getCurrentSurfaceScale(currentPixelScale);
-        return currentPixelScale[0];
-    }
-
-    public Component getComponent() {
-        return canvas;
-    }
-
-    public void setSmooth(int level) {
-        pgl.reqNumSamples = level;
-        GLCapabilities caps = new GLCapabilities(profile);
-        caps.setAlphaBits(PGL.REQUESTED_ALPHA_BITS);
-        caps.setDepthBits(PGL.REQUESTED_DEPTH_BITS);
-        caps.setStencilBits(PGL.REQUESTED_STENCIL_BITS);
-        caps.setSampleBuffers(true);
-        caps.setNumSamples(pgl.reqNumSamples);
-        caps.setBackgroundOpaque(true);
-        caps.setOnscreen(true);
-        NativeSurface target = window.getNativeSurface();
-        MutableGraphicsConfiguration config = (MutableGraphicsConfiguration) target.getGraphicsConfiguration();
-        config.setChosenCapabilities(caps);
-    }
-
-    public void setFrameRate(float fps) {
-        if (fps < 1) {
-            PGraphics.showWarning(
-                    "The OpenGL renderer cannot have a frame rate lower than 1.\n"
-                    + "Your sketch will run at 1 frame per second.");
-            fps = 1;
-        } else if (fps > 1000) {
-            PGraphics.showWarning(
-                    "The OpenGL renderer cannot have a frame rate higher than 1000.\n"
-                    + "Your sketch will run at 1000 frames per second.");
-            fps = 1000;
-        }
-        if (animator != null) {
-            animator.stop();
-            animator.setFPS((int) fps);
-            pgl.setFps(fps);
-            animator.start();
-        }
-    }
 
-    public void requestFocus() {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.requestFocus();
-            }
-        });
+  @Override
+  public void setSize(int wide, int high) {
+    if (pgl.presentMode()) return;
+
+    // When the surface is set to resizable via surface.setResizable(true),
+    // a crash may occur if the user sets the window to size zero.
+    // https://github.com/processing/processing/issues/5052
+    if (high <= 0) {
+      high = 1;
+    }
+    if (wide <= 0) {
+      wide = 1;
     }
 
-    class DrawListener implements GLEventListener {
+    boolean changed = sketch.width != wide || sketch.height != high;
 
-        public void display(GLAutoDrawable drawable) {
-            if (display.getEDTUtil().isCurrentThreadEDT()) {
-                // For some reason, the first two frames of the animator are run on the
-                // EDT, skipping rendering Processing's frame in that case.
-                return;
-            }
+    sketchWidth = wide;
+    sketchHeight = high;
 
-            if (sketch.frameCount == 0) {
-                if (sketchWidth < sketchWidth0 || sketchHeight < sketchHeight0) {
-                    PGraphics.showWarning("The sketch has been automatically resized to fit the screen resolution");
-                }
-//        System.out.println("display: " + window.getWidth() + " "+ window.getHeight() + " - " + sketchWidth + " " + sketchHeight);
-                requestFocus();
-            }
-
-            if (!sketch.finished) {
-                pgl.getGL(drawable);
-                int pframeCount = sketch.frameCount;
-                sketch.handleDraw();
-                if (pframeCount == sketch.frameCount || sketch.finished) {
-                    // This hack allows the FBO layer to be swapped normally even if
-                    // the sketch is no looping or finished because it does not call draw(),
-                    // otherwise background artifacts may occur (depending on the hardware/drivers).
-                    pgl.beginRender();
-                    pgl.endRender(sketch.sketchWindowColor());
-                }
-                PGraphicsOpenGL.completeFinishedPixelTransfers();
-            }
+    sketch.setSize(wide, high);
+    graphics.setSize(wide, high);
 
-            if (sketch.exitCalled()) {
-                PGraphicsOpenGL.completeAllPixelTransfers();
+    if (changed) {
+      window.setSize(wide * windowScaleFactor, high * windowScaleFactor);
+    }
+  }
 
-                sketch.dispose(); // calls stopThread(), which stops the animator.
-                sketch.exitActual();
-            }
-        }
 
-        public void dispose(GLAutoDrawable drawable) {
-//      sketch.dispose();
-        }
+  public float getPixelScale() {
+    if (graphics.pixelDensity == 1) {
+      return 1;
+    }
 
-        public void init(GLAutoDrawable drawable) {
-            pgl.getGL(drawable);
-            pgl.init(drawable);
-            sketch.start();
-
-            int c = graphics.backgroundColor;
-            pgl.clearColor(((c >> 16) & 0xff) / 255f,
-                    ((c >> 8) & 0xff) / 255f,
-                    ((c >> 0) & 0xff) / 255f,
-                    ((c >> 24) & 0xff) / 255f);
-            pgl.clear(PGL.COLOR_BUFFER_BIT);
-        }
+    if (PApplet.platform == PConstants.MACOS) {
+      return getCurrentPixelScale();
+    }
 
-        public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) {
-            pgl.resetFBOLayer();
-            pgl.getGL(drawable);
-            float scale = PApplet.platform == PConstants.MACOSX
-                    ? getCurrentPixelScale() : getPixelScale();
-            setSize((int) (w / scale), (int) (h / scale));
-        }
+    return 2;
+  }
+
+  private float getCurrentPixelScale() {
+    // Even if the graphics are retina, the user might have moved the window
+    // into a non-retina monitor, so we need to check
+    window.getCurrentSurfaceScale(currentPixelScale);
+    return currentPixelScale[0];
+  }
+
+
+  public Component getComponent() {
+    return canvas;
+  }
+
+
+  public void setSmooth(int level) {
+    pgl.reqNumSamples = level;
+    GLCapabilities caps = new GLCapabilities(profile);
+    caps.setAlphaBits(PGL.REQUESTED_ALPHA_BITS);
+    caps.setDepthBits(PGL.REQUESTED_DEPTH_BITS);
+    caps.setStencilBits(PGL.REQUESTED_STENCIL_BITS);
+    caps.setSampleBuffers(true);
+    caps.setNumSamples(pgl.reqNumSamples);
+    caps.setBackgroundOpaque(true);
+    caps.setOnscreen(true);
+    NativeSurface target = window.getNativeSurface();
+    MutableGraphicsConfiguration config = (MutableGraphicsConfiguration) target.getGraphicsConfiguration();
+    config.setChosenCapabilities(caps);
+  }
+
+
+  @Override
+  public void setFrameRate(float fps) {
+    if (fps < 1) {
+      PGraphics.showWarning(
+        "The OpenGL renderer cannot have a frame rate lower than 1.\n" +
+        "Your sketch will run at 1 frame per second.");
+      fps = 1;
+    } else if (fps > 1000) {
+      PGraphics.showWarning(
+        "The OpenGL renderer cannot have a frame rate higher than 1000.\n" +
+        "Your sketch will run at 1000 frames per second.");
+      fps = 1000;
     }
+    if (animator != null) {
+      animator.stop();
+      animator.setFPS((int)fps);
+      pgl.setFps(fps);
+      animator.start();
+    }
+  }
 
-    protected class NEWTWindowListener implements com.jogamp.newt.event.WindowListener {
 
-        public NEWTWindowListener() {
-            super();
-        }
+  public void requestFocus() {
+    display.getEDTUtil().invoke(false, () -> {
+      window.requestFocus();
+    });
+  }
 
-        @Override
-        public void windowGainedFocus(com.jogamp.newt.event.WindowEvent arg0) {
-            sketch.focused = true;
-            sketch.focusGained();
-        }
 
-        @Override
-        public void windowLostFocus(com.jogamp.newt.event.WindowEvent arg0) {
-            sketch.focused = false;
-            sketch.focusLost();
-        }
+  class DrawListener implements GLEventListener {
+    @Override
+    public void display(GLAutoDrawable drawable) {
+      if (display.getEDTUtil().isCurrentThreadEDT()) {
+        // For some reason, the first two frames of the animator are run on the
+        // EDT, skipping rendering Processing's frame in that case.
+        return;
+      }
 
-        @Override
-        public void windowDestroyNotify(com.jogamp.newt.event.WindowEvent arg0) {
-            sketch.exit();
+      if (sketch.frameCount == 0) {
+        if (sketchWidth < sketchWidth0 || sketchHeight < sketchHeight0) {
+          PGraphics.showWarning("The sketch has been automatically resized to fit the screen resolution");
         }
+//        System.out.println("display: " + window.getWidth() + " "+ window.getHeight() + " - " + sketchWidth + " " + sketchHeight);
+        requestFocus();
+      }
 
-        @Override
-        public void windowDestroyed(com.jogamp.newt.event.WindowEvent arg0) {
-            sketch.exit();
-        }
+      if (!sketch.finished) {
+        pgl.getGL(drawable);
+        int pframeCount = sketch.frameCount;
+        sketch.handleDraw();
+        if (pframeCount == sketch.frameCount || sketch.finished) {
+          // This hack allows the FBO layer to be swapped normally even if
+          // the sketch is no looping or finished because it does not call draw(),
+          // otherwise background artifacts may occur (depending on the hardware/drivers).
+          pgl.beginRender();
+          pgl.endRender(sketch.sketchWindowColor());
+        }
+        PGraphicsOpenGL.completeFinishedPixelTransfers();
+      }
 
-        @Override
-        public void windowMoved(com.jogamp.newt.event.WindowEvent arg0) {
-            if (external) {
-                sketch.frameMoved(window.getX(), window.getY());
-            }
-        }
+      if (sketch.exitCalled()) {
+        PGraphicsOpenGL.completeAllPixelTransfers();
 
-        @Override
-        public void windowRepaint(com.jogamp.newt.event.WindowUpdateEvent arg0) {
-        }
+        sketch.dispose(); // calls stopThread(), which stops the animator.
+        sketch.exitActual();
+      }
+    }
+    @Override
+    public void dispose(GLAutoDrawable drawable) {
+//      sketch.dispose();
+    }
+    @Override
+    public void init(GLAutoDrawable drawable) {
+      pgl.getGL(drawable);
+      pgl.init(drawable);
+      sketch.start();
+
+      int c = graphics.backgroundColor;
+      pgl.clearColor(((c >> 16) & 0xff) / 255f,
+                     ((c >>  8) & 0xff) / 255f,
+                     ((c) & 0xff) / 255f,
+                     ((c >> 24) & 0xff) / 255f);
+      pgl.clear(PGL.COLOR_BUFFER_BIT);
+    }
 
-        @Override
-        public void windowResized(com.jogamp.newt.event.WindowEvent arg0) {
-        }
+    @Override
+    public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) {
+      pgl.resetFBOLayer();
+      pgl.getGL(drawable);
+      float scale = PApplet.platform == PConstants.MACOS ?
+          getCurrentPixelScale() : getPixelScale();
+      setSize((int) (w / scale), (int) (h / scale));
     }
+  }
 
-    // NEWT mouse listener
-    protected class NEWTMouseListener extends com.jogamp.newt.event.MouseAdapter {
 
-        public NEWTMouseListener() {
-            super();
-        }
+  protected class NEWTWindowListener implements com.jogamp.newt.event.WindowListener {
+    public NEWTWindowListener() {
+      super();
+    }
+    @Override
+    public void windowGainedFocus(com.jogamp.newt.event.WindowEvent arg0) {
+      sketch.focused = true;
+      sketch.focusGained();
+    }
 
-        @Override
-        public void mousePressed(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.PRESS);
-        }
+    @Override
+    public void windowLostFocus(com.jogamp.newt.event.WindowEvent arg0) {
+      sketch.focused = false;
+      sketch.focusLost();
+    }
 
-        @Override
-        public void mouseReleased(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.RELEASE);
-        }
+    @Override
+    public void windowDestroyNotify(com.jogamp.newt.event.WindowEvent arg0) {
+      sketch.exit();
+    }
 
-        @Override
-        public void mouseClicked(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.CLICK);
-        }
+    @Override
+    public void windowDestroyed(com.jogamp.newt.event.WindowEvent arg0) {
+      sketch.exit();
+    }
 
-        @Override
-        public void mouseDragged(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.DRAG);
-        }
+    @Override
+    public void windowMoved(com.jogamp.newt.event.WindowEvent arg0) {
+      if (external) {
+        sketch.frameMoved(window.getX(), window.getY());
+      }
+    }
 
-        @Override
-        public void mouseMoved(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.MOVE);
-        }
+    @Override
+    public void windowRepaint(com.jogamp.newt.event.WindowUpdateEvent arg0) {
+    }
 
-        @Override
-        public void mouseWheelMoved(com.jogamp.newt.event.MouseEvent e) {
-            nativeMouseEvent(e, MouseEvent.WHEEL);
-        }
+    @Override
+    public void windowResized(com.jogamp.newt.event.WindowEvent arg0) {
+    }
+  }
 
-        @Override
-        public void mouseEntered(com.jogamp.newt.event.MouseEvent e) {
-//      System.out.println("enter");
-            nativeMouseEvent(e, MouseEvent.ENTER);
-        }
 
-        @Override
-        public void mouseExited(com.jogamp.newt.event.MouseEvent e) {
+  // NEWT mouse listener
+  protected class NEWTMouseListener extends com.jogamp.newt.event.MouseAdapter {
+    public NEWTMouseListener() {
+      super();
+    }
+    @Override
+    public void mousePressed(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.PRESS);
+    }
+    @Override
+    public void mouseReleased(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.RELEASE);
+    }
+    @Override
+    public void mouseClicked(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.CLICK);
+    }
+    @Override
+    public void mouseDragged(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.DRAG);
+    }
+    @Override
+    public void mouseMoved(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.MOVE);
+    }
+    @Override
+    public void mouseWheelMoved(com.jogamp.newt.event.MouseEvent e) {
+      nativeMouseEvent(e, MouseEvent.WHEEL);
+    }
+    @Override
+    public void mouseEntered(com.jogamp.newt.event.MouseEvent e) {
+//      System.out.println("enter");
+      nativeMouseEvent(e, MouseEvent.ENTER);
+    }
+    @Override
+    public void mouseExited(com.jogamp.newt.event.MouseEvent e) {
 //      System.out.println("exit");
-            nativeMouseEvent(e, MouseEvent.EXIT);
-        }
+      nativeMouseEvent(e, MouseEvent.EXIT);
     }
+  }
 
-    // NEWT key listener
-    protected class NEWTKeyListener extends com.jogamp.newt.event.KeyAdapter {
-
-        public NEWTKeyListener() {
-            super();
-        }
-
-        @Override
-        public void keyPressed(com.jogamp.newt.event.KeyEvent e) {
-            nativeKeyEvent(e, KeyEvent.PRESS);
-        }
 
-        @Override
-        public void keyReleased(com.jogamp.newt.event.KeyEvent e) {
-            nativeKeyEvent(e, KeyEvent.RELEASE);
-        }
+  // NEWT key listener
+  protected class NEWTKeyListener extends com.jogamp.newt.event.KeyAdapter {
+    public NEWTKeyListener() {
+      super();
+    }
+    @Override
+    public void keyPressed(com.jogamp.newt.event.KeyEvent e) {
+      nativeKeyEvent(e, KeyEvent.PRESS);
+    }
+    @Override
+    public void keyReleased(com.jogamp.newt.event.KeyEvent e) {
+      nativeKeyEvent(e, KeyEvent.RELEASE);
+    }
+    public void keyTyped(com.jogamp.newt.event.KeyEvent e)  {
+      nativeKeyEvent(e, KeyEvent.TYPE);
+    }
+  }
+
+
+  protected void nativeMouseEvent(com.jogamp.newt.event.MouseEvent nativeEvent,
+                                  int peAction) {
+    int modifiers = nativeEvent.getModifiers();
+    /*
+    int peModifiers = modifiers &
+                      (InputEvent.SHIFT_MASK |
+                       InputEvent.CTRL_MASK |
+                       InputEvent.META_MASK |
+                       InputEvent.ALT_MASK);
+     */
 
-        public void keyTyped(com.jogamp.newt.event.KeyEvent e) {
-            nativeKeyEvent(e, KeyEvent.TYPE);
-        }
+    int peButton = 0;
+    switch (nativeEvent.getButton()) {
+      case com.jogamp.newt.event.MouseEvent.BUTTON1:
+        peButton = PConstants.LEFT;
+        break;
+      case com.jogamp.newt.event.MouseEvent.BUTTON2:
+        peButton = PConstants.CENTER;
+        break;
+      case com.jogamp.newt.event.MouseEvent.BUTTON3:
+        peButton = PConstants.RIGHT;
+        break;
     }
 
-    protected void nativeMouseEvent(com.jogamp.newt.event.MouseEvent nativeEvent,
-            int peAction) {
-        int modifiers = nativeEvent.getModifiers();
-        int peModifiers = modifiers
-                & (InputEvent.SHIFT_MASK
-                | InputEvent.CTRL_MASK
-                | InputEvent.META_MASK
-                | InputEvent.ALT_MASK);
-
-        int peButton = 0;
-        switch (nativeEvent.getButton()) {
-            case com.jogamp.newt.event.MouseEvent.BUTTON1:
-                peButton = PConstants.LEFT;
-                break;
-            case com.jogamp.newt.event.MouseEvent.BUTTON2:
-                peButton = PConstants.CENTER;
-                break;
-            case com.jogamp.newt.event.MouseEvent.BUTTON3:
-                peButton = PConstants.RIGHT;
-                break;
-        }
+    int peCount = 0;
+    if (peAction == MouseEvent.WHEEL) {
+      // Invert wheel rotation count so it matches JAVA2D's
+      // https://github.com/processing/processing/issues/3840
+      peCount = -(nativeEvent.isShiftDown() ? (int)nativeEvent.getRotation()[0]:
+                                              (int)nativeEvent.getRotation()[1]);
+    } else {
+      peCount = nativeEvent.getClickCount();
+    }
 
-        if (PApplet.platform == PConstants.MACOSX) {
-            //if (nativeEvent.isPopupTrigger()) {
-            if ((modifiers & InputEvent.CTRL_MASK) != 0) {
-                peButton = PConstants.RIGHT;
-            }
-        }
+    int scale;
+    if (PApplet.platform == PConstants.MACOS) {
+      scale = (int) getCurrentPixelScale();
+    } else {
+      scale = (int) getPixelScale();
+    }
+    int sx = nativeEvent.getX() / scale;
+    int sy = nativeEvent.getY() / scale;
+    int mx = sx;
+    int my = sy;
+
+    if (pgl.presentMode()) {
+      mx -= (int)pgl.presentX;
+      my -= (int)pgl.presentY;
+      if (peAction == KeyEvent.RELEASE &&
+          pgl.insideStopButton(sx, sy - screenRect.height / windowScaleFactor)) {
+        sketch.exit();
+      }
+      if (mx < 0 || sketchWidth < mx || my < 0 || sketchHeight < my) {
+        return;
+      }
+    }
 
-        int peCount = 0;
-        if (peAction == MouseEvent.WHEEL) {
-            // Invert wheel rotation count so it matches JAVA2D's
-            // https://github.com/processing/processing/issues/3840
-            peCount = -(nativeEvent.isShiftDown() ? (int) nativeEvent.getRotation()[0]
-                    : (int) nativeEvent.getRotation()[1]);
-        } else {
-            peCount = nativeEvent.getClickCount();
-        }
+    MouseEvent me = new MouseEvent(nativeEvent, nativeEvent.getWhen(),
+                                   peAction, modifiers,
+                                   mx, my,
+                                   peButton,
+                                   peCount);
+
+    sketch.postEvent(me);
+  }
+
+
+  protected void nativeKeyEvent(com.jogamp.newt.event.KeyEvent nativeEvent,
+                                int peAction) {
+    int modifiers = nativeEvent.getModifiers();
+//    int peModifiers = nativeEvent.getModifiers() &
+//                      (InputEvent.SHIFT_MASK |
+//                       InputEvent.CTRL_MASK |
+//                       InputEvent.META_MASK |
+//                       InputEvent.ALT_MASK);
+
+    short code = nativeEvent.getKeyCode();
+    char keyChar;
+    int keyCode;
+    if (isPCodedKey(code)) {
+      keyCode = mapToPConst(code);
+      keyChar = PConstants.CODED;
+    } else if (isHackyKey(code)) {
+      // we can return only one char for ENTER, let it be \n everywhere
+      keyCode = code == com.jogamp.newt.event.KeyEvent.VK_ENTER ?
+          PConstants.ENTER : code;
+      keyChar = hackToChar(code, nativeEvent.getKeyChar());
+    } else {
+      keyCode = code;
+      keyChar = nativeEvent.getKeyChar();
+    }
 
-        int scale;
-        if (PApplet.platform == PConstants.MACOSX) {
-            scale = (int) getCurrentPixelScale();
-        } else {
-            scale = (int) getPixelScale();
-        }
-        int sx = nativeEvent.getX() / scale;
-        int sy = nativeEvent.getY() / scale;
-        int mx = sx;
-        int my = sy;
-
-        if (pgl.presentMode()) {
-            mx -= (int) pgl.presentX;
-            my -= (int) pgl.presentY;
-            if (peAction == KeyEvent.RELEASE
-                    && pgl.insideStopButton(sx, sy - screenRect.height / windowScaleFactor)) {
-                sketch.exit();
-            }
-            if (mx < 0 || sketchWidth < mx || my < 0 || sketchHeight < my) {
-                return;
-            }
-        }
+    // From http://jogamp.org/deployment/v2.1.0/javadoc/jogl/javadoc/com/jogamp/newt/event/KeyEvent.html
+    // public final short getKeySymbol()
+    // Returns the virtual key symbol reflecting the current keyboard layout.
+    // public final short getKeyCode()
+    // Returns the virtual key code using a fixed mapping to the US keyboard layout.
+    // In contrast to key symbol, key code uses a fixed US keyboard layout and therefore is keyboard layout independent.
+    // E.g. virtual key code VK_Y denotes the same physical key regardless whether keyboard layout QWERTY or QWERTZ is active. The key symbol of the former is VK_Y, where the latter produces VK_Y.
+    KeyEvent ke = new KeyEvent(nativeEvent, nativeEvent.getWhen(),
+                               peAction, modifiers,
+                               keyChar,
+                               keyCode,
+                               nativeEvent.isAutoRepeat());
+
+    sketch.postEvent(ke);
+
+    if (!isPCodedKey(code) && !isHackyKey(code)) {
+      if (peAction == KeyEvent.PRESS) {
+        // Create key typed event
+        // TODO: combine dead keys with the following key
+        KeyEvent tke = new KeyEvent(nativeEvent, nativeEvent.getWhen(),
+                                    KeyEvent.TYPE, modifiers,
+                                    keyChar,
+                                    0,
+                                    nativeEvent.isAutoRepeat());
+
+        sketch.postEvent(tke);
+      }
+    }
+  }
+
+
+  private static boolean isPCodedKey(short code) {
+    return code == com.jogamp.newt.event.KeyEvent.VK_UP ||
+           code == com.jogamp.newt.event.KeyEvent.VK_DOWN ||
+           code == com.jogamp.newt.event.KeyEvent.VK_LEFT ||
+           code == com.jogamp.newt.event.KeyEvent.VK_RIGHT ||
+           code == com.jogamp.newt.event.KeyEvent.VK_ALT ||
+           code == com.jogamp.newt.event.KeyEvent.VK_CONTROL ||
+           code == com.jogamp.newt.event.KeyEvent.VK_SHIFT ||
+           code == com.jogamp.newt.event.KeyEvent.VK_WINDOWS;
+  }
+
+
+  // Why do we need this mapping?
+  // Relevant discussion and links here:
+  // http://forum.jogamp.org/Newt-wrong-keycode-for-key-td4033690.html#a4033697
+  // (I don't think this is a complete solution).
+  private static int mapToPConst(short code) {
+    switch (code) {
+      case com.jogamp.newt.event.KeyEvent.VK_UP:
+        return PConstants.UP;
+      case com.jogamp.newt.event.KeyEvent.VK_DOWN:
+        return PConstants.DOWN;
+      case com.jogamp.newt.event.KeyEvent.VK_LEFT:
+        return PConstants.LEFT;
+      case com.jogamp.newt.event.KeyEvent.VK_RIGHT:
+        return PConstants.RIGHT;
+      case com.jogamp.newt.event.KeyEvent.VK_ALT:
+        return PConstants.ALT;
+      case com.jogamp.newt.event.KeyEvent.VK_CONTROL:
+        return PConstants.CONTROL;
+      case com.jogamp.newt.event.KeyEvent.VK_SHIFT:
+        return PConstants.SHIFT;
+      case com.jogamp.newt.event.KeyEvent.VK_WINDOWS:
+        return java.awt.event.KeyEvent.VK_META;
+      default:
+        return code;
+    }
+  }
 
-        MouseEvent me = new MouseEvent(nativeEvent, nativeEvent.getWhen(),
-                peAction, peModifiers,
-                mx, my,
-                peButton,
-                peCount);
-
-        sketch.postEvent(me);
-    }
-
-    protected void nativeKeyEvent(com.jogamp.newt.event.KeyEvent nativeEvent,
-            int peAction) {
-        int peModifiers = nativeEvent.getModifiers()
-                & (InputEvent.SHIFT_MASK
-                | InputEvent.CTRL_MASK
-                | InputEvent.META_MASK
-                | InputEvent.ALT_MASK);
-
-        short code = nativeEvent.getKeyCode();
-        char keyChar;
-        int keyCode;
-        if (isPCodedKey(code)) {
-            keyCode = mapToPConst(code);
-            keyChar = PConstants.CODED;
-        } else if (isHackyKey(code)) {
-            // we can return only one char for ENTER, let it be \n everywhere
-            keyCode = code == com.jogamp.newt.event.KeyEvent.VK_ENTER
-                    ? PConstants.ENTER : code;
-            keyChar = hackToChar(code, nativeEvent.getKeyChar());
-        } else {
-            keyCode = code;
-            keyChar = nativeEvent.getKeyChar();
-        }
 
-        // From http://jogamp.org/deployment/v2.1.0/javadoc/jogl/javadoc/com/jogamp/newt/event/KeyEvent.html
-        // public final short getKeySymbol()
-        // Returns the virtual key symbol reflecting the current keyboard layout.
-        // public final short getKeyCode()
-        // Returns the virtual key code using a fixed mapping to the US keyboard layout.
-        // In contrast to key symbol, key code uses a fixed US keyboard layout and therefore is keyboard layout independent.
-        // E.g. virtual key code VK_Y denotes the same physical key regardless whether keyboard layout QWERTY or QWERTZ is active. The key symbol of the former is VK_Y, where the latter produces VK_Y.
-        KeyEvent ke = new KeyEvent(nativeEvent, nativeEvent.getWhen(),
-                peAction, peModifiers,
-                keyChar,
-                keyCode,
-                nativeEvent.isAutoRepeat());
-
-        sketch.postEvent(ke);
-
-        if (!isPCodedKey(code) && !isHackyKey(code)) {
-            if (peAction == KeyEvent.PRESS) {
-                // Create key typed event
-                // TODO: combine dead keys with the following key
-                KeyEvent tke = new KeyEvent(nativeEvent, nativeEvent.getWhen(),
-                        KeyEvent.TYPE, peModifiers,
-                        keyChar,
-                        0,
-                        nativeEvent.isAutoRepeat());
-
-                sketch.postEvent(tke);
-            }
-        }
+  private static boolean isHackyKey(short code) {
+    switch (code) {
+      case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
+      case com.jogamp.newt.event.KeyEvent.VK_TAB:
+      case com.jogamp.newt.event.KeyEvent.VK_ENTER:
+      case com.jogamp.newt.event.KeyEvent.VK_ESCAPE:
+      case com.jogamp.newt.event.KeyEvent.VK_DELETE:
+        return true;
     }
-
-    private static boolean isPCodedKey(short code) {
-        return code == com.jogamp.newt.event.KeyEvent.VK_UP
-                || code == com.jogamp.newt.event.KeyEvent.VK_DOWN
-                || code == com.jogamp.newt.event.KeyEvent.VK_LEFT
-                || code == com.jogamp.newt.event.KeyEvent.VK_RIGHT
-                || code == com.jogamp.newt.event.KeyEvent.VK_ALT
-                || code == com.jogamp.newt.event.KeyEvent.VK_CONTROL
-                || code == com.jogamp.newt.event.KeyEvent.VK_SHIFT
-                || code == com.jogamp.newt.event.KeyEvent.VK_WINDOWS;
-    }
-
-    // Why do we need this mapping?
-    // Relevant discussion and links here:
-    // http://forum.jogamp.org/Newt-wrong-keycode-for-key-td4033690.html#a4033697
-    // (I don't think this is a complete solution).
-    private static int mapToPConst(short code) {
-        switch (code) {
-            case com.jogamp.newt.event.KeyEvent.VK_UP:
-                return PConstants.UP;
-            case com.jogamp.newt.event.KeyEvent.VK_DOWN:
-                return PConstants.DOWN;
-            case com.jogamp.newt.event.KeyEvent.VK_LEFT:
-                return PConstants.LEFT;
-            case com.jogamp.newt.event.KeyEvent.VK_RIGHT:
-                return PConstants.RIGHT;
-            case com.jogamp.newt.event.KeyEvent.VK_ALT:
-                return PConstants.ALT;
-            case com.jogamp.newt.event.KeyEvent.VK_CONTROL:
-                return PConstants.CONTROL;
-            case com.jogamp.newt.event.KeyEvent.VK_SHIFT:
-                return PConstants.SHIFT;
-            case com.jogamp.newt.event.KeyEvent.VK_WINDOWS:
-                return java.awt.event.KeyEvent.VK_META;
-            default:
-                return code;
-        }
+    return false;
+  }
+
+
+  private static char hackToChar(short code, char def) {
+    switch (code) {
+      case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
+        return PConstants.BACKSPACE;
+      case com.jogamp.newt.event.KeyEvent.VK_TAB:
+        return PConstants.TAB;
+      case com.jogamp.newt.event.KeyEvent.VK_ENTER:
+        return PConstants.ENTER;
+      case com.jogamp.newt.event.KeyEvent.VK_ESCAPE:
+        return PConstants.ESC;
+      case com.jogamp.newt.event.KeyEvent.VK_DELETE:
+        return PConstants.DELETE;
     }
+    return def;
+  }
 
-    private static boolean isHackyKey(short code) {
-        switch (code) {
-            case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
-            case com.jogamp.newt.event.KeyEvent.VK_TAB:
-            case com.jogamp.newt.event.KeyEvent.VK_ENTER:
-            case com.jogamp.newt.event.KeyEvent.VK_ESCAPE:
-            case com.jogamp.newt.event.KeyEvent.VK_DELETE:
-                return true;
-        }
-        return false;
-    }
-
-    private static char hackToChar(short code, char def) {
-        switch (code) {
-            case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
-                return PConstants.BACKSPACE;
-            case com.jogamp.newt.event.KeyEvent.VK_TAB:
-                return PConstants.TAB;
-            case com.jogamp.newt.event.KeyEvent.VK_ENTER:
-                return PConstants.ENTER;
-            case com.jogamp.newt.event.KeyEvent.VK_ESCAPE:
-                return PConstants.ESC;
-            case com.jogamp.newt.event.KeyEvent.VK_DELETE:
-                return PConstants.DELETE;
-        }
-        return def;
-    }
 
-    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-    class CursorInfo {
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-        PImage image;
-        int x, y;
 
-        CursorInfo(PImage image, int x, int y) {
-            this.image = image;
-            this.x = x;
-            this.y = y;
-        }
+  class CursorInfo {
+    PImage image;
+    int x, y;
 
-        void set() {
-            setCursor(image, x, y);
-        }
+    CursorInfo(PImage image, int x, int y) {
+      this.image = image;
+      this.x = x;
+      this.y = y;
     }
 
-    static Map<Integer, CursorInfo> cursors = new HashMap<>();
-    static Map<Integer, String> cursorNames = new HashMap<>();
-
-    static {
-        cursorNames.put(PConstants.ARROW, "arrow");
-        cursorNames.put(PConstants.CROSS, "cross");
-        cursorNames.put(PConstants.WAIT, "wait");
-        cursorNames.put(PConstants.MOVE, "move");
-        cursorNames.put(PConstants.HAND, "hand");
-        cursorNames.put(PConstants.TEXT, "text");
+    void set() {
+      setCursor(image, x, y);
     }
+  }
 
-    public void setCursor(int kind) {
-        if (!cursorNames.containsKey(kind)) {
-            PGraphics.showWarning("Unknown cursor type: " + kind);
-            return;
-        }
-        CursorInfo cursor = cursors.get(kind);
-        if (cursor == null) {
-            String name = cursorNames.get(kind);
-            if (name != null) {
-                ImageIcon icon
-                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
-                PImage img = new PImage(icon.getImage());
-                // Most cursors just use the center as the hotspot...
-                int x = img.width / 2;
-                int y = img.height / 2;
-                // ...others are more specific
-                if (kind == PConstants.ARROW) {
-                    x = 10;
-                    y = 7;
-                } else if (kind == PConstants.HAND) {
-                    x = 12;
-                    y = 8;
-                } else if (kind == PConstants.TEXT) {
-                    x = 16;
-                    y = 22;
-                }
-                cursor = new CursorInfo(img, x, y);
-                cursors.put(kind, cursor);
-            }
-        }
-        if (cursor != null) {
-            cursor.set();
-        } else {
-            PGraphics.showWarning("Cannot load cursor type: " + kind);
-        }
-    }
+  static Map<Integer, CursorInfo> cursors = new HashMap<>();
+  static Map<Integer, String> cursorNames = Map.of(
+    PConstants.ARROW, "arrow",
+    PConstants.CROSS, "cross",
+    PConstants.WAIT, "wait",
+    PConstants.MOVE, "move",
+    PConstants.HAND, "hand",
+    PConstants.TEXT, "text"
+  );
 
-    public void setCursor(PImage image, int hotspotX, int hotspotY) {
-        Display disp = window.getScreen().getDisplay();
-        BufferedImage bimg = (BufferedImage) image.getNative();
-        DataBufferInt dbuf = (DataBufferInt) bimg.getData().getDataBuffer();
-        int[] ipix = dbuf.getData();
-        ByteBuffer pixels = ByteBuffer.allocate(ipix.length * 4);
-        pixels.asIntBuffer().put(ipix);
-        PixelFormat format = PixelFormat.ARGB8888;
-        final Dimension size = new Dimension(bimg.getWidth(), bimg.getHeight());
-        PixelRectangle pixelrect = new PixelRectangle.GenericPixelRect(format, size, 0, false, pixels);
-        final PointerIcon pi = disp.createPointerIcon(pixelrect, hotspotX, hotspotY);
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setPointerVisible(true);
-                window.setPointerIcon(pi);
-            }
-        });
-    }
 
-    public void showCursor() {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setPointerVisible(true);
-            }
-        });
-    }
 
-    public void hideCursor() {
-        display.getEDTUtil().invoke(false, new Runnable() {
-            @Override
-            public void run() {
-                window.setPointerVisible(false);
-            }
-        });
+  @Override
+  public void setCursor(int kind) {
+    if (!cursorNames.containsKey(kind)) {
+      PGraphics.showWarning("Unknown cursor type: " + kind);
+      return;
+    }
+    CursorInfo cursor = cursors.get(kind);
+    if (cursor == null) {
+      String name = cursorNames.get(kind);
+      if (name != null) {
+        ImageIcon icon =
+          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+        PImage img = new PImageAWT(icon.getImage());
+        // Most cursors just use the center as the hotspot...
+        int x = img.width / 2;
+        int y = img.height / 2;
+        // ...others are more specific
+        switch (kind) {
+          case PConstants.ARROW:
+            x = 10;
+            y = 7;
+            break;
+          case PConstants.HAND:
+            x = 12;
+            y = 8;
+            break;
+          case PConstants.TEXT:
+            x = 16;
+            y = 22;
+            break;
+          default:
+            break;
+        }
+        cursor = new CursorInfo(img, x, y);
+        cursors.put(kind, cursor);
+      }
+    }
+    if (cursor != null) {
+      cursor.set();
+    } else {
+      PGraphics.showWarning("Cannot load cursor type: " + kind);
     }
+  }
+
+
+  @Override
+  public void setCursor(PImage image, int hotspotX, int hotspotY) {
+    Display disp = window.getScreen().getDisplay();
+    BufferedImage bimg = (BufferedImage)image.getNative();
+    DataBufferInt dbuf = (DataBufferInt)bimg.getData().getDataBuffer();
+    int[] ipix = dbuf.getData();
+    ByteBuffer pixels = ByteBuffer.allocate(ipix.length * 4);
+    pixels.asIntBuffer().put(ipix);
+    PixelFormat format = PixelFormat.ARGB8888;
+    final Dimension size = new Dimension(bimg.getWidth(), bimg.getHeight());
+    PixelRectangle pixelrect = new PixelRectangle.GenericPixelRect(format, size, 0, false, pixels);
+    final PointerIcon pi = disp.createPointerIcon(pixelrect, hotspotX, hotspotY);
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(true);
+      window.setPointerIcon(pi);
+    });
+  }
+
+
+  @Override
+  public void showCursor() {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(true);
+    });
+  }
+
+
+  @Override
+  public void hideCursor() {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(false);
+    });
+  }
+
+
+  @Override
+  public boolean openLink(String url) {
+    return ShimAWT.openLink(url);
+  }
 }