From e93cccf60756b489c1f82a637e7ed15cd5fb3a85 Mon Sep 17 00:00:00 2001 From: iota97 Date: Sat, 23 Apr 2022 08:52:51 +0200 Subject: [PATCH 1/2] Add key bind to hotswap internal screen rotation --- Core/KeyMap.cpp | 5 +++++ Core/KeyMap.h | 4 ++++ UI/EmuScreen.cpp | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp index eb60024a8a..10f8bd1dce 100644 --- a/Core/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -395,6 +395,11 @@ const KeyMap_IntStrPair psp_button_names[] = { {VIRTKEY_ANALOG_ROTATE_CW, "Rotate Analog (CW)"}, {VIRTKEY_ANALOG_ROTATE_CCW, "Rotate Analog (CCW)"}, + {VIRTKEY_SCREEN_ROTATION_VERTICAL, "Portrait"}, + {VIRTKEY_SCREEN_ROTATION_VERTICAL180, "Portrait reversed"}, + {VIRTKEY_SCREEN_ROTATION_HORIZONTAL, "Landscape"}, + {VIRTKEY_SCREEN_ROTATION_HORIZONTAL180, "Landscape reversed"}, + {CTRL_HOME, "Home"}, {CTRL_HOLD, "Hold"}, {CTRL_WLAN, "Wlan"}, diff --git a/Core/KeyMap.h b/Core/KeyMap.h index b2a1266e9c..f9ea99c68f 100644 --- a/Core/KeyMap.h +++ b/Core/KeyMap.h @@ -63,6 +63,10 @@ enum { VIRTKEY_OPENCHAT = 0x4000001D, VIRTKEY_ANALOG_ROTATE_CW = 0x4000001E, VIRTKEY_ANALOG_ROTATE_CCW = 0x4000001F, + VIRTKEY_SCREEN_ROTATION_VERTICAL = 0x40000020, + VIRTKEY_SCREEN_ROTATION_VERTICAL180 = 0x40000021, + VIRTKEY_SCREEN_ROTATION_HORIZONTAL = 0x40000022, + VIRTKEY_SCREEN_ROTATION_HORIZONTAL180 = 0x40000023, VIRTKEY_LAST, VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST }; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index dc19003774..b2a32c45ec 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -709,6 +709,18 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) { case VIRTKEY_MUTE_TOGGLE: g_Config.bEnableSound = !g_Config.bEnableSound; break; + case VIRTKEY_SCREEN_ROTATION_VERTICAL: + g_Config.iInternalScreenRotation = ROTATION_LOCKED_VERTICAL; + break; + case VIRTKEY_SCREEN_ROTATION_VERTICAL180: + g_Config.iInternalScreenRotation = ROTATION_LOCKED_VERTICAL180; + break; + case VIRTKEY_SCREEN_ROTATION_HORIZONTAL: + g_Config.iInternalScreenRotation = ROTATION_LOCKED_HORIZONTAL; + break; + case VIRTKEY_SCREEN_ROTATION_HORIZONTAL180: + g_Config.iInternalScreenRotation = ROTATION_LOCKED_HORIZONTAL180; + break; } } From caa9eacf4b8b11d9ce81a01582c8179f7b80e090 Mon Sep 17 00:00:00 2001 From: iota97 Date: Sat, 23 Apr 2022 19:20:38 +0200 Subject: [PATCH 2/2] Make UI a bit more descriptive --- Core/KeyMap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp index 10f8bd1dce..779cdf66fb 100644 --- a/Core/KeyMap.cpp +++ b/Core/KeyMap.cpp @@ -395,10 +395,10 @@ const KeyMap_IntStrPair psp_button_names[] = { {VIRTKEY_ANALOG_ROTATE_CW, "Rotate Analog (CW)"}, {VIRTKEY_ANALOG_ROTATE_CCW, "Rotate Analog (CCW)"}, - {VIRTKEY_SCREEN_ROTATION_VERTICAL, "Portrait"}, - {VIRTKEY_SCREEN_ROTATION_VERTICAL180, "Portrait reversed"}, - {VIRTKEY_SCREEN_ROTATION_HORIZONTAL, "Landscape"}, - {VIRTKEY_SCREEN_ROTATION_HORIZONTAL180, "Landscape reversed"}, + {VIRTKEY_SCREEN_ROTATION_VERTICAL, "Display Portrait"}, + {VIRTKEY_SCREEN_ROTATION_VERTICAL180, "Display Portrait Reversed"}, + {VIRTKEY_SCREEN_ROTATION_HORIZONTAL, "Display Landscape"}, + {VIRTKEY_SCREEN_ROTATION_HORIZONTAL180, "Display Landscape Reversed"}, {CTRL_HOME, "Home"}, {CTRL_HOLD, "Hold"},