add hotkey to cycle layout

Closes #1868.
Supersedes #1020.

Author: guidocella

src/frontend/qt_sdl/Config.cpp

@@ -162,6 +162,7 @@ LegacyEntry LegacyFile[] =
     {"HKKey_FastForward",         0, "Keyboard.HK_FastForward", true},
     {"HKKey_FastForwardToggle",   0, "Keyboard.HK_FrameLimitToggle", true},
     {"HKKey_FullscreenToggle",    0, "Keyboard.HK_FullscreenToggle", true},
+    {"HKKey_SwapScreenLayouts",   0, "Keyboard.HK_SwapScreenLayouts", true},
     {"HKKey_SwapScreens",         0, "Keyboard.HK_SwapScreens", true},
     {"HKKey_SwapScreenEmphasis",  0, "Keyboard.HK_SwapScreenEmphasis", true},
     {"HKKey_SolarSensorDecrease", 0, "Keyboard.HK_SolarSensorDecrease", true},
@@ -182,6 +183,7 @@ LegacyEntry LegacyFile[] =
     {"HKJoy_FastForward",         0, "Joystick.HK_FastForward", true},
     {"HKJoy_FastForwardToggle",   0, "Joystick.HK_FrameLimitToggle", true},
     {"HKJoy_FullscreenToggle",    0, "Joystick.HK_FullscreenToggle", true},
+    {"HKJoy_SwapScreenLayouts",   0, "Joystick.HK_SwapScreenLayouts", true},
     {"HKJoy_SwapScreens",         0, "Joystick.HK_SwapScreens", true},
     {"HKJoy_SwapScreenEmphasis",  0, "Joystick.HK_SwapScreenEmphasis", true},
     {"HKJoy_SolarSensorDecrease", 0, "Joystick.HK_SolarSensorDecrease", true},

src/frontend/qt_sdl/EmuInstance.h

@@ -40,6 +40,7 @@ enum
     HK_FastForward,
     HK_FrameLimitToggle,
     HK_FullscreenToggle,
+    HK_SwapScreenLayouts,
     HK_SwapScreens,
     HK_SwapScreenEmphasis,
     HK_SolarSensorDecrease,

src/frontend/qt_sdl/EmuInstanceInput.cpp

@@ -52,6 +52,7 @@ const char* EmuInstance::hotkeyNames[HK_MAX] =
     "HK_FastForward",
     "HK_FrameLimitToggle",
     "HK_FullscreenToggle",
+    "HK_SwapScreenLayouts",
     "HK_SwapScreens",
     "HK_SwapScreenEmphasis",
     "HK_SolarSensorDecrease",

src/frontend/qt_sdl/EmuThread.cpp

@@ -76,6 +76,7 @@ void EmuThread::attachWindow(MainWindow* window)
     connect(this, SIGNAL(windowEmuReset()), window, SLOT(onEmuReset()));
     connect(this, SIGNAL(autoScreenSizingChange(int)), window->panel, SLOT(onAutoScreenSizingChanged(int)));
     connect(this, SIGNAL(windowFullscreenToggle()), window, SLOT(onFullscreenToggled()));
+    connect(this, SIGNAL(screenLayoutToggle()), window, SLOT(onScreenLayoutToggled()));
     connect(this, SIGNAL(screenEmphasisToggle()), window, SLOT(onScreenEmphasisToggled()));
 
     if (window->winHasMenu())
@@ -94,6 +95,7 @@ void EmuThread::detachWindow(MainWindow* window)
     disconnect(this, SIGNAL(windowEmuReset()), window, SLOT(onEmuReset()));
     disconnect(this, SIGNAL(autoScreenSizingChange(int)), window->panel, SLOT(onAutoScreenSizingChanged(int)));
     disconnect(this, SIGNAL(windowFullscreenToggle()), window, SLOT(onFullscreenToggled()));
+    disconnect(this, SIGNAL(screenLayoutToggle()), window, SLOT(onScreenLayoutToggled()));
     disconnect(this, SIGNAL(screenEmphasisToggle()), window, SLOT(onScreenEmphasisToggled()));
 
     if (window->winHasMenu())
@@ -165,6 +167,7 @@ void EmuThread::run()
 
         if (emuInstance->hotkeyPressed(HK_FullscreenToggle)) emit windowFullscreenToggle();
 
+        if (emuInstance->hotkeyPressed(HK_SwapScreenLayouts)) emit screenLayoutToggle();
         if (emuInstance->hotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
         if (emuInstance->hotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle();
 

src/frontend/qt_sdl/EmuThread.h

@@ -155,6 +155,7 @@ class EmuThread : public QThread
 
     void windowFullscreenToggle();
 
+    void screenLayoutToggle();
     void swapScreensToggle();
     void screenEmphasisToggle();
 

src/frontend/qt_sdl/InputConfig/InputConfigDialog.h

@@ -63,6 +63,7 @@ static constexpr std::initializer_list<int> hk_general =
     HK_FullscreenToggle,
     HK_Lid,
     HK_Mic,
+    HK_SwapScreenLayouts,
     HK_SwapScreens,
     HK_SwapScreenEmphasis,
     HK_PowerButton,
@@ -84,6 +85,7 @@ static constexpr std::initializer_list<const char*> hk_general_labels =
     "Toggle fullscreen",
     "Close/open lid",
     "Microphone",
+    "Swap screen layouts",
     "Swap screens",
     "Swap screen emphasis",
     "DSi Power button",

src/frontend/qt_sdl/Window.cpp

@@ -2210,6 +2210,25 @@ void MainWindow::onFullscreenToggled()
     toggleFullscreen();
 }
 
+void MainWindow::onScreenLayoutToggled()
+{
+    int layout = windowCfg.GetInt("ScreenLayout");
+    int rotation = windowCfg.GetInt("ScreenRotation");
+    bool horizontal = rotation == screenRot_0Deg || rotation == screenRot_180Deg;
+
+    // Skip layouts with no visible difference.
+    if (layout == screenLayout_Natural && horizontal ||
+        layout == screenLayout_Vertical && !horizontal) {
+        layout++;
+    }
+    layout = (layout + 1) % 4;
+
+    windowCfg.SetInt("ScreenLayout", layout);
+    actScreenLayout[layout]->setChecked(true);
+
+    emit screenLayoutChange();
+}
+
 void MainWindow::onScreenEmphasisToggled()
 {
     int currentSizing = windowCfg.GetInt("ScreenSizing");

src/frontend/qt_sdl/Window.h

@@ -182,6 +182,7 @@ private slots:
     void onUpdateVideoSettings(bool glchange);
 
     void onFullscreenToggled();
+    void onScreenLayoutToggled();
     void onScreenEmphasisToggled();
 
 private: