patched to jdk21/javafx 21 per recipe in repo

flapdoodle-oss · Dec 19, 2023 · 48cdb77 · 48cdb77
1 parent c66c32b
commit 48cdb77
Show file tree

Hide file tree

Showing 73 changed files with 3,564 additions and 205 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ build/
 
 # Executables downloaded via sync script
 .sync/
+target/
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.testfx</groupId>
+    <artifactId>openjfx-monocle</artifactId>
+    <version>jdk-21.0.1</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <exec.mainClass>TestfxMonocle</exec.mainClass>
+    </properties>
+    <dependencies>
+        <!--        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-maven-plugin</artifactId>
+            <version>0.0.8</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>21.0.1</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.6.3</version>
+            </plugin>
+<!--            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>-->
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/com/sun/glass/ui/monocle/AcceleratedScreen.java b/src/main/java/com/sun/glass/ui/monocle/AcceleratedScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,10 @@ public class AcceleratedScreen {
     private static long glesLibraryHandle;
     private static long eglLibraryHandle;
     private static boolean initialized = false;
-    private long eglSurface;
-    private long eglContext;
-    private long eglDisplay;
-    private long nativeWindow;
+    long eglSurface;
+    long eglContext;
+    long eglDisplay;
+    long nativeWindow;
     protected static final LinuxSystem ls = LinuxSystem.getLinuxSystem();
     private EGL egl;
     long eglConfigs[] = {0};
@@ -55,6 +55,14 @@ protected long platformGetNativeWindow() {
         return 0L;
     }
 
+    /**
+     * Create and initialize an AcceleratedScreen. Subclasses should override
+     * this constructor in case the {@link #AcceleratedScreen(int[]) AcceleratedScreen(int[])}
+     * constructor is not sufficient.
+     */
+    AcceleratedScreen() {
+    }
+
     /**
      * Perform basic egl intialization - open the display, create the drawing
      * surface, and create a GL context to that drawing surface.

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidAcceleratedScreen.java b/src/main/java/com/sun/glass/ui/monocle/AndroidAcceleratedScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package com.sun.glass.ui.monocle;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 /**
  * Provide Android implementation of AcceleratedScreen
  *
@@ -39,6 +36,7 @@ class AndroidAcceleratedScreen extends AcceleratedScreen {
         super(attributes);
     }
 
+    @Override
     boolean initPlatformLibraries() {
         return super.initPlatformLibraries();
     }

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidInputDevice.java b/src/main/java/com/sun/glass/ui/monocle/AndroidInputDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package com.sun.glass.ui.monocle;
 
-import java.io.IOException;
-
 /**
  *
  */

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java b/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ public static void gotTouchEventFromNative(int count, int[] actions, int[] ids,
                 touchState.addPoint(p);
             }
         }
