8087980: Add property to disable Monocle cursor

Reviewed-by: jvos

Author: dellgreen

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidPlatform.java

@@ -39,7 +39,7 @@ protected InputDeviceRegistry createInputDeviceRegistry() {
 
     @Override
     protected NativeCursor createCursor() {
-        return new NullCursor();
+        return logSelectedCursor(new NullCursor());
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/DispmanPlatform.java

@@ -29,7 +29,8 @@ class DispmanPlatform extends LinuxPlatform {
 
     @Override
     protected NativeCursor createCursor() {
-        return new DispmanCursor();
+        final NativeCursor c = useCursor ? new DispmanCursor() : new NullCursor();
+        return logSelectedCursor(c);
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessPlatform.java

@@ -36,7 +36,7 @@ protected InputDeviceRegistry createInputDeviceRegistry() {
 
     @Override
     protected NativeCursor createCursor() {
-        return new NullCursor();
+        return logSelectedCursor(new NullCursor());
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxPlatform.java

@@ -39,7 +39,8 @@ protected InputDeviceRegistry createInputDeviceRegistry() {
 
     @Override
     protected NativeCursor createCursor() {
-        return new SoftwareCursor();
+        final NativeCursor c = useCursor ? new SoftwareCursor() : new NullCursor();
+        return logSelectedCursor(c);
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MX6Platform.java

@@ -29,7 +29,8 @@ class MX6Platform extends LinuxPlatform {
 
     @Override
     protected NativeCursor createCursor() {
-        return new MX6Cursor();
+        final NativeCursor c = useCursor ? new MX6Cursor() : new NullCursor();
+        return logSelectedCursor(c);
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatform.java

@@ -25,15 +25,33 @@
 
 package com.sun.glass.ui.monocle;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import com.sun.javafx.logging.PlatformLogger;
+import com.sun.javafx.logging.PlatformLogger.Level;
+import com.sun.javafx.util.Logging;
+
 /** Abstract of a platform on which JavaFX can run. */
 public abstract class NativePlatform {
 
     private static InputDeviceRegistry inputDeviceRegistry;
     private final RunnableProcessor runnableProcessor;
+    private final PlatformLogger logger = Logging.getJavaFXLogger();
+
     private NativeCursor cursor;
     private NativeScreen screen;
     protected AcceleratedScreen accScreen;
 
+
+    protected static final boolean useCursor =
+        AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> {
+            final String str =
+                System.getProperty("monocle.cursor.enabled", "true");
+            return "true".equalsIgnoreCase(str);
+        });
+
+
+
     protected NativePlatform() {
         runnableProcessor = new RunnableProcessor();
     }
@@ -129,4 +147,19 @@ public synchronized AcceleratedScreen getAcceleratedScreen(int[] attributes)
         return accScreen;
     }
 
+
+    /**
+     * Log the name of the supplied native cursor class if required.
+     *
+     * @param cursor the native cursor in use, null is permitted
+     * @return the passed in cursor
+     */
+    protected NativeCursor logSelectedCursor(final NativeCursor cursor) {
+        if (logger.isLoggable(Level.FINE)) {
+            final String name = cursor == null ? null : cursor.getClass().getSimpleName();
+            logger.fine("Using native cursor: {0}", name);
+        }
+        return cursor;
+    }
+
 }

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/OMAPPlatform.java

@@ -29,7 +29,8 @@ class OMAPPlatform extends LinuxPlatform {
 
     @Override
     protected NativeCursor createCursor() {
-        return new OMAPCursor();
+        final NativeCursor c = useCursor ? new OMAPCursor() : new NullCursor();
+        return logSelectedCursor(c);
     }
 
     @Override

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Platform.java

@@ -61,10 +61,11 @@ protected InputDeviceRegistry createInputDeviceRegistry() {
      */
     @Override
     protected NativeCursor createCursor() {
-        if (x11Input) {
-            return new X11Cursor();
+        if (useCursor) {
+            final NativeCursor c = x11Input ? new X11Cursor() : new X11WarpingCursor();
+            return logSelectedCursor(c);
         } else {
-            return new X11WarpingCursor();
+            return logSelectedCursor(new NullCursor());
         }
     }