From cdca5eaf788ebc9cd1443cb02412528cf595f1db Mon Sep 17 00:00:00 2001 From: AnimeGIF <30175255+Anime37@users.noreply.github.com> Date: Tue, 8 Jul 2025 00:55:57 +0300 Subject: [PATCH] UI: Add configurable hotkeys + a new fast forward hotkey (#1519) --- src/config/CemuConfig.cpp | 18 + src/config/CemuConfig.h | 55 +++ src/config/XMLConfig.h | 5 +- src/gui/CMakeLists.txt | 2 + src/gui/CemuApp.cpp | 3 + src/gui/MainWindow.cpp | 18 +- src/gui/input/HotkeySettings.cpp | 389 ++++++++++++++++++++ src/gui/input/HotkeySettings.h | 60 +++ src/input/api/Controller.cpp | 4 + src/resource/cemu.rc | 1 + src/resource/embedded/X_HOTKEY_SETTINGS.xpm | 70 ++++ src/resource/embedded/resources.cpp | 1 + src/resource/embedded/resources.h | 1 + src/resource/icons8_hotkeys.ico | Bin 0 -> 16958 bytes src/resource/icons8_hotkeys.png | Bin 0 -> 506 bytes 15 files changed, 619 insertions(+), 8 deletions(-) create mode 100644 src/gui/input/HotkeySettings.cpp create mode 100644 src/gui/input/HotkeySettings.h create mode 100644 src/resource/embedded/X_HOTKEY_SETTINGS.xpm create mode 100644 src/resource/icons8_hotkeys.ico create mode 100644 src/resource/icons8_hotkeys.png diff --git a/src/config/CemuConfig.cpp b/src/config/CemuConfig.cpp index 809a5470..47fc5876 100644 --- a/src/config/CemuConfig.cpp +++ b/src/config/CemuConfig.cpp @@ -354,6 +354,15 @@ void CemuConfig::Load(XMLConfigParser& parser) dsu_client.host = dsuc.get_attribute("host", dsu_client.host); dsu_client.port = dsuc.get_attribute("port", dsu_client.port); + // hotkeys + auto xml_hotkeys = parser.get("Hotkeys"); + hotkeys.modifiers = xml_hotkeys.get("modifiers", sHotkeyCfg{}); + hotkeys.exitFullscreen = xml_hotkeys.get("ExitFullscreen", sHotkeyCfg{uKeyboardHotkey{WXK_ESCAPE}}); + hotkeys.toggleFullscreen = xml_hotkeys.get("ToggleFullscreen", sHotkeyCfg{uKeyboardHotkey{WXK_F11}}); + hotkeys.toggleFullscreenAlt = xml_hotkeys.get("ToggleFullscreenAlt", sHotkeyCfg{uKeyboardHotkey{WXK_CONTROL_M, true}}); // ALT+ENTER + hotkeys.takeScreenshot = xml_hotkeys.get("TakeScreenshot", sHotkeyCfg{uKeyboardHotkey{WXK_F12}}); + hotkeys.toggleFastForward = xml_hotkeys.get("ToggleFastForward", sHotkeyCfg{}); + // emulatedusbdevices auto usbdevices = parser.get("EmulatedUsbDevices"); emulated_usb_devices.emulate_skylander_portal = usbdevices.get("EmulateSkylanderPortal", emulated_usb_devices.emulate_skylander_portal); @@ -557,6 +566,15 @@ void CemuConfig::Save(XMLConfigParser& parser) dsuc.set_attribute("host", dsu_client.host); dsuc.set_attribute("port", dsu_client.port); + // hotkeys + auto xml_hotkeys = config.set("Hotkeys"); + xml_hotkeys.set("modifiers", hotkeys.modifiers); + xml_hotkeys.set("ExitFullscreen", hotkeys.exitFullscreen); + xml_hotkeys.set("ToggleFullscreen", hotkeys.toggleFullscreen); + xml_hotkeys.set("ToggleFullscreenAlt", hotkeys.toggleFullscreenAlt); + xml_hotkeys.set("TakeScreenshot", hotkeys.takeScreenshot); + xml_hotkeys.set("ToggleFastForward", hotkeys.toggleFastForward); + // emulated usb devices auto usbdevices = config.set("EmulatedUsbDevices"); usbdevices.set("EmulateSkylanderPortal", emulated_usb_devices.emulate_skylander_portal.GetValue()); diff --git a/src/config/CemuConfig.h b/src/config/CemuConfig.h index ca896eed..353e4994 100644 --- a/src/config/CemuConfig.h +++ b/src/config/CemuConfig.h @@ -191,6 +191,50 @@ enum class CrashDump ENABLE_ENUM_ITERATORS(CrashDump, CrashDump::Disabled, CrashDump::Enabled); #endif +typedef union +{ + struct + { + uint16 key : 13; // enough bits for all keycodes + uint16 alt : 1; + uint16 ctrl : 1; + uint16 shift : 1; + }; + uint16 raw; +} uKeyboardHotkey; + +typedef sint16 ControllerHotkey_t; + +struct sHotkeyCfg +{ + static constexpr uint8 keyboardNone{WXK_NONE}; + static constexpr sint8 controllerNone{-1}; // no enums to work with, but buttons start from 0 + + uKeyboardHotkey keyboard{keyboardNone}; + ControllerHotkey_t controller{controllerNone}; + + /* for defaults */ + sHotkeyCfg(const uKeyboardHotkey& keyboard = {WXK_NONE}, const ControllerHotkey_t& controller = {-1}) : + keyboard(keyboard), controller(controller) {}; + + /* for reading from xml */ + sHotkeyCfg(const char* xml_values) + { + std::istringstream iss(xml_values); + iss >> keyboard.raw >> controller; + } +}; + +template <> +struct fmt::formatter : formatter +{ + template + auto format(const sHotkeyCfg c, FormatContext &ctx) const { + std::string xml_values = fmt::format("{} {}", c.keyboard.raw, c.controller); + return formatter::format(xml_values, ctx); + } +}; + template <> struct fmt::formatter : formatter { template @@ -499,6 +543,17 @@ struct CemuConfig ConfigValue port{ 26760 }; }dsu_client{}; + // hotkeys + struct + { + sHotkeyCfg modifiers; + sHotkeyCfg toggleFullscreen; + sHotkeyCfg toggleFullscreenAlt; + sHotkeyCfg exitFullscreen; + sHotkeyCfg takeScreenshot; + sHotkeyCfg toggleFastForward; + } hotkeys{}; + // debug ConfigValueBounds crash_dump{ CrashDump::Disabled }; ConfigValue gdb_port{ 1337 }; diff --git a/src/config/XMLConfig.h b/src/config/XMLConfig.h index 2a32dc56..dbec8a6e 100644 --- a/src/config/XMLConfig.h +++ b/src/config/XMLConfig.h @@ -7,6 +7,9 @@ #include #include +template +concept HasConstCharConstructor = requires { T(std::declval()); }; + class XMLConfigParser { public: @@ -43,7 +46,7 @@ public: return element->Int64Text(default_value); else if constexpr (std::is_same_v) // doesnt support real uint64... return (uint64)element->Int64Text((sint64)default_value); - else if constexpr (std::is_same_v || std::is_same_v) + else if constexpr (std::is_same_v || std::is_same_v || HasConstCharConstructor) { const char* text = element->GetText(); return text ? text : default_value; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 7cdc208e..744ad544 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -71,6 +71,8 @@ add_library(CemuGui helpers/wxLogEvent.h helpers/wxWayland.cpp helpers/wxWayland.h + input/HotkeySettings.cpp + input/HotkeySettings.h input/InputAPIAddWindow.cpp input/InputAPIAddWindow.h input/InputSettings2.cpp diff --git a/src/gui/CemuApp.cpp b/src/gui/CemuApp.cpp index c3606292..37fdbe6d 100644 --- a/src/gui/CemuApp.cpp +++ b/src/gui/CemuApp.cpp @@ -11,6 +11,7 @@ #include "input/InputManager.h" #include "gui/helpers/wxHelpers.h" #include "Cemu/ncrypto/ncrypto.h" +#include "gui/input/HotkeySettings.h" #if BOOST_OS_LINUX && HAS_WAYLAND #include "gui/helpers/wxWayland.h" @@ -331,6 +332,8 @@ bool CemuApp::OnInit() std::unique_lock lock(g_mutex); g_window_info.app_active = true; + HotkeySettings::Init(m_mainFrame); + SetTopWindow(m_mainFrame); m_mainFrame->Show(); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index bf880e48..3810656c 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -40,6 +40,7 @@ #include "gui/helpers/wxHelpers.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h" #include "gui/input/InputSettings2.h" +#include "gui/input/HotkeySettings.h" #include "input/InputManager.h" #if BOOST_OS_WINDOWS @@ -91,6 +92,7 @@ enum MAINFRAME_MENU_ID_OPTIONS_GENERAL2, MAINFRAME_MENU_ID_OPTIONS_AUDIO, MAINFRAME_MENU_ID_OPTIONS_INPUT, + MAINFRAME_MENU_ID_OPTIONS_HOTKEY, MAINFRAME_MENU_ID_OPTIONS_MAC_SETTINGS, // options -> account MAINFRAME_MENU_ID_OPTIONS_ACCOUNT_1 = 20350, @@ -189,6 +191,7 @@ EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_GENERAL, MainWindow::OnOptionsInput) EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_GENERAL2, MainWindow::OnOptionsInput) EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_AUDIO, MainWindow::OnOptionsInput) EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_INPUT, MainWindow::OnOptionsInput) +EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_HOTKEY, MainWindow::OnOptionsInput) EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_MAC_SETTINGS, MainWindow::OnOptionsInput) // tools menu EVT_MENU(MAINFRAME_MENU_ID_TOOLS_MEMORY_SEARCHER, MainWindow::OnToolsInput) @@ -933,6 +936,12 @@ void MainWindow::OnOptionsInput(wxCommandEvent& event) break; } + case MAINFRAME_MENU_ID_OPTIONS_HOTKEY: + { + auto* frame = new HotkeySettings(this); + frame->Show(); + break; + } } } @@ -1446,13 +1455,7 @@ void MainWindow::OnKeyUp(wxKeyEvent& event) if (swkbd_hasKeyboardInputHook()) return; - const auto code = event.GetKeyCode(); - if (code == WXK_ESCAPE) - SetFullScreen(false); - else if (code == WXK_RETURN && event.AltDown() || code == WXK_F11) - SetFullScreen(!IsFullScreen()); - else if (code == WXK_F12) - g_window_info.has_screenshot_request = true; // async screenshot request + HotkeySettings::CaptureInput(event); } void MainWindow::OnKeyDown(wxKeyEvent& event) @@ -2189,6 +2192,7 @@ void MainWindow::RecreateMenu() #endif optionsMenu->Append(MAINFRAME_MENU_ID_OPTIONS_GENERAL2, _("&General settings")); optionsMenu->Append(MAINFRAME_MENU_ID_OPTIONS_INPUT, _("&Input settings")); + optionsMenu->Append(MAINFRAME_MENU_ID_OPTIONS_HOTKEY, _("&Hotkey settings")); optionsMenu->AppendSeparator(); optionsMenu->AppendSubMenu(m_optionsAccountMenu, _("&Active account")); diff --git a/src/gui/input/HotkeySettings.cpp b/src/gui/input/HotkeySettings.cpp new file mode 100644 index 00000000..2586b36d --- /dev/null +++ b/src/gui/input/HotkeySettings.cpp @@ -0,0 +1,389 @@ +#include "gui/input/HotkeySettings.h" +#include +#include +#include "input/InputManager.h" +#include "HotkeySettings.h" + +#if BOOST_OS_LINUX || BOOST_OS_MACOS +#include "resource/embedded/resources.h" +#endif + +extern WindowInfo g_window_info; +const std::unordered_map> HotkeySettings::s_cfgHotkeyToFuncMap{ + {&s_cfgHotkeys.toggleFullscreen, [](void) { s_mainWindow->ShowFullScreen(!s_mainWindow->IsFullScreen()); }}, + {&s_cfgHotkeys.toggleFullscreenAlt, [](void) { s_mainWindow->ShowFullScreen(!s_mainWindow->IsFullScreen()); }}, + {&s_cfgHotkeys.exitFullscreen, [](void) { s_mainWindow->ShowFullScreen(false); }}, + {&s_cfgHotkeys.takeScreenshot, [](void) { g_window_info.has_screenshot_request = true; }}, + {&s_cfgHotkeys.toggleFastForward, [](void) { ActiveSettings::SetTimerShiftFactor((ActiveSettings::GetTimerShiftFactor() < 3) ? 3 : 1); }}, +}; + +struct HotkeyEntry +{ + std::unique_ptr name; + std::unique_ptr keyInput; + std::unique_ptr controllerInput; + sHotkeyCfg& hotkey; + + HotkeyEntry(wxStaticText* name, wxButton* keyInput, wxButton* controllerInput, sHotkeyCfg& hotkey) + : name(name), keyInput(keyInput), controllerInput(controllerInput), hotkey(hotkey) + { + keyInput->SetClientData(&hotkey); + controllerInput->SetClientData(&hotkey); + } +}; + +HotkeySettings::HotkeySettings(wxWindow* parent) + : wxFrame(parent, wxID_ANY, _("Hotkey Settings")) +{ + SetIcon(wxICON(X_HOTKEY_SETTINGS)); + + m_sizer = new wxFlexGridSizer(0, 3, 5, 5); + m_sizer->AddGrowableCol(1); + m_sizer->AddGrowableCol(2); + + m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE); + m_panel->SetSizer(m_sizer); + m_panel->SetBackgroundColour(*wxWHITE); + + Center(); + + SetActiveController(); + + CreateColumnHeaders(); + + /* global modifier */ + CreateHotkeyRow("Hotkey modifier", s_cfgHotkeys.modifiers); + m_hotkeys.at(0).keyInput->Hide(); + + /* hotkeys */ + CreateHotkeyRow("Toggle fullscreen", s_cfgHotkeys.toggleFullscreen); + CreateHotkeyRow("Take screenshot", s_cfgHotkeys.takeScreenshot); + CreateHotkeyRow("Toggle fast-forward", s_cfgHotkeys.toggleFastForward); + + m_controllerTimer = new wxTimer(this); + Bind(wxEVT_TIMER, &HotkeySettings::OnControllerTimer, this); + + m_sizer->SetSizeHints(this); +} + +HotkeySettings::~HotkeySettings() +{ + m_controllerTimer->Stop(); + if (m_needToSave) + { + g_config.Save(); + } +} + +void HotkeySettings::Init(wxFrame* mainWindowFrame) +{ + s_keyboardHotkeyToFuncMap.reserve(s_cfgHotkeyToFuncMap.size()); + for (const auto& [cfgHotkey, func] : s_cfgHotkeyToFuncMap) + { + auto keyboardHotkey = cfgHotkey->keyboard.raw; + if (keyboardHotkey > sHotkeyCfg::keyboardNone) + { + s_keyboardHotkeyToFuncMap[keyboardHotkey] = func; + } + auto controllerHotkey = cfgHotkey->controller; + if (controllerHotkey > sHotkeyCfg::controllerNone) + { + s_controllerHotkeyToFuncMap[controllerHotkey] = func; + } + } + s_mainWindow = mainWindowFrame; +} + +void HotkeySettings::CreateColumnHeaders(void) +{ + auto* emptySpace = new wxStaticText(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); + auto* keyboard = new wxStaticText(m_panel, wxID_ANY, "Keyboard", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); + auto* controller = new wxStaticText(m_panel, wxID_ANY, "Controller", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); + + keyboard->SetMinSize(m_minButtonSize); + controller->SetMinSize(m_minButtonSize); + + auto flags = wxSizerFlags().Expand(); + m_sizer->Add(emptySpace, flags); + m_sizer->Add(keyboard, flags); + m_sizer->Add(controller, flags); +} + +void HotkeySettings::CreateHotkeyRow(const wxString& label, sHotkeyCfg& cfgHotkey) +{ + auto* name = new wxStaticText(m_panel, wxID_ANY, label); + auto* keyInput = new wxButton(m_panel, wxID_ANY, To_wxString(cfgHotkey.keyboard), wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxBU_EXACTFIT); + auto* controllerInput = new wxButton(m_panel, wxID_ANY, To_wxString(cfgHotkey.controller), wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxBU_EXACTFIT); + + /* for starting input */ + keyInput->Bind(wxEVT_BUTTON, &HotkeySettings::OnKeyboardHotkeyInputLeftClick, this); + controllerInput->Bind(wxEVT_BUTTON, &HotkeySettings::OnControllerHotkeyInputLeftClick, this); + + /* for cancelling and clearing input */ + keyInput->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(HotkeySettings::OnKeyboardHotkeyInputRightClick), NULL, this); + controllerInput->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(HotkeySettings::OnControllerHotkeyInputRightClick), NULL, this); + + keyInput->SetMinSize(m_minButtonSize); + controllerInput->SetMinSize(m_minButtonSize); + +#if BOOST_OS_WINDOWS + const wxColour inputButtonColor = 0xfafafa; +#else + const wxColour inputButtonColor = GetBackgroundColour(); +#endif + keyInput->SetBackgroundColour(inputButtonColor); + controllerInput->SetBackgroundColour(inputButtonColor); + + auto flags = wxSizerFlags(1).Expand().Border(wxALL, 5).CenterVertical(); + m_sizer->Add(name, flags); + m_sizer->Add(keyInput, flags); + m_sizer->Add(controllerInput, flags); + + m_hotkeys.emplace_back(name, keyInput, controllerInput, cfgHotkey); +} + +void HotkeySettings::OnControllerTimer(wxTimerEvent& event) +{ + if (m_activeController.expired()) + { + m_controllerTimer->Stop(); + return; + } + auto& controller = *m_activeController.lock(); + auto buttons = controller.update_state().buttons; + if (!buttons.IsIdle()) + { + for (const auto& newHotkey : buttons.GetButtonList()) + { + m_controllerTimer->Stop(); + auto* inputButton = static_cast(m_controllerTimer->GetClientData()); + auto& cfgHotkey = *static_cast(inputButton->GetClientData()); + const auto oldHotkey = cfgHotkey.controller; + const bool isModifier = (&cfgHotkey == &s_cfgHotkeys.modifiers); + /* ignore same hotkeys and block duplicate hotkeys */ + if ((newHotkey != oldHotkey) && (isModifier || (newHotkey != s_cfgHotkeys.modifiers.controller)) && + (s_controllerHotkeyToFuncMap.find(newHotkey) == s_controllerHotkeyToFuncMap.end())) + { + m_needToSave |= true; + cfgHotkey.controller = newHotkey; + /* don't bind modifier to map */ + if (!isModifier) + { + s_controllerHotkeyToFuncMap.erase(oldHotkey); + s_controllerHotkeyToFuncMap[newHotkey] = s_cfgHotkeyToFuncMap.at(&cfgHotkey); + } + } + FinalizeInput(inputButton); + return; + } + } +} + +void HotkeySettings::OnKeyboardHotkeyInputLeftClick(wxCommandEvent& event) +{ + auto* inputButton = static_cast(event.GetEventObject()); + if (m_activeInputButton) + { + /* ignore multiple clicks of the same button */ + if (inputButton == m_activeInputButton) return; + RestoreInputButton(); + } + inputButton->Bind(wxEVT_KEY_UP, &HotkeySettings::OnKeyUp, this); + inputButton->SetLabelText(m_editModeHotkeyText); + m_activeInputButton = inputButton; +} + +void HotkeySettings::OnControllerHotkeyInputLeftClick(wxCommandEvent& event) +{ + auto* inputButton = static_cast(event.GetEventObject()); + if (m_activeInputButton) + { + /* ignore multiple clicks of the same button */ + if (inputButton == m_activeInputButton) return; + RestoreInputButton(); + } + m_controllerTimer->Stop(); + if (!SetActiveController()) + { + return; + } + inputButton->SetLabelText(m_editModeHotkeyText); + m_controllerTimer->SetClientData(inputButton); + m_controllerTimer->Start(25); + m_activeInputButton = inputButton; +} + +void HotkeySettings::OnKeyboardHotkeyInputRightClick(wxMouseEvent& event) +{ + if (m_activeInputButton) + { + RestoreInputButton(); + return; + } + auto* inputButton = static_cast(event.GetEventObject()); + auto& cfgHotkey = *static_cast(inputButton->GetClientData()); + uKeyboardHotkey newHotkey{ sHotkeyCfg::keyboardNone }; + if (cfgHotkey.keyboard.raw != newHotkey.raw) + { + m_needToSave |= true; + s_keyboardHotkeyToFuncMap.erase(cfgHotkey.keyboard.raw); + cfgHotkey.keyboard = newHotkey; + FinalizeInput(inputButton); + } +} + +void HotkeySettings::OnControllerHotkeyInputRightClick(wxMouseEvent& event) +{ + if (m_activeInputButton) + { + RestoreInputButton(); + return; + } + auto* inputButton = static_cast(event.GetEventObject()); + auto& cfgHotkey = *static_cast(inputButton->GetClientData()); + ControllerHotkey_t newHotkey{ sHotkeyCfg::controllerNone }; + if (cfgHotkey.controller != newHotkey) + { + m_needToSave |= true; + s_controllerHotkeyToFuncMap.erase(cfgHotkey.controller); + cfgHotkey.controller = newHotkey; + FinalizeInput(inputButton); + } +} + +bool HotkeySettings::SetActiveController(void) +{ + auto emulatedController = InputManager::instance().get_controller(0); + if (emulatedController.use_count() <= 1) + { + return false; + } + const auto& controllers = emulatedController->get_controllers(); + if (controllers.empty()) + { + return false; + } + m_activeController = controllers.at(0); + return true; +} + +void HotkeySettings::OnKeyUp(wxKeyEvent& event) +{ + auto* inputButton = static_cast(event.GetEventObject()); + auto& cfgHotkey = *static_cast(inputButton->GetClientData()); + if (auto keycode = event.GetKeyCode(); IsValidKeycodeUp(keycode)) + { + auto oldHotkey = cfgHotkey.keyboard; + uKeyboardHotkey newHotkey{}; + newHotkey.key = keycode; + newHotkey.alt = event.AltDown(); + newHotkey.ctrl = event.ControlDown(); + newHotkey.shift = event.ShiftDown(); + if ((newHotkey.raw != oldHotkey.raw) && + (s_keyboardHotkeyToFuncMap.find(newHotkey.raw) == s_keyboardHotkeyToFuncMap.end())) + { + m_needToSave |= true; + cfgHotkey.keyboard = newHotkey; + s_keyboardHotkeyToFuncMap.erase(oldHotkey.raw); + s_keyboardHotkeyToFuncMap[newHotkey.raw] = s_cfgHotkeyToFuncMap.at(&cfgHotkey); + } + } + FinalizeInput(inputButton); +} + +template +void HotkeySettings::FinalizeInput(wxButton* inputButton) +{ + auto& cfgHotkey = *static_cast(inputButton->GetClientData()); + if constexpr (std::is_same_v) + { + inputButton->Unbind(wxEVT_KEY_UP, &HotkeySettings::OnKeyUp, this); + inputButton->SetLabelText(To_wxString(cfgHotkey.keyboard)); + } else if constexpr (std::is_same_v) + { + inputButton->SetLabelText(To_wxString(cfgHotkey.controller)); + } + m_activeInputButton = nullptr; +} + +template +void HotkeySettings::RestoreInputButton(void) +{ + FinalizeInput(m_activeInputButton); +} + +bool HotkeySettings::IsValidKeycodeUp(int keycode) +{ + switch (keycode) + { + case WXK_NONE: + case WXK_ESCAPE: + case WXK_ALT: + case WXK_CONTROL: + case WXK_SHIFT: + return false; + default: + return true; + } +} + +wxString HotkeySettings::To_wxString(uKeyboardHotkey hotkey) +{ + if (hotkey.raw == sHotkeyCfg::keyboardNone) { + return m_disabledHotkeyText; + } + wxString ret{}; + if (hotkey.alt) + { + ret.append(_("Alt + ")); + } + if (hotkey.ctrl) + { + ret.append(_("Ctrl + ")); + } + if (hotkey.shift) + { + ret.append(_("Shift + ")); + } + ret.append(wxAcceleratorEntry(0, hotkey.key).ToString()); + return ret; +} + +wxString HotkeySettings::To_wxString(ControllerHotkey_t hotkey) +{ + if ((hotkey == sHotkeyCfg::controllerNone) || m_activeController.expired()) { + return m_disabledHotkeyText; + } + return m_activeController.lock()->get_button_name(hotkey); +} + +void HotkeySettings::CaptureInput(wxKeyEvent& event) +{ + uKeyboardHotkey hotkey{}; + hotkey.key = event.GetKeyCode(); + hotkey.alt = event.AltDown(); + hotkey.ctrl = event.ControlDown(); + hotkey.shift = event.ShiftDown(); + const auto it = s_keyboardHotkeyToFuncMap.find(hotkey.raw); + if (it != s_keyboardHotkeyToFuncMap.end()) + it->second(); +} + +void HotkeySettings::CaptureInput(const ControllerState& currentState, const ControllerState& lastState) +{ + const auto& modifier = s_cfgHotkeys.modifiers.controller; + if ((modifier >= 0) && currentState.buttons.GetButtonState(modifier)) + { + for (const auto& buttonId : currentState.buttons.GetButtonList()) + { + const auto it = s_controllerHotkeyToFuncMap.find(buttonId); + if (it == s_controllerHotkeyToFuncMap.end()) + continue; + /* only capture clicks */ + if (lastState.buttons.GetButtonState(buttonId)) + break; + it->second(); + break; + } + } +} diff --git a/src/gui/input/HotkeySettings.h b/src/gui/input/HotkeySettings.h new file mode 100644 index 00000000..77478ea9 --- /dev/null +++ b/src/gui/input/HotkeySettings.h @@ -0,0 +1,60 @@ +#pragma once + +#include +#include "config/CemuConfig.h" +#include "input/api/Controller.h" + +class HotkeyEntry; + +class HotkeySettings : public wxFrame +{ +public: + static void Init(wxFrame* mainWindowFrame); + + static void CaptureInput(wxKeyEvent& event); + static void CaptureInput(const ControllerState& currentState, const ControllerState& lastState); + + HotkeySettings(wxWindow* parent); + ~HotkeySettings(); + +private: + inline static wxFrame* s_mainWindow = nullptr; + static const std::unordered_map> s_cfgHotkeyToFuncMap; + inline static std::unordered_map> s_keyboardHotkeyToFuncMap{}; + inline static std::unordered_map> s_controllerHotkeyToFuncMap{}; + inline static auto& s_cfgHotkeys = GetConfig().hotkeys; + + wxPanel* m_panel; + wxFlexGridSizer* m_sizer; + wxButton* m_activeInputButton{ nullptr }; + wxTimer* m_controllerTimer{ nullptr }; + const wxSize m_minButtonSize{ 250, 45 }; + const wxString m_disabledHotkeyText{ _("----") }; + const wxString m_editModeHotkeyText{ _("") }; + + std::vector m_hotkeys; + std::weak_ptr m_activeController{}; + bool m_needToSave = false; + + /* helpers */ + void CreateColumnHeaders(void); + void CreateHotkeyRow(const wxString& label, sHotkeyCfg& cfgHotkey); + wxString To_wxString(uKeyboardHotkey hotkey); + wxString To_wxString(ControllerHotkey_t hotkey); + bool IsValidKeycodeUp(int keycode); + bool SetActiveController(void); + + template + void FinalizeInput(wxButton* inputButton); + + template + void RestoreInputButton(void); + + /* events */ + void OnKeyboardHotkeyInputLeftClick(wxCommandEvent& event); + void OnControllerHotkeyInputLeftClick(wxCommandEvent& event); + void OnKeyboardHotkeyInputRightClick(wxMouseEvent& event); + void OnControllerHotkeyInputRightClick(wxMouseEvent& event); + void OnKeyUp(wxKeyEvent& event); + void OnControllerTimer(wxTimerEvent& event); +}; diff --git a/src/input/api/Controller.cpp b/src/input/api/Controller.cpp index b7831def..07465220 100644 --- a/src/input/api/Controller.cpp +++ b/src/input/api/Controller.cpp @@ -1,4 +1,6 @@ #include "input/api/Controller.h" +#include "config/CemuConfig.h" +#include "gui/input/HotkeySettings.h" #include "gui/guiWrapper.h" @@ -67,6 +69,8 @@ const ControllerState& ControllerBase::update_state() #undef APPLY_AXIS_BUTTON + HotkeySettings::CaptureInput(result, m_last_state); + m_last_state = std::move(result); return m_last_state; } diff --git a/src/resource/cemu.rc b/src/resource/cemu.rc index 6f78bfc3..fb397056 100644 --- a/src/resource/cemu.rc +++ b/src/resource/cemu.rc @@ -37,6 +37,7 @@ X_SETTINGS ICON "resource\\icons8_automatic_26_x X_GAME_PROFILE ICON "resource\\icons8-compose-filled-50.ico" +X_HOTKEY_SETTINGS ICON "resource\\icons8_hotkeys.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/src/resource/embedded/X_HOTKEY_SETTINGS.xpm b/src/resource/embedded/X_HOTKEY_SETTINGS.xpm new file mode 100644 index 00000000..473dac09 --- /dev/null +++ b/src/resource/embedded/X_HOTKEY_SETTINGS.xpm @@ -0,0 +1,70 @@ +/* XPM */ +const char *X_HOTKEY_SETTINGS_xpm[] = { +"64 64 2 1", +" c None", +". c #000000", +" ... ", +" .... ", +" .... ", +" .. .... ", +" .. ...... ", +" ... ...... ", +" ... ...... ", +" ... ....... ", +" .... ........ ... ", +" .... ......... ... ", +" .... ......... ... ", +" .... .......... .... ", +" .... ......... .... ", +" ..... ........... ..... ", +" ..... .......... ..... ", +" ........ ........... ...... ", +" ........ ... ....... ...... ", +" ........... ... ....... ...... ", +" ........... ..... ...... ....... ", +" ........... ..... ...... ........ ", +" ............. ...... ...... ......... ", +" ........ .... ...... .... ..... .... ", +" ........ .... ....... .... ...... .... ", +" ...... .... ...... ..... ....... ..... ", +" ...... ........... ............ .... ", +" ...... .......... .......... .... ", +" ..... .......... .......... .... ", +" ..... .......... ......... ..... ", +" ..... .......... ........ ..... ", +" ..... ........ ........ ...... ", +" ..... ..... ..... ..... ", +" ..... ..... .... ...... ", +" ..... ..... ", +" ... .... ", +" . ............................ .. ", +" ................................ ", +" ................................ ", +" .................................... ", +" .................................... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... .......... ", +" .......... .......... ", +" .......... .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .......... ........ .......... ", +" .................................... ", +" .................................... ", +" .................................... ", +" .................................... ", +" ................................ ", +" ................................ ", +" ............................. " +}; diff --git a/src/resource/embedded/resources.cpp b/src/resource/embedded/resources.cpp index 5dbb9d14..2b508c10 100644 --- a/src/resource/embedded/resources.cpp +++ b/src/resource/embedded/resources.cpp @@ -2,6 +2,7 @@ #include "M_WND_ICON128.xpm" #include "X_BOX.xpm" #include "X_SETTINGS.xpm" +#include "X_HOTKEY_SETTINGS.xpm" #include "icons8-checkmark-yes-32.hpng" #include "icons8-error-32.hpng" diff --git a/src/resource/embedded/resources.h b/src/resource/embedded/resources.h index 8cb9fe5d..26e9b759 100644 --- a/src/resource/embedded/resources.h +++ b/src/resource/embedded/resources.h @@ -2,6 +2,7 @@ extern const char* X_GAME_PROFILE_xpm[]; extern const char* M_WND_ICON128_xpm[]; extern const char* X_BOX_xpm[]; extern const char* X_SETTINGS_xpm[]; +extern const char* X_HOTKEY_SETTINGS_xpm[]; extern unsigned char PNG_CHECK_YES_png[573]; extern unsigned char PNG_ERROR_png[472]; diff --git a/src/resource/icons8_hotkeys.ico b/src/resource/icons8_hotkeys.ico new file mode 100644 index 0000000000000000000000000000000000000000..68f34ac4604a10bf746b47a8f30f392edcdd4ff7 GIT binary patch literal 16958 zcmeHPJB|}U5FN{bLlY4)gnJ9GI1wjcjR*)i0#~s_z%^z?KstzI0^^~p?HUzttK8k* z?q+RGBm33oRn@C;+a!plS-3y<_ll0tfF=QFMr z)hc#BY!<4U_~S^_=)Y5^x=Kc956+_;j$1hK=l$ss&7XhdGnnp8CBwSE7)LpnM}Oka z_n#ikeE%b#!E|pb8F+6kALUp)j!*m>z5mmGA!FX3uEfoK|3e@9l)ur>pTFl8&ikL9 z!2J2&9PM&@%YpzZ@hiOCOw9W2Uv!|Im^$Gli?|i1o<9 zJp0JY>GKSUR)5K1+u~xJ`4W*szRa_&@p8ntzeKCANU-su1Bjwmelyw%* zigPb3kG*sFJkvr=ix!jhQkRUAEf40{Cl1?;vM#61{VhDF^EEzmv>e6oSUip+Kex|wVi0F*HO$d+6w{8ywfI_( zOJnC|W6qi(dBl-E+FB3fu&;4T#CV>Cp_#IdxY9>k>xCTlHExL*&$BQz)2h?rS}%=9 zv6@HI5IbM1)nZn^6t30dx$#RiXmwW1(x~w*ZmBqGh@FFVnjh+gH6eb9{3RN&#_~gY zu`a|fl~2`ye9e#1D(hnSr8rUt*`b4c%}?nO;?~IH4(Dbf7yWa!l#~1rw`M*?m*k>d zQ*+K)a*t47$(44f?xp8bc9C3Zzw{kL`goUE9`hMPb=Qzj*@d}`*RWr1jl4T!?*7-% zk9TLh2F=gb$p3DI(KY1#39FoO+`0cCz$x$(1@3A5W*lwo*T?*&=tlbfh?n;JS1<1K z$L+cNI*tSFxE{y;VH^*HAJ&IAE06ouVYgontEI!<;U|wh#6Ue+x0ZZ;ox!D4z1I%ny?{%-wummL)ag2)31gH=WjZXhqhaj mcEVo{$932KApFv|1P(VIzYnd)pC|l%IQo8TpKU{4w4Sx>KPX(0ZB-#6pC`vv;D!>Ygf)F`CVz|{wc%NWZ z06L5RN6>YAh+;B@z$l<3SP1Z{;ZmneBt$D9OY40iYah^}k}D$zq*8&FfIG&eE2o{u z`s|4eRe-7p4FMxeqm|%>Xa(F6!z!UuHbPKkNeQqtDN!LIng^`_iTLx$z z2NeSRnp^A-V)fWNKlQk3Q>)yaM-aezIoqC}%9mMNVHmv2U{Un#=kuS~?yk