From 24d30eec425ca6c62f72e7c218a9149777dbec52 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 3 Oct 2015 12:05:37 +0200
Subject: Bug 1238 - Fix NPE for Window-Icon's PNGPixelRect for unresolved
 location; Bug 1199 - Add setting to disable default window icons

Bug 1238 - Fix NPE for Window-Icon's PNGPixelRect for unresolved location, i.e. null URLConnections

Testing w/ jogl/make/scripts/tests.sh USE_BUILDDIR=1,
discloses this issue - since the icons are available in jar only.

Handling all unresolved resources, i.e. null URLConnection,
is required.

Further more, the icon list passed via property 'newt.window.icons'
shall be separated by comma as well.
This allows passing the list via scripts more conveniently.
  -Dnewt.window.icons="newt/data/jogamp-16x16.png,newt/data/jogamp-32x32.png"

+++

Bug 1199 - Add setting to disable default window icons

This patch also allows disabling JogAmp's own window icons
by simply defining a non-existing location, i.e.
  -Dnewt.window.icons="null,null"
---
 src/newt/classes/com/jogamp/newt/NewtFactory.java  |  4 +-
 src/newt/classes/com/jogamp/newt/Window.java       | 14 +++--
 .../newt/driver/bcm/vc/iv/DisplayDriver.java       | 10 +++-
 .../jogamp/newt/driver/macosx/DisplayDriver.java   |  4 +-
 .../jogamp/newt/driver/opengl/JoglUtilPNGIcon.java | 62 +++++++++++++---------
 .../jogamp/newt/driver/windows/DisplayDriver.java  | 14 +++--
 6 files changed, 68 insertions(+), 40 deletions(-)

(limited to 'src/newt/classes')

diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java
index f7b5a1340..dd15eb3ea 100644
--- a/src/newt/classes/com/jogamp/newt/NewtFactory.java
+++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java
@@ -68,7 +68,7 @@ public class NewtFactory {
                 NativeWindowFactory.initSingleton(); // last resort ..
                 {
                     /** See API Doc in {@link Window} ! */
-                    final String[] paths = PropertyAccess.getProperty("newt.window.icons", true, sysPaths).split("\\s");
+                    final String[] paths = PropertyAccess.getProperty("newt.window.icons", true, sysPaths).split("[\\s,]");
                     if( paths.length < 2 ) {
                         throw new IllegalArgumentException("Property 'newt.window.icons' did not specify at least two PNG icons, but "+Arrays.toString(paths));
                     }
@@ -81,7 +81,7 @@ public class NewtFactory {
     /**
      * Returns the application window icon resources to be used.
      * <p>
-     * Property <code>newt.window.icons</code> may define a list of PNG icons separated by a whitespace character.
+     * Property <code>newt.window.icons</code> may define a list of PNG icons separated by one whitespace or one comma character.
      * Shall reference at least two PNG icons, from lower (16x16) to higher (>= 32x32) resolution.
      * </p>
      * <p>
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 1d514d548..30b02cb61 100644
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -83,16 +83,22 @@ import com.jogamp.nativewindow.util.SurfaceSize;
  * <a name="customwindowicons"><h5>Custom Window Icons</h5></a>
  * <p>
  * Custom window icons can be defined via system property <code>newt.window.icons</code>,
- * which shall contain a space separated list of PNG icon locations from low- to high-resolution.
+ * which shall contain a list of PNG icon locations from low- to high-resolution,
+ * separated by one whitespace or one comma character.
  * The location must be resolvable via classpath, i.e. shall reference a location within the jar file.
  * Example (our default):
  * <pre>
- *   -Dnewt.window.icons="newt/data/jogamp-16x16.png newt/data/jogamp-32x32.png"
- *   -Djnlp.newt.window.icons="newt/data/jogamp-16x16.png newt/data/jogamp-32x32.png"
+ *   -Dnewt.window.icons="newt/data/jogamp-16x16.png,newt/data/jogamp-32x32.png"
+ *   -Djnlp.newt.window.icons="newt/data/jogamp-16x16.png,newt/data/jogamp-32x32.png"
  * </pre>
  * The property can also be set programmatically, which must happen before any NEWT classes are <i>touched</i>:
  * <pre>
- *   System.setProperty("newt.window.icons", "newt/data/jogamp-16x16.png newt/data/jogamp-32x32.png");
+ *   System.setProperty("newt.window.icons", "newt/data/jogamp-16x16.png, newt/data/jogamp-32x32.png");
+ * </pre>
+ * To disable even Jogamp's own window icons in favor of system icons,
+ * simply set a non-existing location, e.g.:
+ * <pre>
+ *   -Dnewt.window.icons="null,null"
  * </pre>
  * </p>
  *
diff --git a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
index 715d32ceb..d4af1b972 100644
--- a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
@@ -70,7 +70,9 @@ public class DisplayDriver extends DisplayImpl {
             final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/pointer-grey-alpha-16x24.png" }, DisplayDriver.class.getClassLoader(), null);
             try {
                 final URLConnection urlConn = res.resolve(0);
-                image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                if( null != urlConn ) {
+                    image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                }
             } catch (final Exception e) {
                 e.printStackTrace();
             }
@@ -96,7 +98,11 @@ public class DisplayDriver extends DisplayImpl {
         aDevice = EGLDisplayUtil.eglCreateEGLGraphicsDevice(EGL.EGL_DEFAULT_DISPLAY, AbstractGraphicsDevice.DEFAULT_CONNECTION, AbstractGraphicsDevice.DEFAULT_UNIT);
         aDevice.open();
 
-        defaultPointerIcon = (PointerIconImpl) createPointerIcon(defaultPointerIconImage, 0, 0);
+        if( null != defaultPointerIconImage ) {
+            defaultPointerIcon = (PointerIconImpl) createPointerIcon(defaultPointerIconImage, 0, 0);
+        } else {
+            defaultPointerIcon = null;
+        }
         if( DEBUG_POINTER_ICON ) {
             System.err.println("Display.PointerIcon.createDefault: "+defaultPointerIcon);
         }
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/DisplayDriver.java
index c8146b85d..8ff37872b 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/DisplayDriver.java
@@ -70,7 +70,9 @@ public class DisplayDriver extends DisplayImpl {
                     // NOTE: MUST BE DIRECT BUFFER, since NSBitmapImageRep uses buffer directly!
                     final IOUtil.ClassResources iconRes = NewtFactory.getWindowIcons();
                     final URLConnection urlConn = iconRes.resolve(iconRes.resourceCount()-1);
-                    image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.RGBA8888, true /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                    if( null != urlConn ) {
+                        image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.RGBA8888, true /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                    }
                 } catch (final Exception e) {
                     e.printStackTrace();
                 }
diff --git a/src/newt/classes/jogamp/newt/driver/opengl/JoglUtilPNGIcon.java b/src/newt/classes/jogamp/newt/driver/opengl/JoglUtilPNGIcon.java
index f9f1f13ad..f7d6b9f25 100644
--- a/src/newt/classes/jogamp/newt/driver/opengl/JoglUtilPNGIcon.java
+++ b/src/newt/classes/jogamp/newt/driver/opengl/JoglUtilPNGIcon.java
@@ -46,9 +46,17 @@ public class JoglUtilPNGIcon {
         data_size[0] = 0;
         for(int i=0; i<resources.resourceCount(); i++) {
             final URLConnection urlConn = resources.resolve(i);
-            final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
-            data_size[0] += 2 + image.getSize().getWidth() * image.getSize().getHeight();
-            images[i] = image;
+            if( null != urlConn ) {
+                final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                data_size[0] += 2 + image.getSize().getWidth() * image.getSize().getHeight();
+                images[i] = image;
+            } else {
+                images[i] = null;
+            }
+        }
+        if( 0 == data_size[0] ) {
+            // no image, abort
+            return null;
         }
         final boolean is64Bit = Platform.is64Bit();
         elem_bytesize[0] =  is64Bit ? Buffers.SIZEOF_LONG : Buffers.SIZEOF_INT;
@@ -56,29 +64,31 @@ public class JoglUtilPNGIcon {
 
         for(int i=0; i<images.length; i++) {
             final PNGPixelRect image1 = images[i];
-            final int width = image1.getSize().getWidth();
-            final int height = image1.getSize().getHeight();
-            if( is64Bit ) {
-                buffer.putLong(width);
-                buffer.putLong(height);
-            } else {
-                buffer.putInt(width);
-                buffer.putInt(height);
-            }
-            final ByteBuffer bb = image1.getPixels();
-            final int stride = image1.getStride();
-            for(int y=0; y<height; y++) {
-                int bbOff = y * stride;
-                for(int x=0; x<width; x++) {
-                    long pixel;
-                    pixel  = ( 0xffL & bb.get(bbOff++) );       // B
-                    pixel |= ( 0xffL & bb.get(bbOff++) ) <<  8; // G
-                    pixel |= ( 0xffL & bb.get(bbOff++) ) << 16; // R
-                    pixel |= ( 0xffL & bb.get(bbOff++) ) << 24; // A
-                    if( is64Bit ) {
-                        buffer.putLong(pixel);
-                    } else {
-                        buffer.putInt((int)pixel);
+            if( null != image1 ) {
+                final int width = image1.getSize().getWidth();
+                final int height = image1.getSize().getHeight();
+                if( is64Bit ) {
+                    buffer.putLong(width);
+                    buffer.putLong(height);
+                } else {
+                    buffer.putInt(width);
+                    buffer.putInt(height);
+                }
+                final ByteBuffer bb = image1.getPixels();
+                final int stride = image1.getStride();
+                for(int y=0; y<height; y++) {
+                    int bbOff = y * stride;
+                    for(int x=0; x<width; x++) {
+                        long pixel;
+                        pixel  = ( 0xffL & bb.get(bbOff++) );       // B
+                        pixel |= ( 0xffL & bb.get(bbOff++) ) <<  8; // G
+                        pixel |= ( 0xffL & bb.get(bbOff++) ) << 16; // R
+                        pixel |= ( 0xffL & bb.get(bbOff++) ) << 24; // A
+                        if( is64Bit ) {
+                            buffer.putLong(pixel);
+                        } else {
+                            buffer.putInt((int)pixel);
+                        }
                     }
                 }
             }
diff --git a/src/newt/classes/jogamp/newt/driver/windows/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/windows/DisplayDriver.java
index c44aa39f4..0bd7c5b2a 100644
--- a/src/newt/classes/jogamp/newt/driver/windows/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/windows/DisplayDriver.java
@@ -68,19 +68,23 @@ public class DisplayDriver extends DisplayImpl {
                     final IOUtil.ClassResources iconRes = NewtFactory.getWindowIcons();
                     {
                         final URLConnection urlConn = iconRes.resolve(0);
-                        final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
-                        _defaultIconHandle[0] = DisplayDriver.createBGRA8888Icon0(image.getPixels(), image.getSize().getWidth(), image.getSize().getHeight(), false, 0, 0);
+                        if( null != urlConn ) {
+                            final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                            _defaultIconHandle[0] = DisplayDriver.createBGRA8888Icon0(image.getPixels(), image.getSize().getWidth(), image.getSize().getHeight(), false, 0, 0);
+                        }
                     }
                     {
                         final URLConnection urlConn = iconRes.resolve(iconRes.resourceCount()-1);
-                        final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
-                        _defaultIconHandle[1] = DisplayDriver.createBGRA8888Icon0(image.getPixels(), image.getSize().getWidth(), image.getSize().getHeight(), false, 0, 0);
+                        if( null != urlConn ) {
+                            final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), PixelFormat.BGRA8888, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
+                            _defaultIconHandle[1] = DisplayDriver.createBGRA8888Icon0(image.getPixels(), image.getSize().getWidth(), image.getSize().getHeight(), false, 0, 0);
+                        }
                     }
                 } catch (final Exception e) {
                     e.printStackTrace();
                 }
             }
-            defaultIconHandles = _defaultIconHandle;
+            defaultIconHandles = _defaultIconHandle; // null is a valid value for an icon handle
         }
         sharedClassFactory = new RegisteredClassFactory(newtClassBaseName, WindowDriver.getNewtWndProc0(),
                                                         false /* useDummyDispatchThread */, defaultIconHandles[0], defaultIconHandles[1]);
-- 
cgit v1.2.3