From f8fb5d0e1bc0e6e05678b3db0d5405abdcc86cba Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Wed, 16 Mar 2022 23:07:20 +0000
Subject: [PATCH] Revert "Soft keyboard support added"

This reverts commit fdf2decde3bc9fc3268d0de9d30a97a416ab5f31.
---
 Makefile                                            |  2 +-
 android/app/src/main/AndroidManifest.xml            |  1 -
 android/app/src/main/cpp/code/q3_ui/ui_qmenu.c      | 13 -------------
 android/app/src/main/cpp/code/sdl/sdl_input.c       |  2 ++
 android/app/src/main/cpp/code/vr/vr_input.c         |  6 +-----
 android/app/src/main/cpp/main.cpp                   |  5 ++---
 .../src/main/java/org/libsdl/app/SDLActivity.java   |  3 ---
 7 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index a11b6665..c51f81cb 100644
--- a/Makefile
+++ b/Makefile
@@ -2668,7 +2668,7 @@ Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
 
 $(B)/$(BASEGAME)/ui$(SHLIBNAME): $(Q3UIOBJ)
 	$(echo_cmd) "LD $@"
-	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(CLIENT_LIBS)
+	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
 
 $(B)/$(BASEGAME)/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
 	$(echo_cmd) "Q3ASM $@"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 10e1ecbb..c3e41ab0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
 	android:versionCode="34"
 	android:versionName="0.23.0">
 	<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
-	<uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>
 	<uses-feature android:glEsVersion="0x00030001" />
 	<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->
 
diff --git a/android/app/src/main/cpp/code/q3_ui/ui_qmenu.c b/android/app/src/main/cpp/code/q3_ui/ui_qmenu.c
index 517547af..f9df6e1c 100644
--- a/android/app/src/main/cpp/code/q3_ui/ui_qmenu.c
+++ b/android/app/src/main/cpp/code/q3_ui/ui_qmenu.c
@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 	Quake's menu framework system.
 **********************************************************************/
 #include "ui_local.h"
-#include "SDL.h"
 
 sfxHandle_t menu_in_sound;
 sfxHandle_t menu_move_sound;
@@ -1654,18 +1653,6 @@ sfxHandle_t Menu_DefaultKey( menuframework_s *m, int key )
 
 			case MTYPE_FIELD:
 				sound = MenuField_Key( (menufield_s*)item, &key );
-
-#if __ANDROID__
-				//show virtual keyboard
-				menufield_s* m = (menufield_s*)item;
-				if ( key == 178 )
-				{
-				    //delete value on click
-				    sprintf( m->field.buffer, "" );
-				}
-				m->field.cursor = strlen( m->field.buffer );
-				SDL_StartTextInput();
-#endif
 				break;
 		}
 
diff --git a/android/app/src/main/cpp/code/sdl/sdl_input.c b/android/app/src/main/cpp/code/sdl/sdl_input.c
index 611501a4..df1763af 100644
--- a/android/app/src/main/cpp/code/sdl/sdl_input.c
+++ b/android/app/src/main/cpp/code/sdl/sdl_input.c
@@ -1246,6 +1246,8 @@ void IN_Init( void *windowData )
 	in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE|CVAR_LATCH );
 	in_joystickThreshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE );
 
+	SDL_StartTextInput( );
+
 	mouseAvailable = ( in_mouse->value != 0 );
 	IN_DeactivateMouse( Cvar_VariableIntegerValue( "r_fullscreen" ) != 0 );
 
diff --git a/android/app/src/main/cpp/code/vr/vr_input.c b/android/app/src/main/cpp/code/vr/vr_input.c
index 855b66f2..e9517d28 100644
--- a/android/app/src/main/cpp/code/vr/vr_input.c
+++ b/android/app/src/main/cpp/code/vr/vr_input.c
@@ -442,11 +442,7 @@ static void IN_VRController( qboolean isRightController, ovrTracking remoteTrack
             cl.snap.ps.pm_type == PM_INTERMISSION)
         {
 		    int mouse_multiplier = 10;
-		    //ignore cursor jumping when e.g. showing keyboard
-		    if ( ( fabs(vr.weaponangles_delta[ YAW ]) < 10 ) && ( fabs(vr.weaponangles_delta[ PITCH ]) < 10 ) )
-		    {
-		        Com_QueueEvent(in_vrEventTime, SE_MOUSE, vr.weaponangles_delta[YAW] * mouse_multiplier, -vr.weaponangles_delta[PITCH] * mouse_multiplier, 0, NULL);
-		    }
+            Com_QueueEvent(in_vrEventTime, SE_MOUSE, vr.weaponangles_delta[YAW] * mouse_multiplier, -vr.weaponangles_delta[PITCH] * mouse_multiplier, 0, NULL);
         }
 	} else {
         vec3_t rotation = {0};
diff --git a/android/app/src/main/cpp/main.cpp b/android/app/src/main/cpp/main.cpp
index 417a3565..6de0f2ed 100644
--- a/android/app/src/main/cpp/main.cpp
+++ b/android/app/src/main/cpp/main.cpp
@@ -84,8 +84,7 @@ int main(int argc, char* argv[]) {
 	VR_EnterVR(engine, java);
 
 	while (1) {
-		//Polling events here breaks sdl_input keyboard!
-		/*SDL_Event event;
+		SDL_Event event;
 		while (SDL_PollEvent(&event)) {
 			LOGI("Received SDL Event: %d", event.type);
 			switch (event.type)
@@ -98,7 +97,7 @@ int main(int argc, char* argv[]) {
 					VR_LeaveVR(engine);
 					break;
 			}
-		}*/
+		}
 
 		VR_DrawFrame(engine);
 	}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 37d6b318..8c363ed5 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -264,9 +264,6 @@ public class SDLActivity extends Activity {
         if (SDLActivity.mBrokenLibraries) {
            return;
         }
-        if (mScreenKeyboardShown) {
-            return;
-        }
 
         SDLActivity.mHasFocus = hasFocus;
         if (hasFocus) {