-        instance.gotTouchEvent(touchState);
+        Platform.runLater(() -> instance.gotTouchEvent(touchState));
     }
 
     private void gotTouchEvent(TouchState touchState) {
@@ -77,6 +77,14 @@ private void gotTouchEvent(TouchState touchState) {
     }
 
 
+    public static void dispatchKeyEventFromNative(int type, int key, char[] chars, int modifiers) {
+        instance.processor.dispatchKeyEvent(type, key, chars, modifiers);
+    }
+
+    public static void dispatchMenuEventFromNative(int x, int y, int xAbs, int yAbs, boolean isKeyboardTrigger) {
+        instance.processor.dispatchMenuEvent(x, y, xAbs, yAbs, isKeyboardTrigger);
+    }
+
     public static void gotKeyEventFromNative(int action, int linuxKey) {
         instance.gotKeyEvent (action, linuxKey);
     }
@@ -124,6 +132,7 @@ private AndroidInputDevice addDeviceInternal(AndroidInputDevice device, String n
     }
 
     void removeDevice(AndroidInputDevice device) {
+        @SuppressWarnings("removal")
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
             security.checkPermission(new AllPermission());

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidInputProcessor.java b/src/main/java/com/sun/glass/ui/monocle/AndroidInputProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package com.sun.glass.ui.monocle;
 
+import javafx.application.Platform;
+
 class AndroidInputProcessor {
 
     private final AndroidInputDevice device;
@@ -54,4 +56,32 @@ synchronized void pushKeyEvent(KeyState keyState) {
         keyInput.setState(keyState);
     }
 
+    synchronized void dispatchKeyEvent(int type, int key, char[] chars, int modifiers) {
+        Platform.runLater( () -> {
+            MonocleWindow window = MonocleWindowManager.getInstance().getFocusedWindow();
+            if (window == null) {
+                return;
+            }
+            MonocleView view = (MonocleView) window.getView();
+            if (view == null) {
+                return;
+            }
+            RunnableProcessor.runLater( () ->  view.notifyKey(type, key, chars, modifiers));
+        });
+    }
+
+    synchronized void dispatchMenuEvent(int x, int y, int xAbs, int yAbs, boolean isKeyboardTrigger) {
+        Platform.runLater(() -> {
+            MonocleWindow window = MonocleWindowManager.getInstance().getFocusedWindow();
+            if (window == null) {
+                return;
+            }
+            MonocleView view = (MonocleView) window.getView();
+            if (view == null) {
+                return;
+            }
+            RunnableProcessor.runLater(() -> view.notifyMenu(x, y, xAbs, yAbs, isKeyboardTrigger));
+        });
+    }
+
 }
diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidPlatform.java b/src/main/java/com/sun/glass/ui/monocle/AndroidPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ protected InputDeviceRegistry createInputDeviceRegistry() {
 
     @Override
     protected NativeCursor createCursor() {
-        return new NullCursor();
+        return logSelectedCursor(new NullCursor());
     }
 
     @Override

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java b/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ class AndroidPlatformFactory extends NativePlatformFactory {
 
     @Override
     protected boolean matches() {
+       @SuppressWarnings("removal")
        String platform = AccessController.doPrivileged(
                 (PrivilegedAction<String>) () -> System.getProperty("javafx.platform"));
         return platform != null && platform.equals("android");

diff --git a/src/main/java/com/sun/glass/ui/monocle/AndroidScreen.java b/src/main/java/com/sun/glass/ui/monocle/AndroidScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 public class AndroidScreen implements NativeScreen {
 
     private float density = -1;
+    @Override
     public int getDepth() {
         return 24;
     }
@@ -41,13 +42,15 @@ public int getDepth() {
      * Returns the native format of the screen, as a constant from the Pixels
      * class.
      */
+    @Override
     public int getNativeFormat() {
         return Pixels.Format.BYTE_ARGB;
     }
 
     /**
      * Returns the pixel width of the screen.
      */
+    @Override
     public int getWidth() {
         int answer = (int)(_getWidth()/getScale());
         return answer;
@@ -56,13 +59,15 @@ public int getWidth() {
     /**
      * Returns the pixel height of the screen.
      */
+    @Override
     public int getHeight() {
         return (int)(_getHeight()/getScale());
     }
 
     /**
      * Returns the number of pixels per inch in the screen.
      */
+    @Override
     public int getDPI() {
         return 100;
     }
@@ -78,6 +83,7 @@ public float getScale () {
     /**
      * Returns a native handle for the screen. The handle is platform-specific.
      */
+    @Override
     public long getNativeHandle() {
         long answer = _getNativeHandle();
         return answer;
@@ -86,6 +92,7 @@ public long getNativeHandle() {
     /**
      * Called during JavaFX shutdown to release the screen. Called only once.
      */
+    @Override
     public void shutdown() {
         _shutdown();
     }
@@ -101,6 +108,7 @@ public void shutdown() {
      * @param alpha The alpha level to use to compose the data over existing
      *              pixels
      */
+    @Override
     public void uploadPixels(Buffer b,
                              int x, int y, int width, int height, float alpha) {
         _uploadPixels (b, x, y, width, height, alpha);
@@ -110,6 +118,7 @@ public void uploadPixels(Buffer b,
      * Called on the JavaFX application thread when pixel data for all windows
      * has been uploaded.
      */
+    @Override
     public void swapBuffers() {
         _swapBuffers();
     }
@@ -118,6 +127,7 @@ public void swapBuffers() {
      * Returns a read-only ByteBuffer in the native pixel format containing the screen contents.
      * @return ByteBuffer a read-only ByteBuffer containing the screen contents
      */
+    @Override
     public ByteBuffer getScreenCapture() {
         return _getScreenCapture();
     }

diff --git a/src/main/java/com/sun/glass/ui/monocle/C.java b/src/main/java/com/sun/glass/ui/monocle/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@ static C getC() {
     }
 
     private static void checkPermissions() {
+        @SuppressWarnings("removal")
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
             security.checkPermission(permission);

diff --git a/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java b/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,11 @@ class DispmanAcceleratedScreen extends AcceleratedScreen {
 
     @Override
     protected long platformGetNativeWindow() {
+        @SuppressWarnings("removal")
         int displayID = AccessController.doPrivileged(
                 (PrivilegedAction<Integer>)
                         () -> Integer.getInteger("dispman.display", 0 /* LCD */));
+        @SuppressWarnings("removal")
         int layerID = AccessController.doPrivileged(
                 (PrivilegedAction<Integer>)
                         () -> Integer.getInteger("dispman.layer", 1));

diff --git a/src/main/java/com/sun/glass/ui/monocle/DispmanPlatform.java b/src/main/java/com/sun/glass/ui/monocle/DispmanPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ build/

		# Executables downloaded via sync script
		.sync/
		target/