Use JavaFX 20-ea+4 and support long press on Android (#1179)

* Bump JavaFX version to 20-ea+4

* Add support for long press on Android

* move handler to inner class

* cleanup

Author: José Pereda

.gitignore

@@ -31,4 +31,5 @@ bin
 .project
 .classpath
 .vscode
-.settings
+.settings
+local.properties

src/main/java/com/gluonhq/substrate/Constants.java

@@ -108,7 +108,7 @@ public enum Profile {
 
     public static final String DEFAULT_JAVA_STATIC_SDK_VERSION = "18-ea+prep18-8";
     public static final String DEFAULT_JAVA_STATIC_SDK_VERSION11 = "11-ea+10";
-    public static final String DEFAULT_JAVAFX_STATIC_SDK_VERSION  = "20-ea+3";
+    public static final String DEFAULT_JAVAFX_STATIC_SDK_VERSION  = "20-ea+4";
     public static final String DEFAULT_JAVAFX_JS_SDK_VERSION  = "18-internal+0-2021-09-02-165800";
     public static final String DEFAULT_SYSROOT_VERSION  = "20210424";
     public static final String DEFAULT_CLIBS_VERSION  = "27";

src/main/resources/native/android/android_project/app/src/main/java/com/gluonhq/helloandroid/MainActivity.java

@@ -30,9 +30,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -52,13 +49,12 @@
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.WindowManager.LayoutParams;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 
@@ -85,7 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.v(TAG, "onCreate start, using Android Logging v1");
         System.err.println("onCreate called, writing this to System.err");
-        super.onCreate(savedInstanceState);
 
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getWindow().setSoftInputMode(
@@ -223,10 +218,10 @@ public void run() {
     private native void nativeSetSurface(Surface surface);
     private native void nativeSurfaceRedrawNeeded();
     private native void nativeGotTouchEvent(int pcount, int[] actions, int[] ids, int[] touchXs, int[] touchYs);
-    private native void nativeGotKeyEvent(int action, int keycode);
-    private native void nativedispatchKeyEvent(int type, int key, char[] chars, int charCount, int modifiers);
+    private native void nativeDispatchKeyEvent(int type, int key, char[] chars, int charCount, int modifiers);
     private native void nativeDispatchLifecycleEvent(String event);
     private native void nativeDispatchActivityResult(int requestCode, int resultCode, Intent intent);
+    private native void nativeNotifyMenu(int x, int y, int xAbs, int yAbs, boolean isKeyboardTrigger);
 
     class InternalSurfaceView extends SurfaceView {
         private static final int ACTION_POINTER_STILL = -1;
@@ -251,7 +246,6 @@ public boolean dispatchTouchEvent(MotionEvent event) {
             final int[] ids = new int[pcount];
             final int[] touchXs = new int[pcount];
             final int[] touchYs = new int[pcount];
-            Log.v(TAG, "Activity, get touch event, pcount = "+pcount);
             if (pcount > 1) {
                 //multitouch
                 if (actionCode == MotionEvent.ACTION_POINTER_DOWN
@@ -278,6 +272,16 @@ public boolean dispatchTouchEvent(MotionEvent event) {
                 ids[0] = event.getPointerId(0);
                 touchXs[0] = (int) (event.getX()/density);
                 touchYs[0] = (int) (event.getY()/density);
+
+                if (action == MotionEvent.ACTION_DOWN) {
+                    longPress.setX(touchXs[0]);
+                    longPress.setY(touchYs[0]);
+                    handler.postDelayed(longPress, ViewConfiguration.getLongPressTimeout());
+                }
+
+                if (action == MotionEvent.ACTION_UP) {
+                    handler.removeCallbacks(longPress);
+                }
             }
             if (!isFocused()) {
                 Log.v(TAG, "View wasn't focused, requesting focus");
@@ -375,9 +379,31 @@ private void resetText(int length) {
         public boolean dispatchKeyEvent(final KeyEvent event) {
             Log.v(TAG, "Activity, process get key event, action = "+event);
             processAndroidKeyEvent (event);
-            // nativeGotKeyEvent(event.getAction(), event.getKeyCode());
             return true;
         }
+
+        private final Handler handler = new Handler();
+        private final LongPress longPress = new LongPress();
+
+        private class LongPress implements Runnable {
+
+            int x, y;
+
+            void setX(int x) {
+                this.x = x;
+            }
+
+            void setY(int y) {
+                this.y = y;
+            }
+
+            @Override
+            public void run() {
+                Log.d(TAG, "Long press!");
+                nativeNotifyMenu(x, y, x, y, false);
+            }
+        }
+
     }
 
     @Override
@@ -438,18 +464,16 @@ private void notifyLifecycleEvent(String event) {
     private int deadKey = 0;
 
     void processAndroidKeyEvent (KeyEvent event) {
-        System.out.println("KeyEvent: " + event+" with action = "+event.getAction());
         int jfxModifiers = mapAndroidModifierToJfx(event.getMetaState());
         switch (event.getAction()) {
             case KeyEvent.ACTION_DOWN:
                 KeyCode jfxKeyCode = mapAndroidKeyCodeToJfx(event.getKeyCode());
-System.out.println ("[JVDBG] eventkeycode = "+event.getKeyCode()+" and jfxkc = "+jfxKeyCode+" with code "+ jfxKeyCode.impl_getCode());
-                nativedispatchKeyEvent(PRESS, jfxKeyCode.impl_getCode(), jfxKeyCode.impl_getChar().toCharArray(), jfxKeyCode.impl_getChar().toCharArray().length, jfxModifiers);
+                nativeDispatchKeyEvent(PRESS, jfxKeyCode.impl_getCode(), jfxKeyCode.impl_getChar().toCharArray(), jfxKeyCode.impl_getChar().toCharArray().length, jfxModifiers);
                 break;
 
             case KeyEvent.ACTION_UP:
                 jfxKeyCode = mapAndroidKeyCodeToJfx(event.getKeyCode());
-                nativedispatchKeyEvent(RELEASE, jfxKeyCode.impl_getCode(), jfxKeyCode.impl_getChar().toCharArray(), jfxKeyCode.impl_getChar().toCharArray().length, jfxModifiers);
+                nativeDispatchKeyEvent(RELEASE, jfxKeyCode.impl_getCode(), jfxKeyCode.impl_getChar().toCharArray(), jfxKeyCode.impl_getChar().toCharArray().length, jfxModifiers);
                 int unicodeChar = event.getUnicodeChar();
                 if ((unicodeChar & KeyCharacterMap.COMBINING_ACCENT) != 0) {
                     deadKey = unicodeChar & KeyCharacterMap.COMBINING_ACCENT_MASK;
@@ -462,20 +486,20 @@ void processAndroidKeyEvent (KeyEvent event) {
                 }
 
                 if (unicodeChar != 0) {
-                    nativedispatchKeyEvent(TYPED, KeyCode.UNDEFINED.impl_getCode(), Character.toChars(unicodeChar), 1, jfxModifiers);
+                    nativeDispatchKeyEvent(TYPED, KeyCode.UNDEFINED.impl_getCode(), Character.toChars(unicodeChar), 1, jfxModifiers);
                 }
 
                 break;
 
             case KeyEvent.ACTION_MULTIPLE:
                 if (event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
-                    nativedispatchKeyEvent(TYPED, KeyCode.UNDEFINED.impl_getCode(), event.getCharacters().toCharArray(), event.getCharacters().toCharArray().length,    jfxModifiers);
+                    nativeDispatchKeyEvent(TYPED, KeyCode.UNDEFINED.impl_getCode(), event.getCharacters().toCharArray(), event.getCharacters().toCharArray().length,    jfxModifiers);
                 } else {
                     jfxKeyCode = mapAndroidKeyCodeToJfx(event.getKeyCode());
                     for (int i = 0; i < event.getRepeatCount(); i++) {
-                        nativedispatchKeyEvent(PRESS, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
-                        nativedispatchKeyEvent(RELEASE, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
-                        nativedispatchKeyEvent(TYPED, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
+                        nativeDispatchKeyEvent(PRESS, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
+                        nativeDispatchKeyEvent(RELEASE, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
+                        nativeDispatchKeyEvent(TYPED, jfxKeyCode.impl_getCode(), null, 0, jfxModifiers);
                     }
                 }
 

src/main/resources/native/android/c/grandroid.h

@@ -28,6 +28,7 @@
 #include "grandroid_ext.h"
 
 #include <android/native_window_jni.h>
+#include <stdbool.h>
 
 #undef com_sun_glass_events_TouchEvent_TOUCH_PRESSED
 #define com_sun_glass_events_TouchEvent_TOUCH_PRESSED 811L
@@ -49,6 +50,7 @@ void __attribute__((weak)) androidJfx_setNativeWindow(ANativeWindow *nativeWindo
 void __attribute__((weak)) androidJfx_setDensity(float nativeDensity) {}
 void __attribute__((weak)) androidJfx_gotTouchEvent(int count, int *actions, int *ids, int *xs, int *ys, int primary) {}
 void __attribute__((weak)) androidJfx_gotKeyEvent(int action, int key, jchar *chars, int count, int mods) {}
+void __attribute__((weak)) androidJfx_gotMenuEvent(int x, int y, int xAbs, int yAbs, bool isKeyboardTrigger) {}
 int  __attribute__((weak)) to_jfx_touch_action(int state) { return 0; }
 
 void __attribute__((weak)) androidJfx_startURL(const char *url) {}

src/main/resources/native/android/c/launcher.c

@@ -65,9 +65,9 @@ const char *origArgs[] = {
     "-Dcom.sun.javafx.gestures.zoom=true",
     "-Dcom.sun.javafx.gestures.rotate=true",
     "-Dcom.sun.javafx.gestures.scroll=true",
-    "-Djavafx.verbose=true",
+    "-Djavafx.verbose=false",
     "-Dmonocle.input.touchRadius=1",
-    "-Dmonocle.input.traceEvents.verbose=true",
+    "-Dmonocle.input.traceEvents.verbose=false",
     "-Dprism.verbose=true",
     "-Xmx4g"};
 

src/main/resources/native/android/c/touch_events.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Gluon
+ * Copyright (c) 2020, 2022, Gluon
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ Java_javafx_scene_control_skin_TextFieldSkinAndroid_showSoftwareKeyboard();
 
 JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativeGotTouchEvent(JNIEnv *env, jobject activity, jint jcount, jintArray jactions, jintArray jids, jintArray jxs, jintArray jys)
 {
-    LOGE(stderr, "Native Dalvik layer got touch event, pass to native Graal layer...");
+//    LOGE(stderr, "Native Dalvik layer got touch event, pass to native Graal layer...");
 
     jlong jlongids[jcount];
 
@@ -57,23 +57,18 @@ JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativeGotTouch
     (*env)->ReleaseIntArrayElements(env, jxs, xs, 0);
     (*env)->ReleaseIntArrayElements(env, jys, ys, 0);
 
-    LOGE(stderr, "Native Dalvik layer got touch event, passed to native Graal layer...");
+//    LOGE(stderr, "Native Dalvik layer got touch event, passed to native Graal layer...");
 }
 
-JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativedispatchKeyEvent(JNIEnv *env, jobject activity, jint action, jint keyCode, jcharArray jchars, jint cc, jint modifiers)
+JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativeDispatchKeyEvent(JNIEnv *env, jobject activity, jint action, jint keyCode, jcharArray jchars, jint cc, jint modifiers)
 {
-    LOGE(stderr, "Native Dalvik layer has to dispatch key event, pass to native Graal layer with %d chars...", cc);
+//    LOGE(stderr, "Native Dalvik layer has to dispatch key event, pass to native Graal layer with %d chars...", cc);
     jchar *kars = (*env)->GetCharArrayElements(env, jchars, 0);
-    LOGE(stderr, "passed count = %d and realcount = %d\n", cc, (*env)->GetArrayLength(env, jchars));
-    LOGE(stderr, "c0 = %c and c1 = %c\n", kars[0], kars[1]);
-    LOGE(stderr, "c0 = %x and c1 = %x\n", kars[0], kars[1]);
     androidJfx_gotKeyEvent(action, keyCode, kars, cc, modifiers);
 }
 
-JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativeGotKeyEvent(JNIEnv *env, jobject activity, jint action, jint keyCode)
+JNIEXPORT void JNICALL Java_com_gluonhq_helloandroid_MainActivity_nativeNotifyMenu(JNIEnv *env, jobject activity, jint x, jint y, jint xAbs, jint yAbs, jboolean isKeyboardTrigger)
 {
-    LOGE(stderr, "Native Dalvik layer got key event, pass to native Graal layer...");
-    // androidJfx_gotKeyEvent(action, keyCode);
-    // Java_com_sun_glass_ui_android_DalvikInput_onKeyEventNative(NULL, NULL, action, keyCode);
-    LOGE(stderr, "Native Dalvik layer got key event!!!");
+//    LOGE(stderr, "Native Dalvik layer got notify menu, pass to native Graal layer...");
+    androidJfx_gotMenuEvent(x, y, xAbs, yAbs, isKeyboardTrigger);
 }