From 5c74b1038baff0f0cf6bf6f720fe0802f93d8979 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Sat, 28 Nov 2020 18:57:45 +0700
Subject: [PATCH] [Text input] remove CapturedEditText and supports "dead
 chars"

---
 .../kdt/pojavlaunch/AndroidLWJGLKeycode.java  |  8 +++--
 .../net/kdt/pojavlaunch/BaseMainActivity.java | 10 +++---
 .../net/kdt/pojavlaunch/CapturedEditText.java | 31 -------------------
 .../main/res/layout/main_with_customctrl.xml  |  6 ----
 4 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 app/src/main/java/net/kdt/pojavlaunch/CapturedEditText.java

diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
index e506182a2..5e125ff3a 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
@@ -195,8 +195,12 @@ public class AndroidLWJGLKeycode {
         }
         
         try {
-            if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN && !CallbackBridge.isGrabbing()) {
-                BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(), keyEvent.getScanCode(), mods, isDown);
+            if (!CallbackBridge.isGrabbing()) {
+                if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN) {
+                    BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getDisplayLabel(), keyEvent.getScanCode(), mods, isDown);
+                } else if ((int) keyEvent.getUnicodeChar() != KeyEvent.KEYCODE_UNKNOWN) {
+                    BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(), keyEvent.getScanCode(), mods, isDown);
+                }
             }
         } catch (Throwable th) {
             th.printStackTrace();
diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index b62c95b83..33eab2810 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -74,7 +74,7 @@ public class BaseMainActivity extends LoggableActivity {
     private DrawerLayout drawerLayout;
     private NavigationView navDrawer;
     
-    protected CapturedEditText mKeyHandlerView;
+    // protected CapturedEditText mKeyHandlerView;
 
     private LinearLayout contentLog;
     private TextView textLog;
@@ -197,13 +197,13 @@ public class BaseMainActivity extends LoggableActivity {
            
             // toggleGui(null);
             this.drawerLayout.closeDrawers();
-
+/*
             mKeyHandlerView = findViewById(R.id.main_key_handler);
             mKeyHandlerView.setSingleLine(false);
             mKeyHandlerView.clearFocus();
             
             AndroidLWJGLKeycode.isBackspaceAfterChar = true; // mVersionInfo.minimumLauncherVersion >= 18;
-
+*/
             placeMouseAt(CallbackBridge.windowWidth / 2, CallbackBridge.windowHeight / 2);
             new Thread(new Runnable(){
 
@@ -719,7 +719,7 @@ public class BaseMainActivity extends LoggableActivity {
             Tools.showError(this, e, true);
         }
     }
-/*
+
     @Override   
     public boolean onKeyUp(int keyCode, KeyEvent event) {   
         AndroidLWJGLKeycode.execKey(event, keyCode, false);   
@@ -731,7 +731,7 @@ public class BaseMainActivity extends LoggableActivity {
         AndroidLWJGLKeycode.execKey(event, keyCode, true);    
         return super.onKeyDown(keyCode, event); 
     }
-*/
+
     //private Dialog menuDial;
 
     @Override
diff --git a/app/src/main/java/net/kdt/pojavlaunch/CapturedEditText.java b/app/src/main/java/net/kdt/pojavlaunch/CapturedEditText.java
deleted file mode 100644
index 095fb0041..000000000
--- a/app/src/main/java/net/kdt/pojavlaunch/CapturedEditText.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.kdt.pojavlaunch;
-
-import android.content.*;
-import android.util.*;
-import android.widget.*;
-import android.view.*;
-
-public class CapturedEditText extends EditText
-{
-    public CapturedEditText(Context ctx) {
-        this(ctx, null);
-    }
-    
-    public CapturedEditText(Context ctx, AttributeSet attrs) {
-        super(ctx, attrs);
-    }
-
-    @Override
-    public boolean onKeyPreIme(int keyCode, KeyEvent event){
-        switch (event.getAction()) {
-            case KeyEvent.ACTION_DOWN:
-                AndroidLWJGLKeycode.execKey(event, keyCode, true);
-                break;
-                
-            case KeyEvent.ACTION_UP:
-                AndroidLWJGLKeycode.execKey(event, keyCode, false);
-                break;
-        }
-        return false;
-    }
-}
diff --git a/app/src/main/res/layout/main_with_customctrl.xml b/app/src/main/res/layout/main_with_customctrl.xml
index cc9fdc5d1..5027f36be 100644
--- a/app/src/main/res/layout/main_with_customctrl.xml
+++ b/app/src/main/res/layout/main_with_customctrl.xml
@@ -18,12 +18,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<net.kdt.pojavlaunch.CapturedEditText
-                android:imeOptions="flagNoExtractUi"
-				android:layout_height="match_parent"
-				android:layout_width="match_parent"
-				android:id="@+id/main_key_handler"/>
-
 			<net.kdt.pojavlaunch.MinecraftGLView
 				android:id="@+id/main_game_render_view"
 				android:layout_width="fill_parent"