From 97904c3b4ac3bfe6cef16b09ad5e34f24ec3fd47 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Mon, 16 Nov 2020 12:46:27 +0700
Subject: [PATCH] [Input pipe] Make char callbacks not always put to stack
 queue

---
 .../customcontrols/DynamicControlButton.java         |  6 ++++++
 app/src/main/jni/input_bridge_v3.c                   | 12 ++++++------
 app/src/main/res/layout/control_mapping.xml          |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/net/kdt/pojavlaunch/customcontrols/DynamicControlButton.java

diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/DynamicControlButton.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/DynamicControlButton.java
new file mode 100644
index 000000000..b6ce95fd7
--- /dev/null
+++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/DynamicControlButton.java
@@ -0,0 +1,6 @@
+package net.kdt.pojavlaunch.customcontrols;
+
+public class DynamicControlButton extends ControlButton
+{
+    // TODO for ${value}
+}
diff --git a/app/src/main/jni/input_bridge_v3.c b/app/src/main/jni/input_bridge_v3.c
index d6bb57015..911002d83 100644
--- a/app/src/main/jni/input_bridge_v3.c
+++ b/app/src/main/jni/input_bridge_v3.c
@@ -185,11 +185,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeIsGrabbing(J
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendChar(JNIEnv* env, jclass clazz, jint codepoint) {
     if (GLFW_invoke_Char && isInputReady) {
-        // if (isMinecraft1p12 || isUseStackQueueCall) {
+        if (isMinecraft1p12 || isUseStackQueueCall) {
             sendData(EVENT_TYPE_CHAR, codepoint, 0, 0, 0);
-        /* } else {
+        } else {
             GLFW_invoke_Char(showingWindow, codepoint);
-        } */
+        }
         return JNI_TRUE;
     }
     return JNI_FALSE;
@@ -197,11 +197,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendChar(JNI
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCharMods(JNIEnv* env, jclass clazz, jint codepoint, jint mods) {
     if (GLFW_invoke_CharMods && isInputReady) {
-        // if (isMinecraft1p12 || isUseStackQueueCall) {
+        if (isMinecraft1p12 || isUseStackQueueCall) {
             sendData(EVENT_TYPE_CHAR_MODS, codepoint, mods, 0, 0);
-        /* } else {
+        } else {
             GLFW_invoke_CharMods(showingWindow, codepoint, mods);
-        } */
+        }
         return JNI_TRUE;
     }
     return JNI_FALSE;
diff --git a/app/src/main/res/layout/control_mapping.xml b/app/src/main/res/layout/control_mapping.xml
index 4416ca637..af723eeec 100644
--- a/app/src/main/res/layout/control_mapping.xml
+++ b/app/src/main/res/layout/control_mapping.xml
@@ -17,12 +17,12 @@
 			android:layout_width="wrap_content"
 			android:layout_alignParentRight="true"/>
 
-		<net.kdt.pojavlaunch.value.customcontrols.ControlsLayout
+		<net.kdt.pojavlaunch.customcontrols.ControlsLayout
 			android:id="@+id/customctrl_controllayout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-		</net.kdt.pojavlaunch.value.customcontrols.ControlsLayout>
+		</net.kdt.pojavlaunch.customcontrols.ControlsLayout>
 
 	</RelativeLayout>