From be77df52b921156a610daefdcfd1ac61560ea99d Mon Sep 17 00:00:00 2001 From: SSimco <37044560+SSimco@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:34:03 +0300 Subject: [PATCH] Move wxWidgets gui to wxGui --- src/gui/CMakeLists.txt | 176 +----------------- src/gui/canvas/OpenGLCanvas.h | 8 - src/gui/wxGui/CMakeLists.txt | 171 +++++++++++++++++ src/gui/{ => wxGui}/CemuApp.cpp | 14 +- src/gui/{ => wxGui}/CemuApp.h | 0 src/gui/{ => wxGui}/CemuUpdateWindow.cpp | 2 +- src/gui/{ => wxGui}/CemuUpdateWindow.h | 0 src/gui/{ => wxGui}/ChecksumTool.cpp | 8 +- src/gui/{ => wxGui}/ChecksumTool.h | 2 +- .../DownloadGraphicPacksWindow.cpp | 4 +- .../{ => wxGui}/DownloadGraphicPacksWindow.h | 0 src/gui/{ => wxGui}/GameProfileWindow.cpp | 4 +- src/gui/{ => wxGui}/GameProfileWindow.h | 0 src/gui/{ => wxGui}/GameUpdateWindow.cpp | 8 +- src/gui/{ => wxGui}/GameUpdateWindow.h | 0 src/gui/{ => wxGui}/GeneralSettings2.cpp | 12 +- src/gui/{ => wxGui}/GeneralSettings2.h | 0 src/gui/{ => wxGui}/GettingStartedDialog.cpp | 10 +- src/gui/{ => wxGui}/GettingStartedDialog.h | 0 src/gui/{ => wxGui}/GraphicPacksWindow2.cpp | 6 +- src/gui/{ => wxGui}/GraphicPacksWindow2.h | 0 src/gui/{ => wxGui}/LoggingWindow.cpp | 6 +- src/gui/{ => wxGui}/LoggingWindow.h | 2 +- src/gui/{ => wxGui}/MainWindow.cpp | 48 ++--- src/gui/{ => wxGui}/MainWindow.h | 8 +- src/gui/{ => wxGui}/MemorySearcherTool.cpp | 6 +- src/gui/{ => wxGui}/MemorySearcherTool.h | 2 +- src/gui/{ => wxGui}/PadViewFrame.cpp | 14 +- src/gui/{ => wxGui}/PadViewFrame.h | 0 src/gui/{ => wxGui}/TitleManager.cpp | 22 +-- src/gui/{ => wxGui}/TitleManager.h | 0 src/gui/{ => wxGui}/canvas/IRenderCanvas.h | 0 src/gui/{ => wxGui}/canvas/OpenGLCanvas.cpp | 4 +- src/gui/wxGui/canvas/OpenGLCanvas.h | 5 + src/gui/{ => wxGui}/canvas/VulkanCanvas.cpp | 6 +- src/gui/{ => wxGui}/canvas/VulkanCanvas.h | 2 +- src/gui/{ => wxGui}/components/TextList.cpp | 2 +- src/gui/{ => wxGui}/components/TextList.h | 0 .../components/wxDownloadManagerList.cpp | 12 +- .../components/wxDownloadManagerList.h | 2 +- src/gui/{ => wxGui}/components/wxGameList.cpp | 12 +- src/gui/{ => wxGui}/components/wxGameList.h | 0 .../{ => wxGui}/components/wxInputDraw.cpp | 2 +- src/gui/{ => wxGui}/components/wxInputDraw.h | 0 src/gui/{ => wxGui}/components/wxLogCtrl.cpp | 2 +- src/gui/{ => wxGui}/components/wxLogCtrl.h | 0 .../components/wxTitleManagerList.cpp | 14 +- .../components/wxTitleManagerList.h | 2 +- .../debugger/AudioDebuggerWindow.cpp | 4 +- .../debugger/AudioDebuggerWindow.h | 0 .../{ => wxGui}/debugger/BreakpointWindow.cpp | 8 +- .../{ => wxGui}/debugger/BreakpointWindow.h | 2 +- .../{ => wxGui}/debugger/DebuggerWindow2.cpp | 16 +- .../{ => wxGui}/debugger/DebuggerWindow2.h | 2 +- src/gui/{ => wxGui}/debugger/DisasmCtrl.cpp | 8 +- src/gui/{ => wxGui}/debugger/DisasmCtrl.h | 2 +- src/gui/{ => wxGui}/debugger/DumpCtrl.cpp | 4 +- src/gui/{ => wxGui}/debugger/DumpCtrl.h | 2 +- src/gui/{ => wxGui}/debugger/DumpWindow.cpp | 8 +- src/gui/{ => wxGui}/debugger/DumpWindow.h | 2 +- src/gui/{ => wxGui}/debugger/ModuleWindow.cpp | 8 +- src/gui/{ => wxGui}/debugger/ModuleWindow.h | 0 src/gui/{ => wxGui}/debugger/RegisterCtrl.cpp | 6 +- src/gui/{ => wxGui}/debugger/RegisterCtrl.h | 2 +- .../{ => wxGui}/debugger/RegisterWindow.cpp | 6 +- src/gui/{ => wxGui}/debugger/RegisterWindow.h | 0 src/gui/{ => wxGui}/debugger/SymbolCtrl.cpp | 4 +- src/gui/{ => wxGui}/debugger/SymbolCtrl.h | 0 src/gui/{ => wxGui}/debugger/SymbolWindow.cpp | 8 +- src/gui/{ => wxGui}/debugger/SymbolWindow.h | 2 +- .../CreateAccount/wxCreateAccountDialog.cpp | 2 +- .../CreateAccount/wxCreateAccountDialog.h | 0 .../dialogs/SaveImport/SaveImportWindow.cpp | 2 +- .../dialogs/SaveImport/SaveImportWindow.h | 0 .../dialogs/SaveImport/SaveTransfer.cpp | 2 +- .../dialogs/SaveImport/SaveTransfer.h | 0 src/gui/{ => wxGui}/helpers/wxControlObject.h | 0 src/gui/{ => wxGui}/helpers/wxCustomData.h | 0 .../{ => wxGui}/helpers/wxCustomEvents.cpp | 2 +- src/gui/{ => wxGui}/helpers/wxCustomEvents.h | 0 src/gui/{ => wxGui}/helpers/wxHelpers.cpp | 4 +- src/gui/{ => wxGui}/helpers/wxHelpers.h | 0 src/gui/{ => wxGui}/helpers/wxLogEvent.h | 0 src/gui/{ => wxGui}/helpers/wxWayland.cpp | 2 +- src/gui/{ => wxGui}/helpers/wxWayland.h | 0 .../{ => wxGui}/input/InputAPIAddWindow.cpp | 6 +- src/gui/{ => wxGui}/input/InputAPIAddWindow.h | 2 +- src/gui/{ => wxGui}/input/InputSettings2.cpp | 22 +-- src/gui/{ => wxGui}/input/InputSettings2.h | 0 .../panels/ClassicControllerInputPanel.cpp | 8 +- .../panels/ClassicControllerInputPanel.h | 2 +- .../{ => wxGui}/input/panels/InputPanel.cpp | 4 +- src/gui/{ => wxGui}/input/panels/InputPanel.h | 2 +- .../input/panels/ProControllerInputPanel.cpp | 6 +- .../input/panels/ProControllerInputPanel.h | 4 +- .../input/panels/VPADInputPanel.cpp | 8 +- .../{ => wxGui}/input/panels/VPADInputPanel.h | 2 +- .../input/panels/WiimoteInputPanel.cpp | 8 +- .../input/panels/WiimoteInputPanel.h | 2 +- .../settings/DefaultControllerSettings.cpp | 10 +- .../settings/DefaultControllerSettings.h | 0 .../settings/WiimoteControllerSettings.cpp | 10 +- .../settings/WiimoteControllerSettings.h | 0 .../DebugPPCThreadsWindow.cpp | 2 +- .../PPCThreadsViewer/DebugPPCThreadsWindow.h | 0 .../TextureRelationWindow.cpp | 2 +- .../TextureRelationWindow.h | 0 .../wxGuiWrapper.cpp} | 79 +++++++- src/gui/{ => wxGui}/wxHelper.h | 0 src/gui/{ => wxGui}/wxcomponents/checked.xpm | 0 src/gui/{ => wxGui}/wxcomponents/checked2.xpm | 0 .../{ => wxGui}/wxcomponents/checked_d.xpm | 0 .../{ => wxGui}/wxcomponents/checked_dis.xpm | 0 .../{ => wxGui}/wxcomponents/checked_ld.xpm | 0 .../{ => wxGui}/wxcomponents/checked_mo.xpm | 0 .../wxcomponents/checkedlistctrl.cpp | 10 +- .../wxcomponents/checkedlistctrl.h | 0 .../{ => wxGui}/wxcomponents/checktree.cpp | 18 +- src/gui/{ => wxGui}/wxcomponents/checktree.h | 0 .../{ => wxGui}/wxcomponents/unchecked.xpm | 0 .../{ => wxGui}/wxcomponents/unchecked2.xpm | 0 .../{ => wxGui}/wxcomponents/unchecked_d.xpm | 0 .../wxcomponents/unchecked_dis.xpm | 0 .../{ => wxGui}/wxcomponents/unchecked_ld.xpm | 0 .../{ => wxGui}/wxcomponents/unchecked_mo.xpm | 0 src/gui/{ => wxGui}/wxgui.h | 2 - 126 files changed, 491 insertions(+), 424 deletions(-) delete mode 100644 src/gui/canvas/OpenGLCanvas.h create mode 100644 src/gui/wxGui/CMakeLists.txt rename src/gui/{ => wxGui}/CemuApp.cpp (98%) rename src/gui/{ => wxGui}/CemuApp.h (100%) rename src/gui/{ => wxGui}/CemuUpdateWindow.cpp (99%) rename src/gui/{ => wxGui}/CemuUpdateWindow.h (100%) rename src/gui/{ => wxGui}/ChecksumTool.cpp (99%) rename src/gui/{ => wxGui}/ChecksumTool.h (96%) rename src/gui/{ => wxGui}/DownloadGraphicPacksWindow.cpp (99%) rename src/gui/{ => wxGui}/DownloadGraphicPacksWindow.h (100%) rename src/gui/{ => wxGui}/GameProfileWindow.cpp (99%) rename src/gui/{ => wxGui}/GameProfileWindow.h (100%) rename src/gui/{ => wxGui}/GameUpdateWindow.cpp (98%) rename src/gui/{ => wxGui}/GameUpdateWindow.h (100%) rename src/gui/{ => wxGui}/GeneralSettings2.cpp (99%) rename src/gui/{ => wxGui}/GeneralSettings2.h (100%) rename src/gui/{ => wxGui}/GettingStartedDialog.cpp (98%) rename src/gui/{ => wxGui}/GettingStartedDialog.h (100%) rename src/gui/{ => wxGui}/GraphicPacksWindow2.cpp (99%) rename src/gui/{ => wxGui}/GraphicPacksWindow2.h (100%) rename src/gui/{ => wxGui}/LoggingWindow.cpp (96%) rename src/gui/{ => wxGui}/LoggingWindow.h (96%) rename src/gui/{ => wxGui}/MainWindow.cpp (98%) rename src/gui/{ => wxGui}/MainWindow.h (97%) rename src/gui/{ => wxGui}/MemorySearcherTool.cpp (99%) rename src/gui/{ => wxGui}/MemorySearcherTool.h (99%) rename src/gui/{ => wxGui}/PadViewFrame.cpp (96%) rename src/gui/{ => wxGui}/PadViewFrame.h (100%) rename src/gui/{ => wxGui}/TitleManager.cpp (98%) rename src/gui/{ => wxGui}/TitleManager.h (100%) rename src/gui/{ => wxGui}/canvas/IRenderCanvas.h (100%) rename src/gui/{ => wxGui}/canvas/OpenGLCanvas.cpp (97%) create mode 100644 src/gui/wxGui/canvas/OpenGLCanvas.h rename src/gui/{ => wxGui}/canvas/VulkanCanvas.cpp (95%) rename src/gui/{ => wxGui}/canvas/VulkanCanvas.h (92%) rename src/gui/{ => wxGui}/components/TextList.cpp (99%) rename src/gui/{ => wxGui}/components/TextList.h (100%) rename src/gui/{ => wxGui}/components/wxDownloadManagerList.cpp (98%) rename src/gui/{ => wxGui}/components/wxDownloadManagerList.h (99%) rename src/gui/{ => wxGui}/components/wxGameList.cpp (99%) rename src/gui/{ => wxGui}/components/wxGameList.h (100%) rename src/gui/{ => wxGui}/components/wxInputDraw.cpp (98%) rename src/gui/{ => wxGui}/components/wxInputDraw.h (100%) rename src/gui/{ => wxGui}/components/wxLogCtrl.cpp (98%) rename src/gui/{ => wxGui}/components/wxLogCtrl.h (100%) rename src/gui/{ => wxGui}/components/wxTitleManagerList.cpp (99%) rename src/gui/{ => wxGui}/components/wxTitleManagerList.h (99%) rename src/gui/{ => wxGui}/debugger/AudioDebuggerWindow.cpp (99%) rename src/gui/{ => wxGui}/debugger/AudioDebuggerWindow.h (100%) rename src/gui/{ => wxGui}/debugger/BreakpointWindow.cpp (98%) rename src/gui/{ => wxGui}/debugger/BreakpointWindow.h (92%) rename src/gui/{ => wxGui}/debugger/DebuggerWindow2.cpp (98%) rename src/gui/{ => wxGui}/debugger/DebuggerWindow2.h (98%) rename src/gui/{ => wxGui}/debugger/DisasmCtrl.cpp (99%) rename src/gui/{ => wxGui}/debugger/DisasmCtrl.h (97%) rename src/gui/{ => wxGui}/debugger/DumpCtrl.cpp (99%) rename src/gui/{ => wxGui}/debugger/DumpCtrl.h (95%) rename src/gui/{ => wxGui}/debugger/DumpWindow.cpp (90%) rename src/gui/{ => wxGui}/debugger/DumpWindow.h (90%) rename src/gui/{ => wxGui}/debugger/ModuleWindow.cpp (96%) rename src/gui/{ => wxGui}/debugger/ModuleWindow.h (100%) rename src/gui/{ => wxGui}/debugger/RegisterCtrl.cpp (98%) rename src/gui/{ => wxGui}/debugger/RegisterCtrl.h (93%) rename src/gui/{ => wxGui}/debugger/RegisterWindow.cpp (99%) rename src/gui/{ => wxGui}/debugger/RegisterWindow.h (100%) rename src/gui/{ => wxGui}/debugger/SymbolCtrl.cpp (98%) rename src/gui/{ => wxGui}/debugger/SymbolCtrl.h (100%) rename src/gui/{ => wxGui}/debugger/SymbolWindow.cpp (91%) rename src/gui/{ => wxGui}/debugger/SymbolWindow.h (92%) rename src/gui/{ => wxGui}/dialogs/CreateAccount/wxCreateAccountDialog.cpp (98%) rename src/gui/{ => wxGui}/dialogs/CreateAccount/wxCreateAccountDialog.h (100%) rename src/gui/{ => wxGui}/dialogs/SaveImport/SaveImportWindow.cpp (99%) rename src/gui/{ => wxGui}/dialogs/SaveImport/SaveImportWindow.h (100%) rename src/gui/{ => wxGui}/dialogs/SaveImport/SaveTransfer.cpp (99%) rename src/gui/{ => wxGui}/dialogs/SaveImport/SaveTransfer.h (100%) rename src/gui/{ => wxGui}/helpers/wxControlObject.h (100%) rename src/gui/{ => wxGui}/helpers/wxCustomData.h (100%) rename src/gui/{ => wxGui}/helpers/wxCustomEvents.cpp (87%) rename src/gui/{ => wxGui}/helpers/wxCustomEvents.h (100%) rename src/gui/{ => wxGui}/helpers/wxHelpers.cpp (95%) rename src/gui/{ => wxGui}/helpers/wxHelpers.h (100%) rename src/gui/{ => wxGui}/helpers/wxLogEvent.h (100%) rename src/gui/{ => wxGui}/helpers/wxWayland.cpp (95%) rename src/gui/{ => wxGui}/helpers/wxWayland.h (100%) rename src/gui/{ => wxGui}/input/InputAPIAddWindow.cpp (98%) rename src/gui/{ => wxGui}/input/InputAPIAddWindow.h (97%) rename src/gui/{ => wxGui}/input/InputSettings2.cpp (98%) rename src/gui/{ => wxGui}/input/InputSettings2.h (100%) rename src/gui/{ => wxGui}/input/panels/ClassicControllerInputPanel.cpp (96%) rename src/gui/{ => wxGui}/input/panels/ClassicControllerInputPanel.h (90%) rename src/gui/{ => wxGui}/input/panels/InputPanel.cpp (98%) rename src/gui/{ => wxGui}/input/panels/InputPanel.h (98%) rename src/gui/{ => wxGui}/input/panels/ProControllerInputPanel.cpp (97%) rename src/gui/{ => wxGui}/input/panels/ProControllerInputPanel.h (85%) rename src/gui/{ => wxGui}/input/panels/VPADInputPanel.cpp (97%) rename src/gui/{ => wxGui}/input/panels/VPADInputPanel.h (93%) rename src/gui/{ => wxGui}/input/panels/WiimoteInputPanel.cpp (98%) rename src/gui/{ => wxGui}/input/panels/WiimoteInputPanel.h (95%) rename src/gui/{ => wxGui}/input/settings/DefaultControllerSettings.cpp (98%) rename src/gui/{ => wxGui}/input/settings/DefaultControllerSettings.h (100%) rename src/gui/{ => wxGui}/input/settings/WiimoteControllerSettings.cpp (98%) rename src/gui/{ => wxGui}/input/settings/WiimoteControllerSettings.h (100%) rename src/gui/{ => wxGui}/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp (99%) rename src/gui/{ => wxGui}/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h (100%) rename src/gui/{ => wxGui}/windows/TextureRelationViewer/TextureRelationWindow.cpp (99%) rename src/gui/{ => wxGui}/windows/TextureRelationViewer/TextureRelationWindow.h (100%) rename src/gui/{guiWrapper.cpp => wxGui/wxGuiWrapper.cpp} (85%) rename src/gui/{ => wxGui}/wxHelper.h (100%) rename src/gui/{ => wxGui}/wxcomponents/checked.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checked2.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checked_d.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checked_dis.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checked_ld.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checked_mo.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/checkedlistctrl.cpp (98%) rename src/gui/{ => wxGui}/wxcomponents/checkedlistctrl.h (100%) rename src/gui/{ => wxGui}/wxcomponents/checktree.cpp (97%) rename src/gui/{ => wxGui}/wxcomponents/checktree.h (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked2.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked_d.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked_dis.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked_ld.xpm (100%) rename src/gui/{ => wxGui}/wxcomponents/unchecked_mo.xpm (100%) rename src/gui/{ => wxGui}/wxgui.h (98%) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a1572c13..7efdda80 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,174 +1,8 @@ -add_library(CemuGui - canvas/IRenderCanvas.h - canvas/OpenGLCanvas.cpp - canvas/OpenGLCanvas.h - canvas/VulkanCanvas.cpp - canvas/VulkanCanvas.h - CemuApp.cpp - CemuApp.h - CemuUpdateWindow.cpp - CemuUpdateWindow.h - ChecksumTool.cpp - ChecksumTool.h - components/TextList.cpp - components/TextList.h - components/wxDownloadManagerList.cpp - components/wxDownloadManagerList.h - components/wxGameList.cpp - components/wxGameList.h - components/wxInputDraw.cpp - components/wxInputDraw.h - components/wxLogCtrl.cpp - components/wxLogCtrl.h - components/wxTitleManagerList.cpp - components/wxTitleManagerList.h - debugger/AudioDebuggerWindow.cpp - debugger/AudioDebuggerWindow.h - debugger/BreakpointWindow.cpp - debugger/BreakpointWindow.h - debugger/DebuggerWindow2.cpp - debugger/DebuggerWindow2.h - debugger/DisasmCtrl.cpp - debugger/DisasmCtrl.h - debugger/DumpCtrl.cpp - debugger/DumpCtrl.h - debugger/DumpWindow.cpp - debugger/DumpWindow.h - debugger/ModuleWindow.cpp - debugger/ModuleWindow.h - debugger/RegisterCtrl.cpp - debugger/RegisterCtrl.h - debugger/RegisterWindow.cpp - debugger/RegisterWindow.h - debugger/SymbolCtrl.cpp - debugger/SymbolCtrl.h - debugger/SymbolWindow.cpp - debugger/SymbolWindow.h - dialogs/CreateAccount/wxCreateAccountDialog.cpp - dialogs/CreateAccount/wxCreateAccountDialog.h - dialogs/SaveImport/SaveImportWindow.cpp - dialogs/SaveImport/SaveImportWindow.h - dialogs/SaveImport/SaveTransfer.cpp - dialogs/SaveImport/SaveTransfer.h - DownloadGraphicPacksWindow.cpp - DownloadGraphicPacksWindow.h - GameProfileWindow.cpp - GameProfileWindow.h - GameUpdateWindow.cpp - GameUpdateWindow.h - GeneralSettings2.cpp - GeneralSettings2.h - GettingStartedDialog.cpp - GettingStartedDialog.h - GraphicPacksWindow2.cpp - GraphicPacksWindow2.h - guiWrapper.cpp - guiWrapper.h - helpers/wxControlObject.h - helpers/wxCustomData.h - helpers/wxCustomEvents.cpp - helpers/wxCustomEvents.h - helpers/wxHelpers.cpp - helpers/wxHelpers.h - helpers/wxLogEvent.h - helpers/wxWayland.cpp - helpers/wxWayland.h - input/InputAPIAddWindow.cpp - input/InputAPIAddWindow.h - input/InputSettings2.cpp - input/InputSettings2.h - input/panels/ClassicControllerInputPanel.cpp - input/panels/ClassicControllerInputPanel.h - input/panels/InputPanel.cpp - input/panels/InputPanel.h - input/panels/ProControllerInputPanel.cpp - input/panels/ProControllerInputPanel.h - input/panels/VPADInputPanel.cpp - input/panels/VPADInputPanel.h - input/panels/WiimoteInputPanel.cpp - input/panels/WiimoteInputPanel.h - input/settings/DefaultControllerSettings.cpp - input/settings/DefaultControllerSettings.h - input/settings/WiimoteControllerSettings.cpp - input/settings/WiimoteControllerSettings.h - LoggingWindow.cpp - LoggingWindow.h - MainWindow.cpp - MainWindow.h - MemorySearcherTool.cpp - MemorySearcherTool.h - PadViewFrame.cpp - PadViewFrame.h - TitleManager.cpp - TitleManager.h - windows/PPCThreadsViewer - windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp - windows/PPCThreadsViewer/DebugPPCThreadsWindow.h - windows/TextureRelationViewer - windows/TextureRelationViewer/TextureRelationWindow.cpp - windows/TextureRelationViewer/TextureRelationWindow.h - wxcomponents/checked2.xpm - wxcomponents/checked_dis.xpm - wxcomponents/checked_d.xpm - wxcomponents/checked_ld.xpm - wxcomponents/checkedlistctrl.cpp - wxcomponents/checkedlistctrl.h - wxcomponents/checked_mo.xpm - wxcomponents/checked.xpm - wxcomponents/checktree.cpp - wxcomponents/checktree.h - wxcomponents/unchecked2.xpm - wxcomponents/unchecked_dis.xpm - wxcomponents/unchecked_d.xpm - wxcomponents/unchecked_ld.xpm - wxcomponents/unchecked_mo.xpm - wxcomponents/unchecked.xpm - wxgui.h - wxHelper.h +add_library(CemuGui + guiWrapper.h ) -set_property(TARGET CemuGui PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - - -target_include_directories(CemuGui PUBLIC "../") -# PUBLIC because rapidjson/document.h is included in ChecksumTool.h -target_include_directories(CemuGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS}) - -target_link_libraries(CemuGui PRIVATE - CemuAudio - CemuCafe - CemuCommon - CemuComponents - CemuConfig - CemuInput - CemuResource - CemuUtil - Boost::headers - CURL::libcurl - libzip::zip - OpenSSL::Crypto - pugixml::pugixml - ZArchive::zarchive -) - -if(ENABLE_WXWIDGETS AND UNIX AND NOT APPLE) - # PUBLIC because gdk/gdkkeysyms.h is included in guiWrapper.h - target_link_libraries(CemuGui PUBLIC GTK3::gtk) - if (ENABLE_WAYLAND) - target_link_libraries(CemuGui PRIVATE Wayland::Client CemuWaylandProtocols) - endif() -endif() - -if(ENABLE_CUBEB) - target_link_libraries(CemuGui PRIVATE cubeb::cubeb) -endif() - -if(UNIX AND NOT APPLE) - if(ENABLE_FERAL_GAMEMODE) - target_link_libraries(CemuGui PRIVATE gamemode) - endif() -endif() -if (ENABLE_WXWIDGETS) - # PUBLIC because wx/app.h is included in CemuApp.h - target_link_libraries(CemuGui PUBLIC wx::base wx::core wx::gl wx::propgrid wx::xrc) +if(ENABLE_WXWIDGETS) + add_subdirectory(wxGui) + target_link_libraries(CemuGui PRIVATE CemuwxGui) endif() diff --git a/src/gui/canvas/OpenGLCanvas.h b/src/gui/canvas/OpenGLCanvas.h deleted file mode 100644 index 282e6d19..00000000 --- a/src/gui/canvas/OpenGLCanvas.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#include -#include "gui/canvas/IRenderCanvas.h" - -wxWindow* GLCanvas_Create(wxWindow* parent, const wxSize& size, bool is_main_window); -bool GLCanvas_MakeCurrent(bool padView); -void GLCanvas_SwapBuffers(bool swapTV, bool swapDRC); -bool GLCanvas_HasPadViewOpen(); \ No newline at end of file diff --git a/src/gui/wxGui/CMakeLists.txt b/src/gui/wxGui/CMakeLists.txt new file mode 100644 index 00000000..1a1b1d58 --- /dev/null +++ b/src/gui/wxGui/CMakeLists.txt @@ -0,0 +1,171 @@ +add_library(CemuwxGui + canvas/IRenderCanvas.h + canvas/OpenGLCanvas.cpp + canvas/OpenGLCanvas.h + canvas/VulkanCanvas.cpp + canvas/VulkanCanvas.h + CemuApp.cpp + CemuApp.h + CemuUpdateWindow.cpp + CemuUpdateWindow.h + ChecksumTool.cpp + ChecksumTool.h + components/TextList.cpp + components/TextList.h + components/wxDownloadManagerList.cpp + components/wxDownloadManagerList.h + components/wxGameList.cpp + components/wxGameList.h + components/wxInputDraw.cpp + components/wxInputDraw.h + components/wxLogCtrl.cpp + components/wxLogCtrl.h + components/wxTitleManagerList.cpp + components/wxTitleManagerList.h + debugger/AudioDebuggerWindow.cpp + debugger/AudioDebuggerWindow.h + debugger/BreakpointWindow.cpp + debugger/BreakpointWindow.h + debugger/DebuggerWindow2.cpp + debugger/DebuggerWindow2.h + debugger/DisasmCtrl.cpp + debugger/DisasmCtrl.h + debugger/DumpCtrl.cpp + debugger/DumpCtrl.h + debugger/DumpWindow.cpp + debugger/DumpWindow.h + debugger/ModuleWindow.cpp + debugger/ModuleWindow.h + debugger/RegisterCtrl.cpp + debugger/RegisterCtrl.h + debugger/RegisterWindow.cpp + debugger/RegisterWindow.h + debugger/SymbolCtrl.cpp + debugger/SymbolCtrl.h + debugger/SymbolWindow.cpp + debugger/SymbolWindow.h + dialogs/CreateAccount/wxCreateAccountDialog.cpp + dialogs/CreateAccount/wxCreateAccountDialog.h + dialogs/SaveImport/SaveImportWindow.cpp + dialogs/SaveImport/SaveImportWindow.h + dialogs/SaveImport/SaveTransfer.cpp + dialogs/SaveImport/SaveTransfer.h + DownloadGraphicPacksWindow.cpp + DownloadGraphicPacksWindow.h + GameProfileWindow.cpp + GameProfileWindow.h + GameUpdateWindow.cpp + GameUpdateWindow.h + GeneralSettings2.cpp + GeneralSettings2.h + GettingStartedDialog.cpp + GettingStartedDialog.h + GraphicPacksWindow2.cpp + GraphicPacksWindow2.h + helpers/wxControlObject.h + helpers/wxCustomData.h + helpers/wxCustomEvents.cpp + helpers/wxCustomEvents.h + helpers/wxHelpers.cpp + helpers/wxHelpers.h + helpers/wxLogEvent.h + helpers/wxWayland.cpp + helpers/wxWayland.h + input/InputAPIAddWindow.cpp + input/InputAPIAddWindow.h + input/InputSettings2.cpp + input/InputSettings2.h + input/panels/ClassicControllerInputPanel.cpp + input/panels/ClassicControllerInputPanel.h + input/panels/InputPanel.cpp + input/panels/InputPanel.h + input/panels/ProControllerInputPanel.cpp + input/panels/ProControllerInputPanel.h + input/panels/VPADInputPanel.cpp + input/panels/VPADInputPanel.h + input/panels/WiimoteInputPanel.cpp + input/panels/WiimoteInputPanel.h + input/settings/DefaultControllerSettings.cpp + input/settings/DefaultControllerSettings.h + input/settings/WiimoteControllerSettings.cpp + input/settings/WiimoteControllerSettings.h + LoggingWindow.cpp + LoggingWindow.h + MainWindow.cpp + MainWindow.h + MemorySearcherTool.cpp + MemorySearcherTool.h + PadViewFrame.cpp + PadViewFrame.h + TitleManager.cpp + TitleManager.h + windows/PPCThreadsViewer + windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp + windows/PPCThreadsViewer/DebugPPCThreadsWindow.h + windows/TextureRelationViewer + windows/TextureRelationViewer/TextureRelationWindow.cpp + windows/TextureRelationViewer/TextureRelationWindow.h + wxcomponents/checked2.xpm + wxcomponents/checked_dis.xpm + wxcomponents/checked_d.xpm + wxcomponents/checked_ld.xpm + wxcomponents/checkedlistctrl.cpp + wxcomponents/checkedlistctrl.h + wxcomponents/checked_mo.xpm + wxcomponents/checked.xpm + wxcomponents/checktree.cpp + wxcomponents/checktree.h + wxcomponents/unchecked2.xpm + wxcomponents/unchecked_dis.xpm + wxcomponents/unchecked_d.xpm + wxcomponents/unchecked_ld.xpm + wxcomponents/unchecked_mo.xpm + wxcomponents/unchecked.xpm + wxgui.h + wxGuiWrapper.cpp + wxHelper.h +) + +set_property(TARGET CemuwxGui PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + + +target_include_directories(CemuwxGui PUBLIC "../") +# PUBLIC because rapidjson/document.h is included in ChecksumTool.h +target_include_directories(CemuwxGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS}) + +target_link_libraries(CemuwxGui PRIVATE + CemuAudio + CemuCafe + CemuCommon + CemuComponents + CemuConfig + CemuInput + CemuResource + CemuUtil + Boost::headers + CURL::libcurl + libzip::zip + OpenSSL::Crypto + pugixml::pugixml + ZArchive::zarchive +) + +if(UNIX AND NOT APPLE) + target_link_libraries(CemuwxGui PRIVATE GTK3::gtk) + if (ENABLE_WAYLAND) + target_link_libraries(CemuwxGui PRIVATE Wayland::Client CemuWaylandProtocols) + endif() +endif() + +if(ENABLE_CUBEB) + target_link_libraries(CemuwxGui PRIVATE cubeb::cubeb) +endif() + +if(UNIX AND NOT APPLE) + if(ENABLE_FERAL_GAMEMODE) + target_link_libraries(CemuwxGui PRIVATE gamemode) + endif() +endif() + +# PUBLIC because wx/app.h is included in CemuApp.h +target_link_libraries(CemuwxGui PUBLIC wx::base wx::core wx::gl wx::propgrid wx::xrc) diff --git a/src/gui/CemuApp.cpp b/src/gui/wxGui/CemuApp.cpp similarity index 98% rename from src/gui/CemuApp.cpp rename to src/gui/wxGui/CemuApp.cpp index 73cbcb75..b84e6604 100644 --- a/src/gui/CemuApp.cpp +++ b/src/gui/wxGui/CemuApp.cpp @@ -1,19 +1,19 @@ -#include "gui/CemuApp.h" -#include "gui/MainWindow.h" -#include "gui/wxgui.h" +#include "CemuApp.h" +#include "MainWindow.h" +#include "wxgui.h" #include "config/CemuConfig.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h" -#include "gui/guiWrapper.h" +#include "guiWrapper.h" #include "config/ActiveSettings.h" -#include "gui/GettingStartedDialog.h" +#include "GettingStartedDialog.h" #include "config/PermanentConfig.h" #include "config/PermanentStorage.h" #include "input/InputManager.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "Cemu/ncrypto/ncrypto.h" #if BOOST_OS_LINUX && HAS_WAYLAND -#include "gui/helpers/wxWayland.h" +#include "helpers/wxWayland.h" #endif #include diff --git a/src/gui/CemuApp.h b/src/gui/wxGui/CemuApp.h similarity index 100% rename from src/gui/CemuApp.h rename to src/gui/wxGui/CemuApp.h diff --git a/src/gui/CemuUpdateWindow.cpp b/src/gui/wxGui/CemuUpdateWindow.cpp similarity index 99% rename from src/gui/CemuUpdateWindow.cpp rename to src/gui/wxGui/CemuUpdateWindow.cpp index f3568ee7..2fc6d9aa 100644 --- a/src/gui/CemuUpdateWindow.cpp +++ b/src/gui/wxGui/CemuUpdateWindow.cpp @@ -1,4 +1,4 @@ -#include "gui/CemuUpdateWindow.h" +#include "CemuUpdateWindow.h" #include "Common/version.h" #include "util/helpers/helpers.h" diff --git a/src/gui/CemuUpdateWindow.h b/src/gui/wxGui/CemuUpdateWindow.h similarity index 100% rename from src/gui/CemuUpdateWindow.h rename to src/gui/wxGui/CemuUpdateWindow.h diff --git a/src/gui/ChecksumTool.cpp b/src/gui/wxGui/ChecksumTool.cpp similarity index 99% rename from src/gui/ChecksumTool.cpp rename to src/gui/wxGui/ChecksumTool.cpp index 7dc61bb3..1993d70b 100644 --- a/src/gui/ChecksumTool.cpp +++ b/src/gui/wxGui/ChecksumTool.cpp @@ -1,10 +1,10 @@ -#include "gui/ChecksumTool.h" +#include "ChecksumTool.h" #include "Cafe/TitleList/GameInfo.h" -#include "gui/helpers/wxCustomEvents.h" +#include "helpers/wxCustomEvents.h" #include "util/helpers/helpers.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/wxHelper.h" +#include "helpers/wxHelpers.h" +#include "wxHelper.h" #include "Cafe/Filesystem/WUD/wud.h" #include diff --git a/src/gui/ChecksumTool.h b/src/gui/wxGui/ChecksumTool.h similarity index 96% rename from src/gui/ChecksumTool.h rename to src/gui/wxGui/ChecksumTool.h index 1b54733b..0081ab7f 100644 --- a/src/gui/ChecksumTool.h +++ b/src/gui/wxGui/ChecksumTool.h @@ -1,6 +1,6 @@ #pragma once #include -#include "gui/components/wxTitleManagerList.h" +#include "components/wxTitleManagerList.h" #include "Cafe/TitleList/TitleInfo.h" #include diff --git a/src/gui/DownloadGraphicPacksWindow.cpp b/src/gui/wxGui/DownloadGraphicPacksWindow.cpp similarity index 99% rename from src/gui/DownloadGraphicPacksWindow.cpp rename to src/gui/wxGui/DownloadGraphicPacksWindow.cpp index 8189b50a..543acf3b 100644 --- a/src/gui/DownloadGraphicPacksWindow.cpp +++ b/src/gui/wxGui/DownloadGraphicPacksWindow.cpp @@ -1,5 +1,5 @@ -#include "gui/wxgui.h" -#include "gui/DownloadGraphicPacksWindow.h" +#include "wxgui.h" +#include "DownloadGraphicPacksWindow.h" #include #include diff --git a/src/gui/DownloadGraphicPacksWindow.h b/src/gui/wxGui/DownloadGraphicPacksWindow.h similarity index 100% rename from src/gui/DownloadGraphicPacksWindow.h rename to src/gui/wxGui/DownloadGraphicPacksWindow.h diff --git a/src/gui/GameProfileWindow.cpp b/src/gui/wxGui/GameProfileWindow.cpp similarity index 99% rename from src/gui/GameProfileWindow.cpp rename to src/gui/wxGui/GameProfileWindow.cpp index 4d56e9cd..4d572ac3 100644 --- a/src/gui/GameProfileWindow.cpp +++ b/src/gui/wxGui/GameProfileWindow.cpp @@ -1,4 +1,4 @@ -#include "gui/GameProfileWindow.h" +#include "GameProfileWindow.h" #include #include @@ -8,7 +8,7 @@ #include #include -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "input/InputManager.h" #if BOOST_OS_LINUX || BOOST_OS_MACOS diff --git a/src/gui/GameProfileWindow.h b/src/gui/wxGui/GameProfileWindow.h similarity index 100% rename from src/gui/GameProfileWindow.h rename to src/gui/wxGui/GameProfileWindow.h diff --git a/src/gui/GameUpdateWindow.cpp b/src/gui/wxGui/GameUpdateWindow.cpp similarity index 98% rename from src/gui/GameUpdateWindow.cpp rename to src/gui/wxGui/GameUpdateWindow.cpp index 40bf546e..36afacc9 100644 --- a/src/gui/GameUpdateWindow.cpp +++ b/src/gui/wxGui/GameUpdateWindow.cpp @@ -1,13 +1,13 @@ -#include "gui/wxgui.h" -#include "gui/GameUpdateWindow.h" +#include "wxgui.h" +#include "GameUpdateWindow.h" #include "util/helpers/helpers.h" #include #include #include "util/helpers/SystemException.h" -#include "gui/CemuApp.h" +#include "CemuApp.h" #include "Cafe/TitleList/GameInfo.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "wxHelper.h" std::string _GetTitleIdTypeStr(TitleId titleId) diff --git a/src/gui/GameUpdateWindow.h b/src/gui/wxGui/GameUpdateWindow.h similarity index 100% rename from src/gui/GameUpdateWindow.h rename to src/gui/wxGui/GameUpdateWindow.h diff --git a/src/gui/GeneralSettings2.cpp b/src/gui/wxGui/GeneralSettings2.cpp similarity index 99% rename from src/gui/GeneralSettings2.cpp rename to src/gui/wxGui/GeneralSettings2.cpp index ad767ad1..6f344163 100644 --- a/src/gui/GeneralSettings2.cpp +++ b/src/gui/wxGui/GeneralSettings2.cpp @@ -1,7 +1,7 @@ -#include "gui/wxgui.h" -#include "gui/GeneralSettings2.h" -#include "gui/CemuApp.h" -#include "gui/helpers/wxControlObject.h" +#include "wxgui.h" +#include "GeneralSettings2.h" +#include "CemuApp.h" +#include "helpers/wxControlObject.h" #include "util/helpers/helpers.h" @@ -31,7 +31,7 @@ #include #include "util/helpers/SystemException.h" -#include "gui/dialogs/CreateAccount/wxCreateAccountDialog.h" +#include "dialogs/CreateAccount/wxCreateAccountDialog.h" #include "config/PermanentStorage.h" #if BOOST_OS_WINDOWS @@ -40,7 +40,7 @@ #include "config/LaunchSettings.h" #include "config/ActiveSettings.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "resource/embedded/resources.h" diff --git a/src/gui/GeneralSettings2.h b/src/gui/wxGui/GeneralSettings2.h similarity index 100% rename from src/gui/GeneralSettings2.h rename to src/gui/wxGui/GeneralSettings2.h diff --git a/src/gui/GettingStartedDialog.cpp b/src/gui/wxGui/GettingStartedDialog.cpp similarity index 98% rename from src/gui/GettingStartedDialog.cpp rename to src/gui/wxGui/GettingStartedDialog.cpp index c84582b8..999d760f 100644 --- a/src/gui/GettingStartedDialog.cpp +++ b/src/gui/wxGui/GettingStartedDialog.cpp @@ -1,4 +1,4 @@ -#include "gui/GettingStartedDialog.h" +#include "GettingStartedDialog.h" #include #include @@ -6,10 +6,10 @@ #include #include "config/ActiveSettings.h" -#include "gui/CemuApp.h" -#include "gui/DownloadGraphicPacksWindow.h" -#include "gui/GraphicPacksWindow2.h" -#include "gui/input/InputSettings2.h" +#include "CemuApp.h" +#include "DownloadGraphicPacksWindow.h" +#include "GraphicPacksWindow2.h" +#include "input/InputSettings2.h" #include "config/CemuConfig.h" #include "config/PermanentConfig.h" diff --git a/src/gui/GettingStartedDialog.h b/src/gui/wxGui/GettingStartedDialog.h similarity index 100% rename from src/gui/GettingStartedDialog.h rename to src/gui/wxGui/GettingStartedDialog.h diff --git a/src/gui/GraphicPacksWindow2.cpp b/src/gui/wxGui/GraphicPacksWindow2.cpp similarity index 99% rename from src/gui/GraphicPacksWindow2.cpp rename to src/gui/wxGui/GraphicPacksWindow2.cpp index 78fa6569..5f03e444 100644 --- a/src/gui/GraphicPacksWindow2.cpp +++ b/src/gui/wxGui/GraphicPacksWindow2.cpp @@ -1,6 +1,6 @@ -#include "gui/wxgui.h" -#include "gui/GraphicPacksWindow2.h" -#include "gui/DownloadGraphicPacksWindow.h" +#include "wxgui.h" +#include "GraphicPacksWindow2.h" +#include "DownloadGraphicPacksWindow.h" #include "Cafe/GraphicPack/GraphicPack2.h" #include "config/CemuConfig.h" #include "config/ActiveSettings.h" diff --git a/src/gui/GraphicPacksWindow2.h b/src/gui/wxGui/GraphicPacksWindow2.h similarity index 100% rename from src/gui/GraphicPacksWindow2.h rename to src/gui/wxGui/GraphicPacksWindow2.h diff --git a/src/gui/LoggingWindow.cpp b/src/gui/wxGui/LoggingWindow.cpp similarity index 96% rename from src/gui/LoggingWindow.cpp rename to src/gui/wxGui/LoggingWindow.cpp index dbc7536d..4e0ae2ff 100644 --- a/src/gui/LoggingWindow.cpp +++ b/src/gui/wxGui/LoggingWindow.cpp @@ -1,12 +1,12 @@ -#include "gui/LoggingWindow.h" +#include "LoggingWindow.h" -#include "gui/helpers/wxLogEvent.h" +#include "helpers/wxLogEvent.h" #include #include #include -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" wxDEFINE_EVENT(EVT_LOG, wxLogEvent); diff --git a/src/gui/LoggingWindow.h b/src/gui/wxGui/LoggingWindow.h similarity index 96% rename from src/gui/LoggingWindow.h rename to src/gui/wxGui/LoggingWindow.h index 28ca30dd..ee27e975 100644 --- a/src/gui/LoggingWindow.h +++ b/src/gui/wxGui/LoggingWindow.h @@ -3,7 +3,7 @@ #include #include #include -#include "gui/components/wxLogCtrl.h" +#include "components/wxLogCtrl.h" class wxLogEvent; diff --git a/src/gui/MainWindow.cpp b/src/gui/wxGui/MainWindow.cpp similarity index 98% rename from src/gui/MainWindow.cpp rename to src/gui/wxGui/MainWindow.cpp index 852e32a7..b867494b 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/wxGui/MainWindow.cpp @@ -1,50 +1,50 @@ -#include "gui/wxgui.h" -#include "gui/MainWindow.h" -#include "gui/guiWrapper.h" +#include "wxgui.h" +#include "MainWindow.h" +#include "guiWrapper.h" #include #include -#include "gui/GameUpdateWindow.h" -#include "gui/PadViewFrame.h" -#include "gui/windows/TextureRelationViewer/TextureRelationWindow.h" -#include "gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h" -#include "gui/canvas/OpenGLCanvas.h" -#include "gui/canvas/VulkanCanvas.h" +#include "GameUpdateWindow.h" +#include "PadViewFrame.h" +#include "windows/TextureRelationViewer/TextureRelationWindow.h" +#include "windows/PPCThreadsViewer/DebugPPCThreadsWindow.h" +#include "canvas/OpenGLCanvas.h" +#include "canvas/VulkanCanvas.h" #include "Cafe/OS/libs/nn_nfp/nn_nfp.h" #include "Cafe/OS/libs/swkbd/swkbd.h" #include "Cafe/IOSU/legacy/iosu_crypto.h" #include "Cafe/GameProfile/GameProfile.h" -#include "gui/debugger/DebuggerWindow2.h" -#include "gui/debugger/AudioDebuggerWindow.h" +#include "debugger/DebuggerWindow2.h" +#include "debugger/AudioDebuggerWindow.h" #include "util/helpers/helpers.h" #include "config/CemuConfig.h" #include "Cemu/DiscordPresence/DiscordPresence.h" #include "util/ScreenSaver/ScreenSaver.h" -#include "gui/GeneralSettings2.h" -#include "gui/GraphicPacksWindow2.h" -#include "gui/GameProfileWindow.h" -#include "gui/CemuApp.h" -#include "gui/CemuUpdateWindow.h" -#include "gui/helpers/wxCustomData.h" -#include "gui/LoggingWindow.h" +#include "GeneralSettings2.h" +#include "GraphicPacksWindow2.h" +#include "GameProfileWindow.h" +#include "CemuApp.h" +#include "CemuUpdateWindow.h" +#include "helpers/wxCustomData.h" +#include "LoggingWindow.h" #include "config/ActiveSettings.h" #include "config/LaunchSettings.h" #include "Cafe/Filesystem/FST/FST.h" -#include "gui/TitleManager.h" +#include "TitleManager.h" #include "Cafe/CafeSystem.h" #include "Cafe/TitleList/GameInfo.h" #include #include "util/helpers/SystemException.h" -#include "gui/DownloadGraphicPacksWindow.h" -#include "gui/GettingStartedDialog.h" -#include "gui/helpers/wxHelpers.h" +#include "DownloadGraphicPacksWindow.h" +#include "GettingStartedDialog.h" +#include "helpers/wxHelpers.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h" -#include "gui/input/InputSettings2.h" +#include "input/InputSettings2.h" #include "input/InputManager.h" #if BOOST_OS_WINDOWS @@ -58,7 +58,7 @@ #endif #if BOOST_OS_LINUX && HAS_WAYLAND -#include "gui/helpers/wxWayland.h" +#include "helpers/wxWayland.h" #endif //GameMode support diff --git a/src/gui/MainWindow.h b/src/gui/wxGui/MainWindow.h similarity index 97% rename from src/gui/MainWindow.h rename to src/gui/wxGui/MainWindow.h index 735f73af..d49b6b30 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/wxGui/MainWindow.h @@ -5,13 +5,13 @@ #include #include "wxcomponents/checkedlistctrl.h" -#include "gui/PadViewFrame.h" -#include "gui/MemorySearcherTool.h" +#include "PadViewFrame.h" +#include "MemorySearcherTool.h" #include "config/XMLConfig.h" -#include "gui/LoggingWindow.h" -#include "gui/components/wxGameList.h" +#include "LoggingWindow.h" +#include "components/wxGameList.h" #include #include "Cafe/HW/Espresso/Debugger/GDBStub.h" diff --git a/src/gui/MemorySearcherTool.cpp b/src/gui/wxGui/MemorySearcherTool.cpp similarity index 99% rename from src/gui/MemorySearcherTool.cpp rename to src/gui/wxGui/MemorySearcherTool.cpp index 093f7ffe..5f791f3f 100644 --- a/src/gui/MemorySearcherTool.cpp +++ b/src/gui/wxGui/MemorySearcherTool.cpp @@ -1,13 +1,13 @@ -#include "gui/wxgui.h" +#include "wxgui.h" -#include "gui/MemorySearcherTool.h" +#include "MemorySearcherTool.h" #include #include #include #include "config/ActiveSettings.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "Common/FileStream.h" #include "util/IniParser/IniParser.h" #include "util/helpers/StringHelpers.h" diff --git a/src/gui/MemorySearcherTool.h b/src/gui/wxGui/MemorySearcherTool.h similarity index 99% rename from src/gui/MemorySearcherTool.h rename to src/gui/wxGui/MemorySearcherTool.h index add9aced..98e2bc0b 100644 --- a/src/gui/MemorySearcherTool.h +++ b/src/gui/wxGui/MemorySearcherTool.h @@ -6,7 +6,7 @@ #include "Cafe/HW/MMU/MMU.h" #include "util/helpers/helpers.h" -#include "gui/helpers/wxCustomEvents.h" +#include "helpers/wxCustomEvents.h" enum SearchDataType { diff --git a/src/gui/PadViewFrame.cpp b/src/gui/wxGui/PadViewFrame.cpp similarity index 96% rename from src/gui/PadViewFrame.cpp rename to src/gui/wxGui/PadViewFrame.cpp index 4db25c5f..83b0731e 100644 --- a/src/gui/PadViewFrame.cpp +++ b/src/gui/wxGui/PadViewFrame.cpp @@ -1,16 +1,16 @@ -#include "gui/wxgui.h" -#include "gui/guiWrapper.h" -#include "gui/PadViewFrame.h" +#include "wxgui.h" +#include "guiWrapper.h" +#include "PadViewFrame.h" #include #include "config/ActiveSettings.h" #include "Cafe/OS/libs/swkbd/swkbd.h" -#include "gui/canvas/OpenGLCanvas.h" -#include "gui/canvas/VulkanCanvas.h" +#include "canvas/OpenGLCanvas.h" +#include "canvas/VulkanCanvas.h" #include "config/CemuConfig.h" -#include "gui/MainWindow.h" -#include "gui/helpers/wxHelpers.h" +#include "MainWindow.h" +#include "helpers/wxHelpers.h" #include "input/InputManager.h" #if BOOST_OS_LINUX || BOOST_OS_MACOS diff --git a/src/gui/PadViewFrame.h b/src/gui/wxGui/PadViewFrame.h similarity index 100% rename from src/gui/PadViewFrame.h rename to src/gui/wxGui/PadViewFrame.h diff --git a/src/gui/TitleManager.cpp b/src/gui/wxGui/TitleManager.cpp similarity index 98% rename from src/gui/TitleManager.cpp rename to src/gui/wxGui/TitleManager.cpp index 2440e12c..3eff5e97 100644 --- a/src/gui/TitleManager.cpp +++ b/src/gui/wxGui/TitleManager.cpp @@ -1,15 +1,15 @@ -#include "gui/TitleManager.h" +#include "TitleManager.h" -#include "gui/helpers/wxCustomEvents.h" -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxCustomEvents.h" +#include "helpers/wxCustomData.h" #include "Cafe/TitleList/GameInfo.h" #include "util/helpers/helpers.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/wxHelper.h" -#include "gui/components/wxTitleManagerList.h" -#include "gui/components/wxDownloadManagerList.h" -#include "gui/GameUpdateWindow.h" -#include "gui/dialogs/SaveImport/SaveTransfer.h" +#include "helpers/wxHelpers.h" +#include "wxHelper.h" +#include "components/wxTitleManagerList.h" +#include "components/wxDownloadManagerList.h" +#include "GameUpdateWindow.h" +#include "dialogs/SaveImport/SaveTransfer.h" #include #include @@ -32,10 +32,10 @@ #include #include "config/ActiveSettings.h" -#include "gui/dialogs/SaveImport/SaveImportWindow.h" +#include "dialogs/SaveImport/SaveImportWindow.h" #include "Cafe/Account/Account.h" #include "Cemu/Tools/DownloadManager/DownloadManager.h" -#include "gui/CemuApp.h" +#include "CemuApp.h" #include "Cafe/TitleList/TitleList.h" diff --git a/src/gui/TitleManager.h b/src/gui/wxGui/TitleManager.h similarity index 100% rename from src/gui/TitleManager.h rename to src/gui/wxGui/TitleManager.h diff --git a/src/gui/canvas/IRenderCanvas.h b/src/gui/wxGui/canvas/IRenderCanvas.h similarity index 100% rename from src/gui/canvas/IRenderCanvas.h rename to src/gui/wxGui/canvas/IRenderCanvas.h diff --git a/src/gui/canvas/OpenGLCanvas.cpp b/src/gui/wxGui/canvas/OpenGLCanvas.cpp similarity index 97% rename from src/gui/canvas/OpenGLCanvas.cpp rename to src/gui/wxGui/canvas/OpenGLCanvas.cpp index 9f779863..7d9ec9c1 100644 --- a/src/gui/canvas/OpenGLCanvas.cpp +++ b/src/gui/wxGui/canvas/OpenGLCanvas.cpp @@ -1,8 +1,8 @@ -#include "gui/canvas/OpenGLCanvas.h" +#include "canvas/OpenGLCanvas.h" #include "Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h" #include "config/CemuConfig.h" - +#include "Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h" #include "Common/GLInclude/GLInclude.h" #include // this includes GL/gl.h, avoid using this in a header because it would contaminate our own OpenGL definitions (GLInclude) diff --git a/src/gui/wxGui/canvas/OpenGLCanvas.h b/src/gui/wxGui/canvas/OpenGLCanvas.h new file mode 100644 index 00000000..701a9a18 --- /dev/null +++ b/src/gui/wxGui/canvas/OpenGLCanvas.h @@ -0,0 +1,5 @@ +#pragma once +#include +#include "canvas/IRenderCanvas.h" + +wxWindow* GLCanvas_Create(wxWindow* parent, const wxSize& size, bool is_main_window); diff --git a/src/gui/canvas/VulkanCanvas.cpp b/src/gui/wxGui/canvas/VulkanCanvas.cpp similarity index 95% rename from src/gui/canvas/VulkanCanvas.cpp rename to src/gui/wxGui/canvas/VulkanCanvas.cpp index ceddeb52..b73ce101 100644 --- a/src/gui/canvas/VulkanCanvas.cpp +++ b/src/gui/wxGui/canvas/VulkanCanvas.cpp @@ -1,9 +1,9 @@ -#include "gui/canvas/VulkanCanvas.h" +#include "canvas/VulkanCanvas.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" -#include "gui/guiWrapper.h" +#include "guiWrapper.h" #if BOOST_OS_LINUX && HAS_WAYLAND -#include "gui/helpers/wxWayland.h" +#include "helpers/wxWayland.h" #endif #include diff --git a/src/gui/canvas/VulkanCanvas.h b/src/gui/wxGui/canvas/VulkanCanvas.h similarity index 92% rename from src/gui/canvas/VulkanCanvas.h rename to src/gui/wxGui/canvas/VulkanCanvas.h index 13d03a1e..691b768b 100644 --- a/src/gui/canvas/VulkanCanvas.h +++ b/src/gui/wxGui/canvas/VulkanCanvas.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/canvas/IRenderCanvas.h" +#include "canvas/IRenderCanvas.h" #include diff --git a/src/gui/components/TextList.cpp b/src/gui/wxGui/components/TextList.cpp similarity index 99% rename from src/gui/components/TextList.cpp rename to src/gui/wxGui/components/TextList.cpp index 606c84f9..cb48be2b 100644 --- a/src/gui/components/TextList.cpp +++ b/src/gui/wxGui/components/TextList.cpp @@ -1,4 +1,4 @@ -#include "gui/wxgui.h" +#include "wxgui.h" #include "TextList.h" #include #include diff --git a/src/gui/components/TextList.h b/src/gui/wxGui/components/TextList.h similarity index 100% rename from src/gui/components/TextList.h rename to src/gui/wxGui/components/TextList.h diff --git a/src/gui/components/wxDownloadManagerList.cpp b/src/gui/wxGui/components/wxDownloadManagerList.cpp similarity index 98% rename from src/gui/components/wxDownloadManagerList.cpp rename to src/gui/wxGui/components/wxDownloadManagerList.cpp index ebff9e95..b8676bc4 100644 --- a/src/gui/components/wxDownloadManagerList.cpp +++ b/src/gui/wxGui/components/wxDownloadManagerList.cpp @@ -1,10 +1,10 @@ -#include "gui/components/wxDownloadManagerList.h" +#include "components/wxDownloadManagerList.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include "util/helpers/SystemException.h" #include "Cafe/TitleList/GameInfo.h" -#include "gui/components/wxGameList.h" -#include "gui/helpers/wxCustomEvents.h" +#include "components/wxGameList.h" +#include "helpers/wxCustomEvents.h" #include #include @@ -18,10 +18,10 @@ #include #include "config/ActiveSettings.h" -#include "gui/ChecksumTool.h" +#include "ChecksumTool.h" #include "Cemu/Tools/DownloadManager/DownloadManager.h" #include "Cafe/TitleList/TitleId.h" -#include "gui/MainWindow.h" +#include "MainWindow.h" wxDEFINE_EVENT(wxEVT_REMOVE_ENTRY, wxCommandEvent); diff --git a/src/gui/components/wxDownloadManagerList.h b/src/gui/wxGui/components/wxDownloadManagerList.h similarity index 99% rename from src/gui/components/wxDownloadManagerList.h rename to src/gui/wxGui/components/wxDownloadManagerList.h index 0af5b082..eed8c716 100644 --- a/src/gui/components/wxDownloadManagerList.h +++ b/src/gui/wxGui/components/wxDownloadManagerList.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxCustomData.h" #include "config/CemuConfig.h" #include diff --git a/src/gui/components/wxGameList.cpp b/src/gui/wxGui/components/wxGameList.cpp similarity index 99% rename from src/gui/components/wxGameList.cpp rename to src/gui/wxGui/components/wxGameList.cpp index 6e761358..20cc49e2 100644 --- a/src/gui/components/wxGameList.cpp +++ b/src/gui/wxGui/components/wxGameList.cpp @@ -1,8 +1,8 @@ -#include "gui/components/wxGameList.h" +#include "components/wxGameList.h" -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxCustomData.h" #include "util/helpers/helpers.h" -#include "gui/GameProfileWindow.h" +#include "GameProfileWindow.h" #include @@ -22,9 +22,9 @@ #include "Cafe/TitleList/GameInfo.h" #include "Cafe/TitleList/TitleList.h" -#include "gui/CemuApp.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/MainWindow.h" +#include "CemuApp.h" +#include "helpers/wxHelpers.h" +#include "MainWindow.h" #include "../wxHelper.h" diff --git a/src/gui/components/wxGameList.h b/src/gui/wxGui/components/wxGameList.h similarity index 100% rename from src/gui/components/wxGameList.h rename to src/gui/wxGui/components/wxGameList.h diff --git a/src/gui/components/wxInputDraw.cpp b/src/gui/wxGui/components/wxInputDraw.cpp similarity index 98% rename from src/gui/components/wxInputDraw.cpp rename to src/gui/wxGui/components/wxInputDraw.cpp index e3884b71..65b0ef5b 100644 --- a/src/gui/components/wxInputDraw.cpp +++ b/src/gui/wxGui/components/wxInputDraw.cpp @@ -1,4 +1,4 @@ -#include "gui/components/wxInputDraw.h" +#include "components/wxInputDraw.h" #include diff --git a/src/gui/components/wxInputDraw.h b/src/gui/wxGui/components/wxInputDraw.h similarity index 100% rename from src/gui/components/wxInputDraw.h rename to src/gui/wxGui/components/wxInputDraw.h diff --git a/src/gui/components/wxLogCtrl.cpp b/src/gui/wxGui/components/wxLogCtrl.cpp similarity index 98% rename from src/gui/components/wxLogCtrl.cpp rename to src/gui/wxGui/components/wxLogCtrl.cpp index 732dd26d..f67be425 100644 --- a/src/gui/components/wxLogCtrl.cpp +++ b/src/gui/wxGui/components/wxLogCtrl.cpp @@ -1,4 +1,4 @@ -#include "gui/components/wxLogCtrl.h" +#include "components/wxLogCtrl.h" #include diff --git a/src/gui/components/wxLogCtrl.h b/src/gui/wxGui/components/wxLogCtrl.h similarity index 100% rename from src/gui/components/wxLogCtrl.h rename to src/gui/wxGui/components/wxLogCtrl.h diff --git a/src/gui/components/wxTitleManagerList.cpp b/src/gui/wxGui/components/wxTitleManagerList.cpp similarity index 99% rename from src/gui/components/wxTitleManagerList.cpp rename to src/gui/wxGui/components/wxTitleManagerList.cpp index 7ba8d037..1b3d2143 100644 --- a/src/gui/components/wxTitleManagerList.cpp +++ b/src/gui/wxGui/components/wxTitleManagerList.cpp @@ -1,12 +1,12 @@ -#include "gui/components/wxTitleManagerList.h" -#include "gui/helpers/wxHelpers.h" +#include "components/wxTitleManagerList.h" +#include "helpers/wxHelpers.h" #include "util/helpers/SystemException.h" #include "Cafe/TitleList/GameInfo.h" #include "Cafe/TitleList/TitleInfo.h" #include "Cafe/TitleList/TitleList.h" -#include "gui/components/wxGameList.h" -#include "gui/helpers/wxCustomEvents.h" -#include "gui/helpers/wxHelpers.h" +#include "components/wxGameList.h" +#include "helpers/wxCustomEvents.h" +#include "helpers/wxHelpers.h" #include #include @@ -22,8 +22,8 @@ #include #include "config/ActiveSettings.h" -#include "gui/ChecksumTool.h" -#include "gui/MainWindow.h" +#include "ChecksumTool.h" +#include "MainWindow.h" #include "Cafe/TitleList/TitleId.h" #include "Cafe/TitleList/SaveList.h" #include "Cafe/TitleList/TitleList.h" diff --git a/src/gui/components/wxTitleManagerList.h b/src/gui/wxGui/components/wxTitleManagerList.h similarity index 99% rename from src/gui/components/wxTitleManagerList.h rename to src/gui/wxGui/components/wxTitleManagerList.h index 706de2e7..5de63ec1 100644 --- a/src/gui/components/wxTitleManagerList.h +++ b/src/gui/wxGui/components/wxTitleManagerList.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxCustomData.h" #include "config/CemuConfig.h" #include diff --git a/src/gui/debugger/AudioDebuggerWindow.cpp b/src/gui/wxGui/debugger/AudioDebuggerWindow.cpp similarity index 99% rename from src/gui/debugger/AudioDebuggerWindow.cpp rename to src/gui/wxGui/debugger/AudioDebuggerWindow.cpp index d082630e..7463f7dc 100644 --- a/src/gui/debugger/AudioDebuggerWindow.cpp +++ b/src/gui/wxGui/debugger/AudioDebuggerWindow.cpp @@ -1,5 +1,5 @@ -#include "gui/wxgui.h" -#include "gui/debugger/AudioDebuggerWindow.h" +#include "wxgui.h" +#include "debugger/AudioDebuggerWindow.h" #include "Cafe/OS/libs/snd_core/ax.h" #include "Cafe/OS/libs/snd_core/ax_internal.h" diff --git a/src/gui/debugger/AudioDebuggerWindow.h b/src/gui/wxGui/debugger/AudioDebuggerWindow.h similarity index 100% rename from src/gui/debugger/AudioDebuggerWindow.h rename to src/gui/wxGui/debugger/AudioDebuggerWindow.h diff --git a/src/gui/debugger/BreakpointWindow.cpp b/src/gui/wxGui/debugger/BreakpointWindow.cpp similarity index 98% rename from src/gui/debugger/BreakpointWindow.cpp rename to src/gui/wxGui/debugger/BreakpointWindow.cpp index ecb77428..67cd39b5 100644 --- a/src/gui/debugger/BreakpointWindow.cpp +++ b/src/gui/wxGui/debugger/BreakpointWindow.cpp @@ -1,10 +1,10 @@ -#include "gui/wxgui.h" -#include "gui/debugger/BreakpointWindow.h" +#include "wxgui.h" +#include "debugger/BreakpointWindow.h" #include -#include "gui/debugger/DebuggerWindow2.h" -#include "gui/guiWrapper.h" +#include "debugger/DebuggerWindow2.h" +#include "guiWrapper.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cemu/ExpressionParser/ExpressionParser.h" diff --git a/src/gui/debugger/BreakpointWindow.h b/src/gui/wxGui/debugger/BreakpointWindow.h similarity index 92% rename from src/gui/debugger/BreakpointWindow.h rename to src/gui/wxGui/debugger/BreakpointWindow.h index 4851cb52..add75ad6 100644 --- a/src/gui/debugger/BreakpointWindow.h +++ b/src/gui/wxGui/debugger/BreakpointWindow.h @@ -1,5 +1,5 @@ #pragma once -#include "gui/wxcomponents/checkedlistctrl.h" +#include "wxcomponents/checkedlistctrl.h" class DebuggerWindow2; diff --git a/src/gui/debugger/DebuggerWindow2.cpp b/src/gui/wxGui/debugger/DebuggerWindow2.cpp similarity index 98% rename from src/gui/debugger/DebuggerWindow2.cpp rename to src/gui/wxGui/debugger/DebuggerWindow2.cpp index f8c5c931..1e61397c 100644 --- a/src/gui/debugger/DebuggerWindow2.cpp +++ b/src/gui/wxGui/debugger/DebuggerWindow2.cpp @@ -1,5 +1,5 @@ -#include "gui/wxgui.h" -#include "gui/debugger/DebuggerWindow2.h" +#include "wxgui.h" +#include "debugger/DebuggerWindow2.h" #include @@ -7,16 +7,16 @@ #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl_debug_symbols.h" -#include "gui/debugger/RegisterWindow.h" -#include "gui/debugger/DumpWindow.h" +#include "debugger/RegisterWindow.h" +#include "debugger/DumpWindow.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" -#include "gui/debugger/DisasmCtrl.h" -#include "gui/debugger/SymbolWindow.h" -#include "gui/debugger/BreakpointWindow.h" -#include "gui/debugger/ModuleWindow.h" +#include "debugger/DisasmCtrl.h" +#include "debugger/SymbolWindow.h" +#include "debugger/BreakpointWindow.h" +#include "debugger/ModuleWindow.h" #include "util/helpers/helpers.h" #include "resource/embedded/resources.h" diff --git a/src/gui/debugger/DebuggerWindow2.h b/src/gui/wxGui/debugger/DebuggerWindow2.h similarity index 98% rename from src/gui/debugger/DebuggerWindow2.h rename to src/gui/wxGui/debugger/DebuggerWindow2.h index 0ca44c44..6b452bd2 100644 --- a/src/gui/debugger/DebuggerWindow2.h +++ b/src/gui/wxGui/debugger/DebuggerWindow2.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/debugger/DisasmCtrl.h" +#include "debugger/DisasmCtrl.h" #include "config/XMLConfig.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" diff --git a/src/gui/debugger/DisasmCtrl.cpp b/src/gui/wxGui/debugger/DisasmCtrl.cpp similarity index 99% rename from src/gui/debugger/DisasmCtrl.cpp rename to src/gui/wxGui/debugger/DisasmCtrl.cpp index dededf2c..15709ecb 100644 --- a/src/gui/debugger/DisasmCtrl.cpp +++ b/src/gui/wxGui/debugger/DisasmCtrl.cpp @@ -1,5 +1,5 @@ -#include "gui/wxgui.h" -#include "gui/debugger/DisasmCtrl.h" +#include "wxgui.h" +#include "debugger/DisasmCtrl.h" #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl.h" @@ -7,9 +7,9 @@ #include "Cafe/OS/RPL/rpl_debug_symbols.h" #include "Cemu/PPCAssembler/ppcAssembler.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" -#include "gui/debugger/DebuggerWindow2.h" +#include "debugger/DebuggerWindow2.h" #include "util/helpers/helpers.h" -#include "gui/guiWrapper.h" +#include "guiWrapper.h" #include "Cemu/ExpressionParser/ExpressionParser.h" #include "Cafe/HW/Espresso/Debugger/DebugSymbolStorage.h" diff --git a/src/gui/debugger/DisasmCtrl.h b/src/gui/wxGui/debugger/DisasmCtrl.h similarity index 97% rename from src/gui/debugger/DisasmCtrl.h rename to src/gui/wxGui/debugger/DisasmCtrl.h index 993d5697..39ef09e3 100644 --- a/src/gui/debugger/DisasmCtrl.h +++ b/src/gui/wxGui/debugger/DisasmCtrl.h @@ -1,5 +1,5 @@ #pragma once -#include "gui/components/TextList.h" +#include "components/TextList.h" class DisasmCtrl : public TextList { diff --git a/src/gui/debugger/DumpCtrl.cpp b/src/gui/wxGui/debugger/DumpCtrl.cpp similarity index 99% rename from src/gui/debugger/DumpCtrl.cpp rename to src/gui/wxGui/debugger/DumpCtrl.cpp index cc1d5fee..c40ffaf5 100644 --- a/src/gui/debugger/DumpCtrl.cpp +++ b/src/gui/wxGui/debugger/DumpCtrl.cpp @@ -1,5 +1,5 @@ -#include "gui/wxgui.h" -#include "gui/debugger/DumpCtrl.h" +#include "wxgui.h" +#include "debugger/DumpCtrl.h" #include "Cafe/OS/RPL/rpl.h" #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" diff --git a/src/gui/debugger/DumpCtrl.h b/src/gui/wxGui/debugger/DumpCtrl.h similarity index 95% rename from src/gui/debugger/DumpCtrl.h rename to src/gui/wxGui/debugger/DumpCtrl.h index da5ad4ea..8ccb389d 100644 --- a/src/gui/debugger/DumpCtrl.h +++ b/src/gui/wxGui/debugger/DumpCtrl.h @@ -1,5 +1,5 @@ #pragma once -#include "gui/components/TextList.h" +#include "components/TextList.h" class DumpCtrl : public TextList diff --git a/src/gui/debugger/DumpWindow.cpp b/src/gui/wxGui/debugger/DumpWindow.cpp similarity index 90% rename from src/gui/debugger/DumpWindow.cpp rename to src/gui/wxGui/debugger/DumpWindow.cpp index 35c9d2c8..3053018b 100644 --- a/src/gui/debugger/DumpWindow.cpp +++ b/src/gui/wxGui/debugger/DumpWindow.cpp @@ -1,9 +1,9 @@ -#include "gui/wxgui.h" -#include "gui/debugger/DumpWindow.h" +#include "wxgui.h" +#include "debugger/DumpWindow.h" -#include "gui/debugger/DebuggerWindow2.h" +#include "debugger/DebuggerWindow2.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" -#include "gui/debugger/DumpCtrl.h" +#include "debugger/DumpCtrl.h" enum { diff --git a/src/gui/debugger/DumpWindow.h b/src/gui/wxGui/debugger/DumpWindow.h similarity index 90% rename from src/gui/debugger/DumpWindow.h rename to src/gui/wxGui/debugger/DumpWindow.h index 840c5fc6..7837c11e 100644 --- a/src/gui/debugger/DumpWindow.h +++ b/src/gui/wxGui/debugger/DumpWindow.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/debugger/DumpCtrl.h" +#include "debugger/DumpCtrl.h" class DebuggerWindow2; diff --git a/src/gui/debugger/ModuleWindow.cpp b/src/gui/wxGui/debugger/ModuleWindow.cpp similarity index 96% rename from src/gui/debugger/ModuleWindow.cpp rename to src/gui/wxGui/debugger/ModuleWindow.cpp index c24517bd..455e62d7 100644 --- a/src/gui/debugger/ModuleWindow.cpp +++ b/src/gui/wxGui/debugger/ModuleWindow.cpp @@ -1,10 +1,10 @@ -#include "gui/wxgui.h" -#include "gui/guiWrapper.h" -#include "gui/debugger/ModuleWindow.h" +#include "wxgui.h" +#include "guiWrapper.h" +#include "debugger/ModuleWindow.h" #include -#include "gui/debugger/DebuggerWindow2.h" +#include "debugger/DebuggerWindow2.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" diff --git a/src/gui/debugger/ModuleWindow.h b/src/gui/wxGui/debugger/ModuleWindow.h similarity index 100% rename from src/gui/debugger/ModuleWindow.h rename to src/gui/wxGui/debugger/ModuleWindow.h diff --git a/src/gui/debugger/RegisterCtrl.cpp b/src/gui/wxGui/debugger/RegisterCtrl.cpp similarity index 98% rename from src/gui/debugger/RegisterCtrl.cpp rename to src/gui/wxGui/debugger/RegisterCtrl.cpp index bcf6fb5a..0c12e34b 100644 --- a/src/gui/debugger/RegisterCtrl.cpp +++ b/src/gui/wxGui/debugger/RegisterCtrl.cpp @@ -1,12 +1,12 @@ -#include "gui/wxgui.h" -#include "gui/debugger/RegisterCtrl.h" +#include "wxgui.h" +#include "debugger/RegisterCtrl.h" #include #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" -#include "gui/debugger/DebuggerWindow2.h" +#include "debugger/DebuggerWindow2.h" #define COLOR_DEBUG_ACTIVE_BP 0xFFFFA0FF #define COLOR_DEBUG_ACTIVE 0xFFFFA080 diff --git a/src/gui/debugger/RegisterCtrl.h b/src/gui/wxGui/debugger/RegisterCtrl.h similarity index 93% rename from src/gui/debugger/RegisterCtrl.h rename to src/gui/wxGui/debugger/RegisterCtrl.h index 378a5d5d..46b4cb90 100644 --- a/src/gui/debugger/RegisterCtrl.h +++ b/src/gui/wxGui/debugger/RegisterCtrl.h @@ -1,5 +1,5 @@ #pragma once -#include "gui/components/TextList.h" +#include "components/TextList.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" class RegisterCtrl : public TextList diff --git a/src/gui/debugger/RegisterWindow.cpp b/src/gui/wxGui/debugger/RegisterWindow.cpp similarity index 99% rename from src/gui/debugger/RegisterWindow.cpp rename to src/gui/wxGui/debugger/RegisterWindow.cpp index 69c2273d..5da20b6a 100644 --- a/src/gui/debugger/RegisterWindow.cpp +++ b/src/gui/wxGui/debugger/RegisterWindow.cpp @@ -1,9 +1,9 @@ -#include "gui/wxgui.h" -#include "gui/debugger/RegisterWindow.h" +#include "wxgui.h" +#include "debugger/RegisterWindow.h" #include -#include "gui/debugger/DebuggerWindow2.h" +#include "debugger/DebuggerWindow2.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" #include "Cafe/OS/RPL/rpl_structs.h" diff --git a/src/gui/debugger/RegisterWindow.h b/src/gui/wxGui/debugger/RegisterWindow.h similarity index 100% rename from src/gui/debugger/RegisterWindow.h rename to src/gui/wxGui/debugger/RegisterWindow.h diff --git a/src/gui/debugger/SymbolCtrl.cpp b/src/gui/wxGui/debugger/SymbolCtrl.cpp similarity index 98% rename from src/gui/debugger/SymbolCtrl.cpp rename to src/gui/wxGui/debugger/SymbolCtrl.cpp index cb1f3b1a..9ca5ec49 100644 --- a/src/gui/debugger/SymbolCtrl.cpp +++ b/src/gui/wxGui/debugger/SymbolCtrl.cpp @@ -1,5 +1,5 @@ -#include "gui/debugger/SymbolCtrl.h" -#include "gui/guiWrapper.h" +#include "debugger/SymbolCtrl.h" +#include "guiWrapper.h" #include "Cafe/OS/RPL/rpl_symbol_storage.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" diff --git a/src/gui/debugger/SymbolCtrl.h b/src/gui/wxGui/debugger/SymbolCtrl.h similarity index 100% rename from src/gui/debugger/SymbolCtrl.h rename to src/gui/wxGui/debugger/SymbolCtrl.h diff --git a/src/gui/debugger/SymbolWindow.cpp b/src/gui/wxGui/debugger/SymbolWindow.cpp similarity index 91% rename from src/gui/debugger/SymbolWindow.cpp rename to src/gui/wxGui/debugger/SymbolWindow.cpp index 79414e96..b1551af5 100644 --- a/src/gui/debugger/SymbolWindow.cpp +++ b/src/gui/wxGui/debugger/SymbolWindow.cpp @@ -1,7 +1,7 @@ -#include "gui/wxgui.h" -#include "gui/guiWrapper.h" -#include "gui/debugger/SymbolWindow.h" -#include "gui/debugger/DebuggerWindow2.h" +#include "wxgui.h" +#include "guiWrapper.h" +#include "debugger/SymbolWindow.h" +#include "debugger/DebuggerWindow2.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl_symbol_storage.h" diff --git a/src/gui/debugger/SymbolWindow.h b/src/gui/wxGui/debugger/SymbolWindow.h similarity index 92% rename from src/gui/debugger/SymbolWindow.h rename to src/gui/wxGui/debugger/SymbolWindow.h index 2d4cd25f..6cb59576 100644 --- a/src/gui/debugger/SymbolWindow.h +++ b/src/gui/wxGui/debugger/SymbolWindow.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/debugger/SymbolCtrl.h" +#include "debugger/SymbolCtrl.h" class DebuggerWindow2; diff --git a/src/gui/dialogs/CreateAccount/wxCreateAccountDialog.cpp b/src/gui/wxGui/dialogs/CreateAccount/wxCreateAccountDialog.cpp similarity index 98% rename from src/gui/dialogs/CreateAccount/wxCreateAccountDialog.cpp rename to src/gui/wxGui/dialogs/CreateAccount/wxCreateAccountDialog.cpp index 71b56637..a8a3cf67 100644 --- a/src/gui/dialogs/CreateAccount/wxCreateAccountDialog.cpp +++ b/src/gui/wxGui/dialogs/CreateAccount/wxCreateAccountDialog.cpp @@ -1,4 +1,4 @@ -#include "gui/dialogs/CreateAccount/wxCreateAccountDialog.h" +#include "dialogs/CreateAccount/wxCreateAccountDialog.h" #include "Cafe/Account/Account.h" #include diff --git a/src/gui/dialogs/CreateAccount/wxCreateAccountDialog.h b/src/gui/wxGui/dialogs/CreateAccount/wxCreateAccountDialog.h similarity index 100% rename from src/gui/dialogs/CreateAccount/wxCreateAccountDialog.h rename to src/gui/wxGui/dialogs/CreateAccount/wxCreateAccountDialog.h diff --git a/src/gui/dialogs/SaveImport/SaveImportWindow.cpp b/src/gui/wxGui/dialogs/SaveImport/SaveImportWindow.cpp similarity index 99% rename from src/gui/dialogs/SaveImport/SaveImportWindow.cpp rename to src/gui/wxGui/dialogs/SaveImport/SaveImportWindow.cpp index 2a570bb0..7cdf77b9 100644 --- a/src/gui/dialogs/SaveImport/SaveImportWindow.cpp +++ b/src/gui/wxGui/dialogs/SaveImport/SaveImportWindow.cpp @@ -16,7 +16,7 @@ #include "Cafe/OS/libs/coreinit/coreinit_Time.h" #include "util/helpers/helpers.h" #include "Cafe/HW/Espresso/PPCState.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" SaveImportWindow::SaveImportWindow(wxWindow* parent, uint64 title_id) : wxDialog(parent, wxID_ANY, _("Import save entry"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxFRAME_TOOL_WINDOW | wxSYSTEM_MENU | wxTAB_TRAVERSAL | wxCLOSE_BOX), diff --git a/src/gui/dialogs/SaveImport/SaveImportWindow.h b/src/gui/wxGui/dialogs/SaveImport/SaveImportWindow.h similarity index 100% rename from src/gui/dialogs/SaveImport/SaveImportWindow.h rename to src/gui/wxGui/dialogs/SaveImport/SaveImportWindow.h diff --git a/src/gui/dialogs/SaveImport/SaveTransfer.cpp b/src/gui/wxGui/dialogs/SaveImport/SaveTransfer.cpp similarity index 99% rename from src/gui/dialogs/SaveImport/SaveTransfer.cpp rename to src/gui/wxGui/dialogs/SaveImport/SaveTransfer.cpp index 14e473a1..f26daa8a 100644 --- a/src/gui/dialogs/SaveImport/SaveTransfer.cpp +++ b/src/gui/wxGui/dialogs/SaveImport/SaveTransfer.cpp @@ -12,7 +12,7 @@ #include "Cafe/Account/Account.h" #include "config/ActiveSettings.h" #include "util/helpers/helpers.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" SaveTransfer::SaveTransfer(wxWindow* parent, uint64 title_id, const wxString& source_account, uint32 source_id) : wxDialog(parent, wxID_ANY, _("Save transfer"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxFRAME_TOOL_WINDOW | wxSYSTEM_MENU | wxTAB_TRAVERSAL | wxCLOSE_BOX), diff --git a/src/gui/dialogs/SaveImport/SaveTransfer.h b/src/gui/wxGui/dialogs/SaveImport/SaveTransfer.h similarity index 100% rename from src/gui/dialogs/SaveImport/SaveTransfer.h rename to src/gui/wxGui/dialogs/SaveImport/SaveTransfer.h diff --git a/src/gui/helpers/wxControlObject.h b/src/gui/wxGui/helpers/wxControlObject.h similarity index 100% rename from src/gui/helpers/wxControlObject.h rename to src/gui/wxGui/helpers/wxControlObject.h diff --git a/src/gui/helpers/wxCustomData.h b/src/gui/wxGui/helpers/wxCustomData.h similarity index 100% rename from src/gui/helpers/wxCustomData.h rename to src/gui/wxGui/helpers/wxCustomData.h diff --git a/src/gui/helpers/wxCustomEvents.cpp b/src/gui/wxGui/helpers/wxCustomEvents.cpp similarity index 87% rename from src/gui/helpers/wxCustomEvents.cpp rename to src/gui/wxGui/helpers/wxCustomEvents.cpp index 081346c5..d91ba9e5 100644 --- a/src/gui/helpers/wxCustomEvents.cpp +++ b/src/gui/wxGui/helpers/wxCustomEvents.cpp @@ -1,4 +1,4 @@ -#include "gui/helpers/wxCustomEvents.h" +#include "helpers/wxCustomEvents.h" wxDEFINE_EVENT(wxEVT_SET_STATUS_BAR_TEXT, wxSetStatusBarTextEvent); wxDEFINE_EVENT(wxEVT_SET_GAUGE_VALUE, wxSetGaugeValue); diff --git a/src/gui/helpers/wxCustomEvents.h b/src/gui/wxGui/helpers/wxCustomEvents.h similarity index 100% rename from src/gui/helpers/wxCustomEvents.h rename to src/gui/wxGui/helpers/wxCustomEvents.h diff --git a/src/gui/helpers/wxHelpers.cpp b/src/gui/wxGui/helpers/wxHelpers.cpp similarity index 95% rename from src/gui/helpers/wxHelpers.cpp rename to src/gui/wxGui/helpers/wxHelpers.cpp index d6b273c1..2dfca215 100644 --- a/src/gui/helpers/wxHelpers.cpp +++ b/src/gui/wxGui/helpers/wxHelpers.cpp @@ -1,11 +1,11 @@ -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" #include #include #include #include -#include "gui/helpers/wxControlObject.h" +#include "helpers/wxControlObject.h" void wxAutosizeColumn(wxListCtrlBase* ctrl, int col) { diff --git a/src/gui/helpers/wxHelpers.h b/src/gui/wxGui/helpers/wxHelpers.h similarity index 100% rename from src/gui/helpers/wxHelpers.h rename to src/gui/wxGui/helpers/wxHelpers.h diff --git a/src/gui/helpers/wxLogEvent.h b/src/gui/wxGui/helpers/wxLogEvent.h similarity index 100% rename from src/gui/helpers/wxLogEvent.h rename to src/gui/wxGui/helpers/wxLogEvent.h diff --git a/src/gui/helpers/wxWayland.cpp b/src/gui/wxGui/helpers/wxWayland.cpp similarity index 95% rename from src/gui/helpers/wxWayland.cpp rename to src/gui/wxGui/helpers/wxWayland.cpp index c677451c..875a0698 100644 --- a/src/gui/helpers/wxWayland.cpp +++ b/src/gui/wxGui/helpers/wxWayland.cpp @@ -1,4 +1,4 @@ -#include "gui/helpers/wxWayland.h" +#include "helpers/wxWayland.h" #if BOOST_OS_LINUX && HAS_WAYLAND diff --git a/src/gui/helpers/wxWayland.h b/src/gui/wxGui/helpers/wxWayland.h similarity index 100% rename from src/gui/helpers/wxWayland.h rename to src/gui/wxGui/helpers/wxWayland.h diff --git a/src/gui/input/InputAPIAddWindow.cpp b/src/gui/wxGui/input/InputAPIAddWindow.cpp similarity index 98% rename from src/gui/input/InputAPIAddWindow.cpp rename to src/gui/wxGui/input/InputAPIAddWindow.cpp index f32a85b6..8b9bea68 100644 --- a/src/gui/input/InputAPIAddWindow.cpp +++ b/src/gui/wxGui/input/InputAPIAddWindow.cpp @@ -1,8 +1,8 @@ -#include "gui/input/InputAPIAddWindow.h" +#include "input/InputAPIAddWindow.h" #include "input/InputManager.h" -#include "gui/helpers/wxCustomData.h" -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxCustomData.h" +#include "helpers/wxHelpers.h" #include "input/api/Controller.h" #include diff --git a/src/gui/input/InputAPIAddWindow.h b/src/gui/wxGui/input/InputAPIAddWindow.h similarity index 97% rename from src/gui/input/InputAPIAddWindow.h rename to src/gui/wxGui/input/InputAPIAddWindow.h index ebee0592..f2ac7a5c 100644 --- a/src/gui/input/InputAPIAddWindow.h +++ b/src/gui/wxGui/input/InputAPIAddWindow.h @@ -6,7 +6,7 @@ #include #include -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxCustomData.h" #include "input/api/Controller.h" class wxComboBox; diff --git a/src/gui/input/InputSettings2.cpp b/src/gui/wxGui/input/InputSettings2.cpp similarity index 98% rename from src/gui/input/InputSettings2.cpp rename to src/gui/wxGui/input/InputSettings2.cpp index bc3d33e0..9d19581a 100644 --- a/src/gui/input/InputSettings2.cpp +++ b/src/gui/wxGui/input/InputSettings2.cpp @@ -1,11 +1,11 @@ -#include "gui/input/InputSettings2.h" +#include "input/InputSettings2.h" #include #include "input/InputManager.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/helpers/wxControlObject.h" -#include "gui/helpers/wxCustomData.h" +#include "helpers/wxHelpers.h" +#include "helpers/wxControlObject.h" +#include "helpers/wxCustomData.h" #include #include @@ -17,16 +17,16 @@ #include #include "config/ActiveSettings.h" -#include "gui/input/InputAPIAddWindow.h" +#include "input/InputAPIAddWindow.h" #include "input/ControllerFactory.h" -#include "gui/input/panels/VPADInputPanel.h" -#include "gui/input/panels/ProControllerInputPanel.h" +#include "input/panels/VPADInputPanel.h" +#include "input/panels/ProControllerInputPanel.h" -#include "gui/input/settings/DefaultControllerSettings.h" -#include "gui/input/panels/ClassicControllerInputPanel.h" -#include "gui/input/panels/WiimoteInputPanel.h" -#include "gui/input/settings/WiimoteControllerSettings.h" +#include "input/settings/DefaultControllerSettings.h" +#include "input/panels/ClassicControllerInputPanel.h" +#include "input/panels/WiimoteInputPanel.h" +#include "input/settings/WiimoteControllerSettings.h" #include "util/EventService.h" #include "resource/embedded/resources.h" diff --git a/src/gui/input/InputSettings2.h b/src/gui/wxGui/input/InputSettings2.h similarity index 100% rename from src/gui/input/InputSettings2.h rename to src/gui/wxGui/input/InputSettings2.h diff --git a/src/gui/input/panels/ClassicControllerInputPanel.cpp b/src/gui/wxGui/input/panels/ClassicControllerInputPanel.cpp similarity index 96% rename from src/gui/input/panels/ClassicControllerInputPanel.cpp rename to src/gui/wxGui/input/panels/ClassicControllerInputPanel.cpp index c0d7c939..ee298e09 100644 --- a/src/gui/input/panels/ClassicControllerInputPanel.cpp +++ b/src/gui/wxGui/input/panels/ClassicControllerInputPanel.cpp @@ -1,4 +1,4 @@ -#include "gui/input/panels/ClassicControllerInputPanel.h" +#include "input/panels/ClassicControllerInputPanel.h" #include #include @@ -6,10 +6,10 @@ #include #include -#include "gui/helpers/wxControlObject.h" +#include "helpers/wxControlObject.h" #include "input/emulated/ClassicController.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" constexpr ClassicController::ButtonId g_kFirstColumnItems[] = { ClassicController::kButtonId_A, ClassicController::kButtonId_B, ClassicController::kButtonId_X, ClassicController::kButtonId_Y, ClassicController::kButtonId_L, ClassicController::kButtonId_R, ClassicController::kButtonId_ZL, ClassicController::kButtonId_ZR, ClassicController::kButtonId_Plus, ClassicController::kButtonId_Minus }; constexpr ClassicController::ButtonId g_kSecondColumnItems[] = { ClassicController::kButtonId_StickL_Up, ClassicController::kButtonId_StickL_Down, ClassicController::kButtonId_StickL_Left, ClassicController::kButtonId_StickL_Right }; diff --git a/src/gui/input/panels/ClassicControllerInputPanel.h b/src/gui/wxGui/input/panels/ClassicControllerInputPanel.h similarity index 90% rename from src/gui/input/panels/ClassicControllerInputPanel.h rename to src/gui/wxGui/input/panels/ClassicControllerInputPanel.h index ff8add27..3ae7a261 100644 --- a/src/gui/input/panels/ClassicControllerInputPanel.h +++ b/src/gui/wxGui/input/panels/ClassicControllerInputPanel.h @@ -2,7 +2,7 @@ #include #include "input/emulated/ClassicController.h" -#include "gui/input/panels/InputPanel.h" +#include "input/panels/InputPanel.h" class wxInputDraw; diff --git a/src/gui/input/panels/InputPanel.cpp b/src/gui/wxGui/input/panels/InputPanel.cpp similarity index 98% rename from src/gui/input/panels/InputPanel.cpp rename to src/gui/wxGui/input/panels/InputPanel.cpp index 6c1b8dda..96aa785e 100644 --- a/src/gui/input/panels/InputPanel.cpp +++ b/src/gui/wxGui/input/panels/InputPanel.cpp @@ -1,9 +1,9 @@ -#include "gui/input/panels/InputPanel.h" +#include "input/panels/InputPanel.h" #include #include -#include "gui/helpers/wxHelpers.h" +#include "helpers/wxHelpers.h" InputPanel::InputPanel(wxWindow* parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER | wxWANTS_CHARS) diff --git a/src/gui/input/panels/InputPanel.h b/src/gui/wxGui/input/panels/InputPanel.h similarity index 98% rename from src/gui/input/panels/InputPanel.h rename to src/gui/wxGui/input/panels/InputPanel.h index 1c30333c..f485144f 100644 --- a/src/gui/input/panels/InputPanel.h +++ b/src/gui/wxGui/input/panels/InputPanel.h @@ -5,7 +5,7 @@ #include "input/emulated/EmulatedController.h" #include "input/api/Controller.h" -#include "gui/wxHelper.h" +#include "wxHelper.h" class ControllerBase; class wxTextCtrl; diff --git a/src/gui/input/panels/ProControllerInputPanel.cpp b/src/gui/wxGui/input/panels/ProControllerInputPanel.cpp similarity index 97% rename from src/gui/input/panels/ProControllerInputPanel.cpp rename to src/gui/wxGui/input/panels/ProControllerInputPanel.cpp index 254a3ab8..c07a2317 100644 --- a/src/gui/input/panels/ProControllerInputPanel.cpp +++ b/src/gui/wxGui/input/panels/ProControllerInputPanel.cpp @@ -1,4 +1,4 @@ -#include "gui/input/panels/ProControllerInputPanel.h" +#include "input/panels/ProControllerInputPanel.h" #include #include @@ -6,8 +6,8 @@ #include #include "input/emulated/ProController.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" const ProController::ButtonId g_kFirstColumnItems[] = { ProController::kButtonId_A, ProController::kButtonId_B, ProController::kButtonId_X, ProController::kButtonId_Y, ProController::kButtonId_L, ProController::kButtonId_R, ProController::kButtonId_ZL, ProController::kButtonId_ZR, ProController::kButtonId_Plus, ProController::kButtonId_Minus }; const ProController::ButtonId g_kSecondColumnItems[] = { ProController::kButtonId_StickL, ProController::kButtonId_StickL_Up, ProController::kButtonId_StickL_Down, ProController::kButtonId_StickL_Left, ProController::kButtonId_StickL_Right }; diff --git a/src/gui/input/panels/ProControllerInputPanel.h b/src/gui/wxGui/input/panels/ProControllerInputPanel.h similarity index 85% rename from src/gui/input/panels/ProControllerInputPanel.h rename to src/gui/wxGui/input/panels/ProControllerInputPanel.h index 7987b44f..6b80e2d7 100644 --- a/src/gui/input/panels/ProControllerInputPanel.h +++ b/src/gui/wxGui/input/panels/ProControllerInputPanel.h @@ -2,8 +2,8 @@ #include #include "input/emulated/ProController.h" -#include "gui/input/panels/InputPanel.h" -#include "gui/components/wxInputDraw.h" +#include "input/panels/InputPanel.h" +#include "components/wxInputDraw.h" class ProControllerInputPanel : public InputPanel { diff --git a/src/gui/input/panels/VPADInputPanel.cpp b/src/gui/wxGui/input/panels/VPADInputPanel.cpp similarity index 97% rename from src/gui/input/panels/VPADInputPanel.cpp rename to src/gui/wxGui/input/panels/VPADInputPanel.cpp index fbcdfde4..2ebaa5b3 100644 --- a/src/gui/input/panels/VPADInputPanel.cpp +++ b/src/gui/wxGui/input/panels/VPADInputPanel.cpp @@ -1,4 +1,4 @@ -#include "gui/input/panels/VPADInputPanel.h" +#include "input/panels/VPADInputPanel.h" #include #include @@ -7,9 +7,9 @@ #include -#include "gui/helpers/wxControlObject.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" +#include "helpers/wxControlObject.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" #include "input/emulated/VPADController.h" constexpr VPADController::ButtonId g_kFirstColumnItems[] = diff --git a/src/gui/input/panels/VPADInputPanel.h b/src/gui/wxGui/input/panels/VPADInputPanel.h similarity index 93% rename from src/gui/input/panels/VPADInputPanel.h rename to src/gui/wxGui/input/panels/VPADInputPanel.h index 3513bbf7..0133ac09 100644 --- a/src/gui/input/panels/VPADInputPanel.h +++ b/src/gui/wxGui/input/panels/VPADInputPanel.h @@ -1,7 +1,7 @@ #pragma once #include -#include "gui/input/panels/InputPanel.h" +#include "input/panels/InputPanel.h" class wxInputDraw; diff --git a/src/gui/input/panels/WiimoteInputPanel.cpp b/src/gui/wxGui/input/panels/WiimoteInputPanel.cpp similarity index 98% rename from src/gui/input/panels/WiimoteInputPanel.cpp rename to src/gui/wxGui/input/panels/WiimoteInputPanel.cpp index fbc4e325..1dffff60 100644 --- a/src/gui/input/panels/WiimoteInputPanel.cpp +++ b/src/gui/wxGui/input/panels/WiimoteInputPanel.cpp @@ -1,4 +1,4 @@ -#include "gui/input/panels/WiimoteInputPanel.h" +#include "input/panels/WiimoteInputPanel.h" #include #include @@ -7,10 +7,10 @@ #include #include -#include "gui/helpers/wxControlObject.h" +#include "helpers/wxControlObject.h" #include "input/emulated/WiimoteController.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" constexpr WiimoteController::ButtonId g_kFirstColumnItems[] = { diff --git a/src/gui/input/panels/WiimoteInputPanel.h b/src/gui/wxGui/input/panels/WiimoteInputPanel.h similarity index 95% rename from src/gui/input/panels/WiimoteInputPanel.h rename to src/gui/wxGui/input/panels/WiimoteInputPanel.h index a7aed99b..cd8f4ba4 100644 --- a/src/gui/input/panels/WiimoteInputPanel.h +++ b/src/gui/wxGui/input/panels/WiimoteInputPanel.h @@ -1,6 +1,6 @@ #pragma once -#include "gui/input/panels/InputPanel.h" +#include "input/panels/InputPanel.h" #include "input/emulated/WiimoteController.h" #include diff --git a/src/gui/input/settings/DefaultControllerSettings.cpp b/src/gui/wxGui/input/settings/DefaultControllerSettings.cpp similarity index 98% rename from src/gui/input/settings/DefaultControllerSettings.cpp rename to src/gui/wxGui/input/settings/DefaultControllerSettings.cpp index 97cf1704..6571513d 100644 --- a/src/gui/input/settings/DefaultControllerSettings.cpp +++ b/src/gui/wxGui/input/settings/DefaultControllerSettings.cpp @@ -1,4 +1,4 @@ -#include "gui/input/settings/DefaultControllerSettings.h" +#include "input/settings/DefaultControllerSettings.h" #include #include @@ -9,10 +9,10 @@ #include #include -#include "gui/helpers/wxControlObject.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" -#include "gui/input/InputAPIAddWindow.h" +#include "helpers/wxControlObject.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" +#include "input/InputAPIAddWindow.h" DefaultControllerSettings::DefaultControllerSettings(wxWindow* parent, const wxPoint& position, std::shared_ptr controller) diff --git a/src/gui/input/settings/DefaultControllerSettings.h b/src/gui/wxGui/input/settings/DefaultControllerSettings.h similarity index 100% rename from src/gui/input/settings/DefaultControllerSettings.h rename to src/gui/wxGui/input/settings/DefaultControllerSettings.h diff --git a/src/gui/input/settings/WiimoteControllerSettings.cpp b/src/gui/wxGui/input/settings/WiimoteControllerSettings.cpp similarity index 98% rename from src/gui/input/settings/WiimoteControllerSettings.cpp rename to src/gui/wxGui/input/settings/WiimoteControllerSettings.cpp index a1ea4ecf..c8e2f82f 100644 --- a/src/gui/input/settings/WiimoteControllerSettings.cpp +++ b/src/gui/wxGui/input/settings/WiimoteControllerSettings.cpp @@ -1,4 +1,4 @@ -#include "gui/input/settings/WiimoteControllerSettings.h" +#include "input/settings/WiimoteControllerSettings.h" #include #include @@ -9,10 +9,10 @@ #include #include -#include "gui/helpers/wxControlObject.h" -#include "gui/helpers/wxHelpers.h" -#include "gui/components/wxInputDraw.h" -#include "gui/input/InputAPIAddWindow.h" +#include "helpers/wxControlObject.h" +#include "helpers/wxHelpers.h" +#include "components/wxInputDraw.h" +#include "input/InputAPIAddWindow.h" #if BOOST_OS_WINDOWS diff --git a/src/gui/input/settings/WiimoteControllerSettings.h b/src/gui/wxGui/input/settings/WiimoteControllerSettings.h similarity index 100% rename from src/gui/input/settings/WiimoteControllerSettings.h rename to src/gui/wxGui/input/settings/WiimoteControllerSettings.h diff --git a/src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp b/src/gui/wxGui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp similarity index 99% rename from src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp rename to src/gui/wxGui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp index 0c10f325..6963555d 100644 --- a/src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp +++ b/src/gui/wxGui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp @@ -1,4 +1,4 @@ -#include "gui/wxgui.h" +#include "wxgui.h" #include "Cafe/OS/libs/coreinit/coreinit_Thread.h" #include "Cafe/OS/libs/coreinit/coreinit_Scheduler.h" #include "DebugPPCThreadsWindow.h" diff --git a/src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h b/src/gui/wxGui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h similarity index 100% rename from src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h rename to src/gui/wxGui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h diff --git a/src/gui/windows/TextureRelationViewer/TextureRelationWindow.cpp b/src/gui/wxGui/windows/TextureRelationViewer/TextureRelationWindow.cpp similarity index 99% rename from src/gui/windows/TextureRelationViewer/TextureRelationWindow.cpp rename to src/gui/wxGui/windows/TextureRelationViewer/TextureRelationWindow.cpp index 5b79ffd8..62cb7ec6 100644 --- a/src/gui/windows/TextureRelationViewer/TextureRelationWindow.cpp +++ b/src/gui/wxGui/windows/TextureRelationViewer/TextureRelationWindow.cpp @@ -1,4 +1,4 @@ -#include "gui/wxgui.h" +#include "wxgui.h" #include "TextureRelationWindow.h" #include "Cafe/HW/Latte/Core/LatteTexture.h" diff --git a/src/gui/windows/TextureRelationViewer/TextureRelationWindow.h b/src/gui/wxGui/windows/TextureRelationViewer/TextureRelationWindow.h similarity index 100% rename from src/gui/windows/TextureRelationViewer/TextureRelationWindow.h rename to src/gui/wxGui/windows/TextureRelationViewer/TextureRelationWindow.h diff --git a/src/gui/guiWrapper.cpp b/src/gui/wxGui/wxGuiWrapper.cpp similarity index 85% rename from src/gui/guiWrapper.cpp rename to src/gui/wxGui/wxGuiWrapper.cpp index 1ca86284..0ee139ce 100644 --- a/src/gui/guiWrapper.cpp +++ b/src/gui/wxGui/wxGuiWrapper.cpp @@ -1,24 +1,31 @@ +#include #if BOOST_OS_LINUX #include #include #include +#include #include #ifdef HAS_WAYLAND #include #endif #endif -#include "gui/wxgui.h" -#include "gui/guiWrapper.h" -#include "gui/CemuApp.h" -#include "gui/MainWindow.h" -#include "gui/debugger/DebuggerWindow2.h" +#if BOOST_OS_MACOS +#include +#endif + +#include "wxgui.h" +#include "guiWrapper.h" +#include "CemuApp.h" +#include "MainWindow.h" +#include "debugger/DebuggerWindow2.h" #include "Cafe/HW/Latte/Core/Latte.h" #include "config/ActiveSettings.h" #include "config/NetworkSettings.h" #include "config/CemuConfig.h" #include "Cafe/HW/Latte/Renderer/Renderer.h" #include "Cafe/CafeSystem.h" +#include "LoggingWindow.h" #include "wxHelper.h" #include @@ -307,9 +314,53 @@ bool gui_isKeyDown(uint32 key) bool gui_isKeyDown(PlatformKeyCodes key) { - return gui_isKeyDown((std::underlying_type_t)key); + uint32 keyCode = 0; + +#if BOOST_OS_WINDOWS + switch (key) + { + case PlatformKeyCodes::LCONTROL: + keyCode = VK_LCONTROL; + break; + case PlatformKeyCodes::RCONTROL: + keyCode = VK_RCONTROL; + break; + case PlatformKeyCodes::TAB: + keyCode = VK_TAB; + break; + } +#elif BOOST_OS_LINUX + switch (key) + { + case PlatformKeyCodes::LCONTROL: + keyCode = GDK_KEY_Control_L; + break; + case PlatformKeyCodes::RCONTROL: + keyCode = GDK_KEY_Control_R; + break; + case PlatformKeyCodes::TAB: + keyCode = GDK_KEY_Tab; + break; + } +#elif BOOST_OS_MACOS + switch (key) + { + case PlatformKeyCodes::LCONTROL: + keyCode = kVK_Control; + break; + case PlatformKeyCodes::RCONTROL: + keyCode = kVK_RightControl; + break; + case PlatformKeyCodes::TAB: + keyCode = kVK_Tab; + break; + } +#endif + + return gui_isKeyDown(keyCode); } + void gui_notifyGameLoaded() { std::shared_lock lock(g_mutex); @@ -395,3 +446,19 @@ void debuggerWindow_notifyModuleUnloaded(void* module) wxQueueEvent(g_debugger_window, evt); } } +void gui_requestGameListRefresh() +{ + MainWindow::RequestGameListRefresh(); +} + +void gui_loggingWindowLog(std::string_view filter, std::string_view message) +{ + LoggingWindow::Log(filter, message); +} + +void gui_loggingWindowLog(std::string_view message) +{ + LoggingWindow::Log(message); +} + + diff --git a/src/gui/wxHelper.h b/src/gui/wxGui/wxHelper.h similarity index 100% rename from src/gui/wxHelper.h rename to src/gui/wxGui/wxHelper.h diff --git a/src/gui/wxcomponents/checked.xpm b/src/gui/wxGui/wxcomponents/checked.xpm similarity index 100% rename from src/gui/wxcomponents/checked.xpm rename to src/gui/wxGui/wxcomponents/checked.xpm diff --git a/src/gui/wxcomponents/checked2.xpm b/src/gui/wxGui/wxcomponents/checked2.xpm similarity index 100% rename from src/gui/wxcomponents/checked2.xpm rename to src/gui/wxGui/wxcomponents/checked2.xpm diff --git a/src/gui/wxcomponents/checked_d.xpm b/src/gui/wxGui/wxcomponents/checked_d.xpm similarity index 100% rename from src/gui/wxcomponents/checked_d.xpm rename to src/gui/wxGui/wxcomponents/checked_d.xpm diff --git a/src/gui/wxcomponents/checked_dis.xpm b/src/gui/wxGui/wxcomponents/checked_dis.xpm similarity index 100% rename from src/gui/wxcomponents/checked_dis.xpm rename to src/gui/wxGui/wxcomponents/checked_dis.xpm diff --git a/src/gui/wxcomponents/checked_ld.xpm b/src/gui/wxGui/wxcomponents/checked_ld.xpm similarity index 100% rename from src/gui/wxcomponents/checked_ld.xpm rename to src/gui/wxGui/wxcomponents/checked_ld.xpm diff --git a/src/gui/wxcomponents/checked_mo.xpm b/src/gui/wxGui/wxcomponents/checked_mo.xpm similarity index 100% rename from src/gui/wxcomponents/checked_mo.xpm rename to src/gui/wxGui/wxcomponents/checked_mo.xpm diff --git a/src/gui/wxcomponents/checkedlistctrl.cpp b/src/gui/wxGui/wxcomponents/checkedlistctrl.cpp similarity index 98% rename from src/gui/wxcomponents/checkedlistctrl.cpp rename to src/gui/wxGui/wxcomponents/checkedlistctrl.cpp index 9728f1c6..32954549 100644 --- a/src/gui/wxcomponents/checkedlistctrl.cpp +++ b/src/gui/wxGui/wxcomponents/checkedlistctrl.cpp @@ -18,7 +18,7 @@ #endif // includes -#include "gui/wxcomponents/checkedlistctrl.h" +#include "wxcomponents/checkedlistctrl.h" #include #include @@ -27,10 +27,10 @@ // resources -#include "gui/wxcomponents/checked.xpm" -#include "gui/wxcomponents/unchecked.xpm" -#include "gui/wxcomponents/checked_dis.xpm" -#include "gui/wxcomponents/unchecked_dis.xpm" +#include "wxcomponents/checked.xpm" +#include "wxcomponents/unchecked.xpm" +#include "wxcomponents/checked_dis.xpm" +#include "wxcomponents/unchecked_dis.xpm" IMPLEMENT_CLASS(wxCheckedListCtrl, wxListCtrl) BEGIN_EVENT_TABLE(wxCheckedListCtrl, wxListCtrl) diff --git a/src/gui/wxcomponents/checkedlistctrl.h b/src/gui/wxGui/wxcomponents/checkedlistctrl.h similarity index 100% rename from src/gui/wxcomponents/checkedlistctrl.h rename to src/gui/wxGui/wxcomponents/checkedlistctrl.h diff --git a/src/gui/wxcomponents/checktree.cpp b/src/gui/wxGui/wxcomponents/checktree.cpp similarity index 97% rename from src/gui/wxcomponents/checktree.cpp rename to src/gui/wxGui/wxcomponents/checktree.cpp index 6f8ca557..723b7a9e 100644 --- a/src/gui/wxcomponents/checktree.cpp +++ b/src/gui/wxGui/wxcomponents/checktree.cpp @@ -1,12 +1,12 @@ -#include "gui/wxcomponents/checktree.h" -#include "gui/wxcomponents/checked2.xpm" -#include "gui/wxcomponents/checked_d.xpm" -#include "gui/wxcomponents/checked_ld.xpm" -#include "gui/wxcomponents/checked_mo.xpm" -#include "gui/wxcomponents/unchecked2.xpm" -#include "gui/wxcomponents/unchecked_d.xpm" -#include "gui/wxcomponents/unchecked_ld.xpm" -#include "gui/wxcomponents/unchecked_mo.xpm" +#include "wxcomponents/checktree.h" +#include "wxcomponents/checked2.xpm" +#include "wxcomponents/checked_d.xpm" +#include "wxcomponents/checked_ld.xpm" +#include "wxcomponents/checked_mo.xpm" +#include "wxcomponents/unchecked2.xpm" +#include "wxcomponents/unchecked_d.xpm" +#include "wxcomponents/unchecked_ld.xpm" +#include "wxcomponents/unchecked_mo.xpm" #include #include diff --git a/src/gui/wxcomponents/checktree.h b/src/gui/wxGui/wxcomponents/checktree.h similarity index 100% rename from src/gui/wxcomponents/checktree.h rename to src/gui/wxGui/wxcomponents/checktree.h diff --git a/src/gui/wxcomponents/unchecked.xpm b/src/gui/wxGui/wxcomponents/unchecked.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked.xpm rename to src/gui/wxGui/wxcomponents/unchecked.xpm diff --git a/src/gui/wxcomponents/unchecked2.xpm b/src/gui/wxGui/wxcomponents/unchecked2.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked2.xpm rename to src/gui/wxGui/wxcomponents/unchecked2.xpm diff --git a/src/gui/wxcomponents/unchecked_d.xpm b/src/gui/wxGui/wxcomponents/unchecked_d.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked_d.xpm rename to src/gui/wxGui/wxcomponents/unchecked_d.xpm diff --git a/src/gui/wxcomponents/unchecked_dis.xpm b/src/gui/wxGui/wxcomponents/unchecked_dis.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked_dis.xpm rename to src/gui/wxGui/wxcomponents/unchecked_dis.xpm diff --git a/src/gui/wxcomponents/unchecked_ld.xpm b/src/gui/wxGui/wxcomponents/unchecked_ld.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked_ld.xpm rename to src/gui/wxGui/wxcomponents/unchecked_ld.xpm diff --git a/src/gui/wxcomponents/unchecked_mo.xpm b/src/gui/wxGui/wxcomponents/unchecked_mo.xpm similarity index 100% rename from src/gui/wxcomponents/unchecked_mo.xpm rename to src/gui/wxGui/wxcomponents/unchecked_mo.xpm diff --git a/src/gui/wxgui.h b/src/gui/wxGui/wxgui.h similarity index 98% rename from src/gui/wxgui.h rename to src/gui/wxGui/wxgui.h index 098449d6..b2f5fdb2 100644 --- a/src/gui/wxgui.h +++ b/src/gui/wxGui/wxgui.h @@ -34,8 +34,6 @@ #include #include -extern bool g_inputConfigWindowHasFocus; - // wx helper functions #include struct wxStringFormatParameters