From dd92e6c9f2b23156a11d5c8c4cef2aec3a93445d Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 16 Apr 2019 23:05:06 +0000 Subject: [PATCH] Try to fix up FTE's android port. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5447 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- .../droid/src/com/fteqw/FTENativeActivity.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/droid/src/com/fteqw/FTENativeActivity.java b/engine/droid/src/com/fteqw/FTENativeActivity.java index c53af9bc1..dd4237438 100644 --- a/engine/droid/src/com/fteqw/FTENativeActivity.java +++ b/engine/droid/src/com/fteqw/FTENativeActivity.java @@ -5,13 +5,14 @@ import android.view.MotionEvent; import android.view.InputDevice; import android.view.WindowManager; -public class FTENativeActivity extends android.app.Activity +public class FTENativeActivity extends android.app.NativeActivity { private static native void keypress(int devid, boolean down, int androidkey, int unicode); private static native void mousepress(int devid, int buttonbits); private static native void motion(int devid, int action, float x, float y, float z, float size); private static native boolean wantrelative(); private static native void axis(int devid, int axisid, float value); +// private static native void oncreate(String basedir, byte[] savedstate); static { System.loadLibrary("ftedroid"); @@ -134,8 +135,7 @@ public class FTENativeActivity extends android.app.Activity @Override protected void onCreate(android.os.Bundle savedInstanceState) { - mIMM = getSystemService(InputMethodManager.class); - getWindow().takeSurface(this); +/* getWindow().takeSurface(this); getWindow().setFormat(PixelFormat.RGB_565); getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED @@ -148,18 +148,18 @@ public class FTENativeActivity extends android.app.Activity byte[] nativeSavedState = savedInstanceState != null ? savedInstanceState.getByteArray(KEY_NATIVE_SAVED_STATE) : null; - mNativeHandle = loadNativeCode(path, funcname, Looper.myQueue(), + mNativeHandle = oncreate( getAbsolutePath(getFilesDir()), getAbsolutePath(getObbDir()), getAbsolutePath(getExternalFilesDir(null)), - Build.VERSION.SDK_INT, getAssets(), nativeSavedState, - classLoader, classLoader.getLdLibraryPath()); - + Build.VERSION.SDK_INT, getAssets(), nativeSavedState); +*/ super.onCreate(savedInstanceState); + //Needed because the InputQueue stuff blocks dispatchKeyEvent + getWindow().takeInputQueue(null); } - @Override public boolean dispatchKeyEvent(KeyEvent event) - { + { //needed because AKeyEvent_getUnicode is missing completely. int act = event.getAction(); if (act == KeyEvent.ACTION_DOWN) {