Port some hotkeys over to Android and console

Author: Hydr8gon

src/android/cpp/interface.cpp

@@ -33,7 +33,7 @@ int showFpsCounter = 0;
 int buttonScale = 5;
 int buttonSpacing = 10;
 int vibrateStrength = 1;
-int keyBinds[12] = {};
+int keyBinds[15] = {};
 
 std::string ndsPath = "", gbaPath = "";
 int ndsRomFd = -1, gbaRomFd = -1;
@@ -105,7 +105,10 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_hydra_noods_FileBrowser_loadSetti
         Setting("keyR", &keyBinds[8], false),
         Setting("keyL", &keyBinds[9], false),
         Setting("keyX", &keyBinds[10], false),
-        Setting("keyY", &keyBinds[11], false)
+        Setting("keyY", &keyBinds[11], false),
+        Setting("keyFastHold", &keyBinds[12], false),
+        Setting("keyFastToggle", &keyBinds[13], false),
+        Setting("keyScreenSwap", &keyBinds[14], false)
     };
 
     // Add the platform settings

src/android/java/com/hydra/noods/FileBrowser.java

@@ -144,17 +144,11 @@ public boolean onOptionsItemSelected(MenuItem item)
                 update();
                 break;
 
-            case R.id.bindings_action:
-                // Open the input bindings menu
-                startActivity(new Intent(this, BindingsMenu.class));
-                return true;
-
             case R.id.settings_action:
                 // Open the settings menu
                 startActivity(new Intent(this, SettingsMenu.class));
                 return true;
         }
-
         return super.onOptionsItemSelected(item);
     }
 

src/android/java/com/hydra/noods/NooActivity.java

@@ -49,6 +49,7 @@ public class NooActivity extends AppCompatActivity
     private NooRenderer renderer;
     private NooButton buttons[];
     private TextView fpsCounter;
+    private int fpsLimiterBackup = 0;
     private boolean initButtons = true;
     private boolean showingButtons = true;
     private boolean showingFps;
@@ -114,6 +115,13 @@ protected void onPause()
     {
         pauseCore();
         super.onPause();
+
+        // Restore the FPS limiter
+        if (fpsLimiterBackup != 0)
+        {
+            SettingsMenu.setFpsLimiter(fpsLimiterBackup);
+            fpsLimiterBackup = 0;
+        }
     }
 
     @Override
@@ -316,6 +324,39 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
             }
         }
 
+        // Handle pressing special hotkeys
+        if (keyCode == BindingsPreference.getKeyBind(12) - 1) // Fast Forward Hold
+        {
+            // Disable the FPS limiter
+            if (SettingsMenu.getFpsLimiter() != 0)
+            {
+                fpsLimiterBackup = SettingsMenu.getFpsLimiter();
+                SettingsMenu.setFpsLimiter(0);
+            }
+            return true;
+        }
+        else if (keyCode == BindingsPreference.getKeyBind(13) - 1) // Fast Forward Toggle
+        {
+            // Toggle between disabling and restoring the FPS limiter
+            if (SettingsMenu.getFpsLimiter() != 0)
+            {
+                fpsLimiterBackup = SettingsMenu.getFpsLimiter();
+                SettingsMenu.setFpsLimiter(0);
+            }
+            else if (fpsLimiterBackup != 0)
+            {
+                SettingsMenu.setFpsLimiter(fpsLimiterBackup);
+                fpsLimiterBackup = 0;
+            }
+            return true;
+        }
+        else if (keyCode == BindingsPreference.getKeyBind(14) - 1) // Screen Swap Toggle
+        {
+            // Toggle between favoring the top or bottom screen
+            SettingsMenu.setScreenSizing((SettingsMenu.getScreenSizing() == 1) ? 2 : 1);
+            renderer.updateLayout(renderer.width, renderer.height);
+            return true;
+        }
         return super.onKeyDown(keyCode, event);
     }
 
@@ -332,6 +373,17 @@ public boolean onKeyUp(int keyCode, KeyEvent event)
             }
         }
 
+        // Handle releasing special hotkeys
+        if (keyCode == BindingsPreference.getKeyBind(12) - 1) // Fast Forward Hold
+        {
+            // Restore the FPS limiter
+            if (fpsLimiterBackup != 0)
+            {
+                SettingsMenu.setFpsLimiter(fpsLimiterBackup);
+                fpsLimiterBackup = 0;
+            }
+            return true;
+        }
         return super.onKeyUp(keyCode, event);
     }
 

src/android/java/com/hydra/noods/SettingsMenu.java

@@ -29,9 +29,12 @@
 import androidx.preference.SwitchPreferenceCompat;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class SettingsMenu extends AppCompatActivity
 {
@@ -107,6 +110,26 @@ protected void onCreate(Bundle savedInstanceState)
             .commit();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        getMenuInflater().inflate(R.menu.settings_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        switch (item.getItemId())
+        {
+            case R.id.bindings_action:
+                // Open the input bindings menu
+                startActivity(new Intent(this, BindingsMenu.class));
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     public void onBackPressed()
     {

src/android/res/menu/file_menu.xml

@@ -14,11 +14,6 @@
         android:visible="false"
         app:showAsAction="always" />
 
-    <item android:id="@+id/bindings_action"
-        android:icon="@drawable/bindings"
-        android:title="Input Bindings"
-        app:showAsAction="always" />
-
     <item android:id="@+id/settings_action"
         android:icon="@drawable/settings"
         android:title="Settings"

src/android/res/menu/settings_menu.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/bindings_action"
+        android:icon="@drawable/bindings"
+        android:title="Input Bindings"
+        app:showAsAction="always" />
+
+</menu>