propane 3.5.0-java → 3.6.0-java

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

@@ -1,6 +1,6 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
- /*
+/*
   Part of the Processing project - http://processing.org
 
   Copyright (c) 2012-15 The Processing Foundation
@@ -20,7 +20,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.opengl;
 
 import java.awt.Component;
@@ -78,11 +79,9 @@ import processing.awt.PImageAWT;
 // have this removed by 4.0 final
 import processing.awt.ShimAWT;
 
-public class PSurfaceJOGL implements PSurface {
 
-  /**
-   * Selected GL profile
-   */
+public class PSurfaceJOGL implements PSurface {
+  /** Selected GL profile */
   public static GLProfile profile;
 
   public PJOGL pgl;
@@ -115,9 +114,10 @@ public class PSurfaceJOGL implements PSurface {
 
   protected boolean external = false;
 
+
   public PSurfaceJOGL(PGraphics graphics) {
     this.graphics = graphics;
-    this.pgl = (PJOGL) ((PGraphicsOpenGL) graphics).pgl;
+    this.pgl = (PJOGL) ((PGraphicsOpenGL)graphics).pgl;
   }
 
 
@@ -132,70 +132,63 @@ public class PSurfaceJOGL implements PSurface {
   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) {
+                          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);
-      }
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
 
       ShimAWT.selectImpl(prompt, callbackMethod, file,
-        callbackObject, null, FileDialog.LOAD);
+                         callbackObject, null, FileDialog.LOAD);
 
-      if (hide) {
-        setVisible(true);
-      }
+      if (hide) setVisible(true);
     });
   }
 
+
   @Override
   public void selectOutput(String prompt, String callbackMethod,
-    File file, Object callbackObject) {
+                           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);
-      }
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
 
       ShimAWT.selectImpl(prompt, callbackMethod, file,
-        callbackObject, null, FileDialog.SAVE);
+                         callbackObject, null, FileDialog.SAVE);
 
-      if (hide) {
-        setVisible(true);
-      }
+      if (hide) setVisible(true);
     });
   }
 
+
   @Override
   public void selectFolder(String prompt, String callbackMethod,
-    File file, Object callbackObject) {
+                           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);
-      }
-
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+      
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-
-      if (hide) {
-        setVisible(true);
-      }
+      
+      if (hide) setVisible(true);
     });
   }
 
