Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8097752

[Android] dalvikInput.c is old version

    XMLWordPrintable

    Details

    • Type: Enhancement
    • Status: Resolved
    • Priority: P4
    • Resolution: Fixed
    • Affects Version/s: 8u20
    • Fix Version/s: 8u20
    • Component/s: javafx
    • Labels:

      Description

      The dalvikInput.c in 8u-dev is an old version. The native methods for handling touch events can't be found.
      The following patch fixes this
      diff -r 498c76f90ebf modules/graphics/src/main/native-glass/lens/dalvik/dalvikInput.c
      --- a/modules/graphics/src/main/native-glass/lens/dalvik/dalvikInput.c Tue Jun 17 13:24:43 2014 +0300
      +++ b/modules/graphics/src/main/native-glass/lens/dalvik/dalvikInput.c Wed Jun 18 20:32:50 2014 +0200
      @@ -29,12 +29,12 @@
       #include <dlfcn.h>
       #include "dalvikInput.h"
       #include "dalvikUtils.h"
      -#include "../../wm/LensWindowManager.h"
      +#include "../wm/LensWindowManager.h"
       #include "com_sun_glass_ui_lens_LensApplication.h"
       #include "com_sun_glass_events_TouchEvent.h"
       #include "com_sun_glass_ui_android_SoftwareKeyboard.h"
       #include "com_sun_glass_ui_android_Activity.h"
      -#include "javafxports_android_FXActivity_InternalSurfaceView.h"
      +#include "com_sun_glass_ui_android_DalvikInput.h"
       
       #define THROW_RUNTIME_EXCEPTION(ENV, MESSAGE, ...) \
           char error_msg[256]; \
      @@ -122,11 +122,11 @@
       }
       
       /*
      - * Class: javafxports_android_FXActivity_InternalSurfaceView
      + * Class: com_sun_glass_ui_android_DalvikInput
        * Method: onMultiTouchEventNative
        * Signature: (I[I[I[I[I)V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity_00024InternalSurfaceView_onMultiTouchEventNative
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onMultiTouchEventNative
         (JNIEnv *env, jobject that, jint jcount, jintArray jactions, jintArray jids, jintArray jxs, jintArray jys) {
           GLASS_LOG_FINE("Call InternalSurfaceView_onMultiTouchEventNative");
           
      @@ -160,11 +160,11 @@
       }
       
       /*
      - * Class: javafxports_android_FXActivity_InternalSurfaceView
      + * Class: com_sun_glass_ui_android_DalvikInput
        * Method: onKeyEventNative
        * Signature: (IILjava/lang/String;)V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity_00024InternalSurfaceView_onKeyEventNative
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onKeyEventNative
         (JNIEnv *env, jobject that, jint action, jint keycode, jstring s) {
           GLASS_LOG_FINEST("Key event: [action: %s, keyCode: %i]",
                   describe_key_action(action), keycode);
      @@ -187,24 +187,24 @@
       }
       
       /*
      - * Class: javafxports_android_FXActivity
      - * Method: _surfaceChanged
      - * Signature: (Landroid/view/Surface;)V
      + * Class: com_sun_glass_ui_android_DalvikInput
      + * Method: onSurfaceChangedNative
      + * Signature: ()V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity__1surfaceChanged__Landroid_view_Surface_2
      - (JNIEnv *env, jobject that, jobject jsurface) {
      - GLASS_LOG_FINEST("Notify JFX that surface has changed! jsurface=%d", jsurface);
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onSurfaceChangedNative__
      + (JNIEnv *env, jobject that) {
      + GLASS_LOG_FINEST("Notify JFX that surface has changed!");
           glass_application_notifyScreenSettingsChanged(env);
           lens_wm_repaint_all(env);
       }
       
       /*
      - * Class: javafxports_android_FXActivity
      - * Method: _surfaceChanged
      - * Signature: (Landroid/view/Surface;III)V
      + * Class: com_sun_glass_ui_android_DalvikInput
      + * Method: onSurfaceChangedNative
      + * Signature: (III)V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity__1surfaceChanged__Landroid_view_Surface_2III
      - (JNIEnv *env, jobject that, jobject jsurface, jint fmt, jint w, jint h) {
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onSurfaceChangedNative__III
      + (JNIEnv *env, jobject that, jint fmt, jint w, jint h) {
           GLASS_LOG_FINEST("Notify JFX that surface has changed.");
           GLASS_LOG_FINEST("Surface format:%d width:%d height%d", fmt, w, h);
           glass_application_notifyScreenSettingsChanged(env);
      @@ -212,22 +212,22 @@
       }
       
       /*
      - * Class: javafxports_android_FXActivity
      - * Method: _surfaceRedrawNeeded
      - * Signature: (Landroid/view/Surface;)V
      + * Class: com_sun_glass_ui_android_DalvikInput
      + * Method: onSurfaceRedrawNeededNative
      + * Signature: ()V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity__1surfaceRedrawNeeded
      - (JNIEnv *env, jobject that, jobject jsurface) {
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onSurfaceRedrawNeededNative
      + (JNIEnv *env, jobject that) {
           GLASS_LOG_WARNING("Call surfaceRedrawNeeded");
           lens_wm_repaint_all(env);
       }
       
       /*
      - * Class: javafxports_android_FXActivity
      - * Method: _configurationChanged
      + * Class: com_sun_glass_ui_android_DalvikInput
      + * Method: onConfigurationChangedNative
        * Signature: (I)V
        */
      -JNIEXPORT void JNICALL Java_javafxports_android_FXActivity__1configurationChanged
      +JNIEXPORT void JNICALL Java_com_sun_glass_ui_android_DalvikInput_onConfigurationChangedNative
         (JNIEnv *env, jobject that, jint flags) {
           GLASS_LOG_FINEST("Call configuration changed.");
           glass_application_notifyScreenSettingsChanged(env);

        Attachments

          Activity

            People

            Assignee:
            ddhill David Hill (Inactive)
            Reporter:
            jvos Johan Vos
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved:
              Imported: