From fa875692c3800f0a159cf86c78c67286cf591fc6 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 28 Jan 2019 11:43:57 -0500
Subject: [PATCH] Added menu toggle for 'Down+Select'

---
 input/input_driver.h | 1 +
 intl/msg_hash_us.h   | 6 +++++-
 menu/menu_setting.c  | 3 +++
 msg_hash.h           | 1 +
 retroarch.c          | 6 ++++++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/input/input_driver.h b/input/input_driver.h
index 1fd67f1e96..dfa0367e56 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -60,6 +60,7 @@ enum input_toggle_type
    INPUT_TOGGLE_L3_R,
    INPUT_TOGGLE_L_R,
    INPUT_TOGGLE_HOLD_START,
+   INPUT_TOGGLE_DOWN_SELECT,
    INPUT_TOGGLE_LAST
 };
 
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 073cdefb27..002f817f47 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -16,7 +16,7 @@ MSG_HASH(
     "Increase or decrease the Switch screen brightness"
     )
 #endif
-#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) 
+#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
     "CPU Overclock"
@@ -8132,3 +8132,7 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_SOUND_BGM,
     "Enable BGM sound"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DOWN_SELECT,
+    "Down + Select"
+    )
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index d4df87dcb5..2691346962 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2056,6 +2056,9 @@ static void setting_get_string_representation_toggle_gamepad_combo(
       case INPUT_TOGGLE_HOLD_START:
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HOLD_START), len);
          break;
+      case INPUT_TOGGLE_DOWN_SELECT:
+         strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWN_SELECT), len);
+         break;
    }
 }
 
diff --git a/msg_hash.h b/msg_hash.h
index 89d66d4c3d..f8e815613b 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -2241,6 +2241,7 @@ enum msg_hash_enums
 #endif
 
    MENU_ENUM_LABEL_VALUE_HOLD_START,
+   MENU_ENUM_LABEL_VALUE_DOWN_SELECT,
    MENU_LABEL(PLAYLIST_USE_OLD_FORMAT),
    MENU_LABEL(MENU_SOUNDS),
    MENU_LABEL(MENU_SOUND_OK),
diff --git a/retroarch.c b/retroarch.c
index 2f76f9151b..bee9cd1af2 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2554,6 +2554,12 @@ static bool input_driver_toggle_button_combo(
          if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_R))
             return false;
          break;
+      case INPUT_TOGGLE_DOWN_SELECT:
+         if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_DOWN))
+            return false;
+         if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_SELECT))
+            return false;
+         break;
       case INPUT_TOGGLE_HOLD_START:
       {
          static rarch_timer_t timer = {0};