@@ -213,6 +206,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @Override
   public void initFrame(PApplet sketch) {
     this.sketch = sketch;
@@ -225,11 +219,13 @@ public class PSurfaceJOGL implements PSurface {
     initAnimator();
   }
 
+
   @Override
   public Object getNative() {
     return window;
   }
 
+
   protected void initDisplay() {
     display = NewtFactory.createDisplay(null);
     display.addReference();
@@ -243,12 +239,12 @@ public class PSurfaceJOGL implements PSurface {
     int displayNum = sketch.sketchDisplay();
     if (displayNum > 0) {  // if -1, use the default device
       if (displayNum <= awtDevices.length) {
-        awtDisplayDevice = awtDevices[displayNum - 1];
+        awtDisplayDevice = awtDevices[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 < awtDevices.length; i++) {
-          System.err.format("Display %d is %s%n", i + 1, awtDevices[i]);
+          System.err.format("Display %d is %s%n", i+1, awtDevices[i]);
         }
       }
     } else if (0 < awtDevices.length) {
@@ -263,53 +259,48 @@ public class PSurfaceJOGL implements PSurface {
     displayRect = config.getBounds();
   }
 
+
   protected void initGL() {
 //  System.out.println("*******************************");
     if (profile == null) {
       switch (PJOGL.profile) {
         case 1:
           try {
-          profile = GLProfile.getGL2ES1();
-        } catch (GLException ex) {
-          profile = GLProfile.getMaxFixedFunc(true);
-        }
-        break;
+            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;
+            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;
+            
+          } 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;
+            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;
+            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);
       }
@@ -323,6 +314,7 @@ public class PSurfaceJOGL implements PSurface {
 
 //  caps.setPBuffer(false);
 //  caps.setFBO(false);
+
 //    pgl.reqNumSamples = PGL.smoothToSamples(graphics.smooth);
     caps.setSampleBuffers(true);
     caps.setNumSamples(PGL.smoothToSamples(graphics.smooth));
@@ -331,6 +323,7 @@ public class PSurfaceJOGL implements PSurface {
     pgl.setCaps(caps);
   }
 
+
   protected void initWindow() {
     window = GLWindow.create(screen, pgl.getCaps());
 
@@ -346,15 +339,16 @@ public class PSurfaceJOGL implements PSurface {
 //    } else {
 //      window = GLWindow.create(displayDevice.getScreen(), pgl.getCaps());
 //    }
-    windowScaleFactor = PApplet.platform == PConstants.MACOS
-      ? 1 : sketch.pixelDensity;
+
+    windowScaleFactor = PApplet.platform == PConstants.MACOS ?
+        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());
+    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());
 
     // Set the displayWidth/Height variables inside PApplet, so that they're
     // usable and can even be returned by the sketchWidth()/Height() methods.
@@ -381,7 +375,8 @@ 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();
 //    System.out.println("init: " + sketchWidth + " " + sketchHeight);
@@ -399,7 +394,7 @@ public class PSurfaceJOGL implements PSurface {
       fullScreen = true;
       sketch.fullScreen();
     }
-     */
+    */
 
     if (fullScreen || spanDisplays) {
       sketchWidth = screenRect.width / windowScaleFactor;
@@ -410,13 +405,13 @@ public class PSurfaceJOGL implements PSurface {
 
     float[] reqSurfacePixelScale;
     if (graphics.is2X() && PApplet.platform == PConstants.MACOS) {
-      // Retina
-      reqSurfacePixelScale = new float[]{ScalableSurface.AUTOMAX_PIXELSCALE,
-        ScalableSurface.AUTOMAX_PIXELSCALE};
+       // Retina
+       reqSurfacePixelScale = new float[] { ScalableSurface.AUTOMAX_PIXELSCALE,
+                                            ScalableSurface.AUTOMAX_PIXELSCALE };
     } else {
       // Non-retina
-      reqSurfacePixelScale = new float[]{ScalableSurface.IDENTITY_PIXELSCALE,
-        ScalableSurface.IDENTITY_PIXELSCALE};
+      reqSurfacePixelScale = new float[] { ScalableSurface.IDENTITY_PIXELSCALE,
+                                           ScalableSurface.IDENTITY_PIXELSCALE };
     }
     window.setSurfaceScale(reqSurfacePixelScale);
     window.setSize(sketchWidth * windowScaleFactor, sketchHeight * windowScaleFactor);
@@ -434,6 +429,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   protected void initListeners() {
     NEWTMouseListener mouseListener = new NEWTMouseListener();
     window.addMouseListener(mouseListener);
@@ -446,6 +442,7 @@ public class PSurfaceJOGL implements PSurface {
     window.addGLEventListener(drawlistener);
   }
 
+
   protected void initAnimator() {
     if (PApplet.platform == PConstants.WINDOWS) {
       // Force Windows to keep timer resolution high by
@@ -455,8 +452,7 @@ public class PSurfaceJOGL implements PSurface {
       Thread highResTimerThread = new Thread(() -> {
         try {
           Thread.sleep(Long.MAX_VALUE);
-        } catch (InterruptedException ignore) {
-        }
+        } catch (InterruptedException ignore) { }
       }, "HighResTimerThread");
       highResTimerThread.setDaemon(true);
       highResTimerThread.start();
@@ -500,6 +496,7 @@ public class PSurfaceJOGL implements PSurface {
     drawExceptionHandler.start();
   }
 
+
   @Override
   public void setTitle(final String title) {
     display.getEDTUtil().invoke(false, () -> {
@@ -507,6 +504,7 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void setVisible(final boolean visible) {
     display.getEDTUtil().invoke(false, () -> {
@@ -514,6 +512,7 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void setResizable(final boolean resizable) {
     display.getEDTUtil().invoke(false, () -> {
@@ -521,12 +520,14 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void setIcon(PImage icon) {
-    PGraphics.showWarning("Window icons for OpenGL sketches can only be set in settings()\n"
-      + "using PJOGL.setIcon(filename).");
+    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, () -> {
@@ -534,18 +535,19 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   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};
+      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);
+         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];
@@ -554,12 +556,13 @@ public class PSurfaceJOGL implements PSurface {
       }
 
       res = new ClassResources(iconImages,
-        sketch.getClass().getClassLoader(),
-        sketch.getClass());
+                               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
@@ -585,21 +588,17 @@ public class PSurfaceJOGL implements PSurface {
           //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.");
+            throw new RuntimeException("This file is named " +
+                                       filenameActual + " not " +
+                                       filename + ". Rename the file " +
+                                       "or change your code.");
           }
-        } catch (IOException e) {
-        }
+        } catch (IOException e) { }
       }
 
       stream = new FileInputStream(file);
-      if (stream != null) {
-        stream.close();
-        return file.getCanonicalPath();
-      }
-
+      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) {
@@ -634,8 +633,7 @@ public class PSurfaceJOGL implements PSurface {
           return filename;
         }
       }
-    } catch (IOException e) {
-    }
+    } catch (IOException e) { }
 
     try {
       // attempt to load from a local file, used when running as
@@ -644,34 +642,25 @@ public class PSurfaceJOGL implements PSurface {
         try {
           String path = sketch.dataPath(filename);
           stream = new FileInputStream(path);
-          if (stream != null) {
-            stream.close();
-            return path;
-          }
-        } catch (IOException e2) {
-        }
+          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 (IOException e) {
-        }  // ignored
+          stream.close();
+          return path;
+        } catch (IOException e) { }  // ignored
 
         try {
           stream = new FileInputStream(filename);
-          if (stream != null) {
-            stream.close();
-            return filename;
-          }
-        } catch (IOException e1) {
-        }
+          stream.close();
+          return filename;
+        
+        } catch (IOException e1) { }
 
-      } catch (SecurityException se) {
-      }  // online, whups
+      } catch (SecurityException se) { }  // online, whups
 
     } catch (Exception e) {
       //die(e.getMessage(), e);
@@ -681,6 +670,7 @@ public class PSurfaceJOGL implements PSurface {
     return "";
   }
 
+
   @Override
   public void placeWindow(int[] location, int[] editorLocation) {
 
@@ -717,19 +707,19 @@ 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);
+                                 screenRect.y + (screenRect.height - sketchHeight) / 2);
     }
 
     Point frameLoc = new Point(x, y);
@@ -740,11 +730,12 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @Override
   public void placePresent(int stopColor) {
     float scale = getPixelScale();
-    pgl.initPresentMode(0.5f * (screenRect.width / scale - sketchWidth),
-      0.5f * (screenRect.height / scale - sketchHeight), stopColor);
+    pgl.initPresentMode(0.5f * (screenRect.width/scale - sketchWidth),
+                        0.5f * (screenRect.height/scale - sketchHeight), stopColor);
     PApplet.hideMenuBar();
 
     window.setUndecorated(true);
@@ -752,11 +743,13 @@ public class PSurfaceJOGL implements PSurface {
     window.setTopLevelSize((int) displayRect.getWidth(), (int) displayRect.getHeight());
   }
 
+
   @Override
   public void setupExternalMessages() {
     external = true;
   }
 
+
   @Override
   public void startThread() {
     if (animator != null) {
@@ -764,12 +757,15 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
+  @Override
   public void pauseThread() {
     if (animator != null) {
       animator.pause();
     }
   }
 
+
   @Override
   public void resumeThread() {
     if (animator != null) {
@@ -777,6 +773,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @Override
   public boolean stopThread() {
     if (drawExceptionHandler != null) {
@@ -790,6 +787,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @Override
   public boolean isStopped() {
     if (animator != null) {
@@ -799,6 +797,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @Override
   public void setLocation(final int x, final int y) {
     display.getEDTUtil().invoke(false, () -> {
@@ -806,11 +805,10 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void setSize(int wide, int high) {
-    if (pgl.presentMode()) {
-      return;
-    }
+    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.
@@ -835,6 +833,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   public float getPixelScale() {
     if (graphics.pixelDensity == 1) {
       return 1;
@@ -854,10 +853,12 @@ public class PSurfaceJOGL implements PSurface {
     return currentPixelScale[0];
   }
 
+
   public Component getComponent() {
     return canvas;
   }
 
+
   public void setSmooth(int level) {
     pgl.reqNumSamples = level;
     GLCapabilities caps = new GLCapabilities(profile);
@@ -873,35 +874,37 @@ public class PSurfaceJOGL implements PSurface {
     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.");
+        "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.");
+        "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);
+      animator.setFPS((int)fps);
       pgl.setFps(fps);
       animator.start();
     }
   }
 
+
   public void requestFocus() {
     display.getEDTUtil().invoke(false, () -> {
       window.requestFocus();
     });
   }
 
-  class DrawListener implements GLEventListener {
 
+  class DrawListener implements GLEventListener {
     @Override
     public void display(GLAutoDrawable drawable) {
       if (display.getEDTUtil().isCurrentThreadEDT()) {
@@ -939,12 +942,10 @@ public class PSurfaceJOGL implements PSurface {
         sketch.exitActual();
       }
     }
-
     @Override
     public void dispose(GLAutoDrawable drawable) {
 //      sketch.dispose();
     }
-
     @Override
     public void init(GLAutoDrawable drawable) {
       pgl.getGL(drawable);
@@ -953,9 +954,9 @@ public class PSurfaceJOGL implements PSurface {
 
       int c = graphics.backgroundColor;
       pgl.clearColor(((c >> 16) & 0xff) / 255f,
-        ((c >> 8) & 0xff) / 255f,
-        ((c) & 0xff) / 255f,
-        ((c >> 24) & 0xff) / 255f);
+                     ((c >>  8) & 0xff) / 255f,
+                     ((c) & 0xff) / 255f,
+                     ((c >> 24) & 0xff) / 255f);
       pgl.clear(PGL.COLOR_BUFFER_BIT);
     }
 
@@ -963,18 +964,17 @@ public class PSurfaceJOGL implements PSurface {
     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();
+      float scale = PApplet.platform == PConstants.MACOS ?
+          getCurrentPixelScale() : getPixelScale();
       setSize((int) (w / scale), (int) (h / scale));
     }
   }
 
-  protected class NEWTWindowListener implements com.jogamp.newt.event.WindowListener {
 
+  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;
@@ -1013,49 +1013,41 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   // 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");
@@ -1063,30 +1055,28 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   // 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) {
+    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 peAction) {
     int modifiers = nativeEvent.getModifiers();
     /*
     int peModifiers = modifiers &
@@ -1113,8 +1103,8 @@ public class PSurfaceJOGL implements PSurface {
     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]);
+      peCount = -(nativeEvent.isShiftDown() ? (int)nativeEvent.getRotation()[0]:
+                                              (int)nativeEvent.getRotation()[1]);
     } else {
       peCount = nativeEvent.getClickCount();
     }
@@ -1131,10 +1121,10 @@ public class PSurfaceJOGL implements PSurface {
     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)) {
+      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) {
@@ -1143,16 +1133,17 @@ public class PSurfaceJOGL implements PSurface {
     }
 
     MouseEvent me = new MouseEvent(nativeEvent, nativeEvent.getWhen(),
-      peAction, modifiers,
-      mx, my,
-      peButton,
-      peCount);
+                                   peAction, modifiers,
+                                   mx, my,
+                                   peButton,
+                                   peCount);
 
     sketch.postEvent(me);
   }
 
+
   protected void nativeKeyEvent(com.jogamp.newt.event.KeyEvent nativeEvent,
-    int peAction) {
+                                int peAction) {
     int modifiers = nativeEvent.getModifiers();
 //    int peModifiers = nativeEvent.getModifiers() &
 //                      (InputEvent.SHIFT_MASK |
@@ -1168,8 +1159,8 @@ public class PSurfaceJOGL implements PSurface {
       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;
+      keyCode = code == com.jogamp.newt.event.KeyEvent.VK_ENTER ?
+          PConstants.ENTER : code;
       keyChar = hackToChar(code, nativeEvent.getKeyChar());
     } else {
       keyCode = code;
@@ -1184,10 +1175,10 @@ public class PSurfaceJOGL implements PSurface {
     // 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());
+                               peAction, modifiers,
+                               keyChar,
+                               keyCode,
+                               nativeEvent.isAutoRepeat());
 
     sketch.postEvent(ke);
 
@@ -1196,27 +1187,29 @@ public class PSurfaceJOGL implements PSurface {
         // 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());
+                                    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;
+    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
@@ -1244,6 +1237,7 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   private static boolean isHackyKey(short code) {
     switch (code) {
       case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
@@ -1256,6 +1250,7 @@ public class PSurfaceJOGL implements PSurface {
     return false;
   }
 
+
   private static char hackToChar(short code, char def) {
     switch (code) {
       case com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE:
@@ -1272,9 +1267,11 @@ public class PSurfaceJOGL implements PSurface {
     return def;
   }
 
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-  class CursorInfo {
 
+
+  class CursorInfo {
     PImage image;
     int x, y;
 
@@ -1299,6 +1296,8 @@ public class PSurfaceJOGL implements PSurface {
     PConstants.TEXT, "text"
   );
 
+
+
   @Override
   public void setCursor(int kind) {
     if (!cursorNames.containsKey(kind)) {
@@ -1309,8 +1308,8 @@ public class PSurfaceJOGL implements PSurface {
     if (cursor == null) {
       String name = cursorNames.get(kind);
       if (name != null) {
-        ImageIcon icon
-          = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+        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;
@@ -1343,11 +1342,12 @@ public class PSurfaceJOGL implements PSurface {
     }
   }
 
+
   @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();
+    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);
@@ -1361,6 +1361,7 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void showCursor() {
     display.getEDTUtil().invoke(false, () -> {
@@ -1368,6 +1369,7 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public void hideCursor() {
     display.getEDTUtil().invoke(false, () -> {
@@ -1375,6 +1377,7 @@ public class PSurfaceJOGL implements PSurface {
     });
   }
 
+
   @Override
   public boolean openLink(String url) {
     return ShimAWT.openLink(url);