Bug 935: NEWT PointerIcon: Utilize Toolkit Agnostic PixelFormat and Conversion Utilities (Allowing 'arbitrary' PointerIcon data input)

Commit fe28bc125429b38cdcd016746081f4a6d521c6fd added the notion of toolkit agnostic PixelFormat and conversion utilities,
utilized and further tested by this patch.

+++

- PointerIcon is a PixelRectangle
  and hence holds the decoded data.
  This allows on-the-fly conversion if required
  as well as recreation w/o PNG re-decoding.

- Using array-backed PointerIcon data where possible,
  allowing better performance when converting PixelFormat etc.

- NEWT Display adds 'createPointerIcon(final IOUtil.ClassResources pngResource...'
  method to support agnostic PointerIcon creation.

- NEWT Display adds methods to allow users to avoid PixelFormat and
  Buffer NIO type forced conversion:
    - PixelFormat getNativePointerIconPixelFormat()
    - boolean getNativePointerIconForceDirectNIO()

+++

PNGImage -> PNGPixelRect
  Deleted: com.jogamp.opengl.util.texture.spi.PNGImage
  Added:   com.jogamp.opengl.util.PNGPixelRect

  (We hope nobody was using PNGImage directly since it was a service-plugin for TextureIO)

  PNGPixelRect is a PixelRectangle

  PNGPixelRect actually is implemented OpenGL agnostic,
  however - since our PNGJ support lives under package 'jogamp.opengl.util.pngj'
  it cannot be moved up (yet).

  PNGPixelRect now handles all PixelFormat for the target format
  and also added support for grayscale+alpha (2 channels).
  The latter is force-converted to RGB* - similar to paletted.

  Further more, PNGPixelRect allows simply passing an OutputStream to write the PNG data.

  Used by: TextureIO and NEWT

+++

- OffscreenSurfaceLayer's setCursor(..) uses the agnostic PixelRectangle
  instead of a PNG resource.

- AWTMisc uses the PixelRectangle to produce the AWT Cursor
  and converts it to the required format.
  Hence same pixels are used for NEWT and AWT pointer/cursor icon.

- TestGearsES2Newt and NewtAWTReparentingKeyAdapter 'tests'
  iterate over 3 custom PointerIcon when pressed 'c'.

- JOGLNewtAppletBase uses the new custom PointerIcon
  'newt/data/crosshair-lumina-trans-32x32.png', which is included in NEWT (213 bytes only).

-

1 files changed, 34 insertions, 14 deletions

diff --git a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java
index b690aff4d..069cffeb8 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java
@@ -37,21 +37,19 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.Frame;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URLConnection;
 import java.util.HashMap;
 
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JRootPane;
 import javax.swing.WindowConstants;
-import javax.imageio.ImageIO;
 import javax.media.nativewindow.NativeWindowException;
 import javax.media.nativewindow.WindowClosingProtocol;
+import javax.media.nativewindow.util.PixelRectangle;
+import javax.media.nativewindow.util.PixelFormat;
+import javax.media.nativewindow.util.PixelFormatUtil;
 import javax.swing.MenuSelectionManager;
 
-import com.jogamp.common.util.IOUtil;
-
 public class AWTMisc {
 
     public static JFrame getJFrame(Component c) {
@@ -173,7 +171,7 @@ public class AWTMisc {
         MenuSelectionManager.defaultManager().clearSelectedPath();
     }
 
-    static final HashMap<String, Cursor> cursorMap = new HashMap<String, Cursor>();
+    static final HashMap<Integer, Cursor> cursorMap = new HashMap<Integer, Cursor>();
     static final Cursor nulCursor;
     static {
         final Toolkit toolkit = Toolkit.getDefaultToolkit();
@@ -183,21 +181,43 @@ public class AWTMisc {
 
     public static synchronized Cursor getNullCursor() { return nulCursor; }
 
-    public static synchronized Cursor getCursor(IOUtil.ClassResources resources, Point hotSpot) throws IOException {
-        final String key = resources.getClass().getName()+":"+resources.resourcePaths[0];
+    public static synchronized Cursor getCursor(PixelRectangle pixelrect, Point hotSpot) {
+        // 31 * x == (x << 5) - x
+        int hash = 31 + pixelrect.hashCode();
+        hash = ((hash << 5) - hash) + hotSpot.hashCode();
+        final Integer key = Integer.valueOf(hash);
+
         Cursor cursor = cursorMap.get(key);
         if( null == cursor ) {
-            cursor = createAWTCursor(resources, hotSpot);
+            cursor = createCursor(pixelrect, hotSpot);
             cursorMap.put(key, cursor);
         }
         return cursor;
     }
-    private static synchronized Cursor createAWTCursor(IOUtil.ClassResources resources, Point hotSpot) throws IOException {
-        final URLConnection urlConn = resources.resolve(0);
-        final BufferedImage img = ImageIO.read(urlConn.getInputStream());
-
+    private static synchronized Cursor createCursor(PixelRectangle pixelrect, Point hotSpot) {
+        final int width = pixelrect.getSize().getWidth();
+        final int height = pixelrect.getSize().getHeight();
+        final BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); // PixelFormat.BGRA8888
+        final PixelFormatUtil.PixelSink32 imgSink = new PixelFormatUtil.PixelSink32() {
+            public void store(int x, int y, int pixel) {
+                img.setRGB(x, y, pixel);
+            }
+            @Override
+            public final PixelFormat getPixelformat() {
+                return PixelFormat.BGRA8888;
+            }
+            @Override
+            public int getStride() {
+                return width*4;
+            }
+            @Override
+            public final boolean isGLOriented() {
+                return false;
+            }
+        };
+        PixelFormatUtil.convert32(imgSink, pixelrect);
         final Toolkit toolkit = Toolkit.getDefaultToolkit();
-        return toolkit.createCustomCursor(img, hotSpot, resources.resourcePaths[0]);
+        return toolkit.createCustomCursor(img, hotSpot, pixelrect.toString());
     }
 
     public static WindowClosingProtocol.WindowClosingMode AWT2NWClosingOperation(int awtClosingOperation) {