From 44f0e5acd31ef4b65c4d2b326577aff4ed1a33ae Mon Sep 17 00:00:00 2001 From: SSimco <37044560+SSimco@users.noreply.github.com> Date: Sat, 26 Jul 2025 17:38:34 +0300 Subject: [PATCH] Update wxgui --- src/CMakeLists.txt | 20 +- src/audio/IAudioAPI.h | 4 +- src/gui/wxgui/AudioDebuggerWindow.cpp | 4 - src/gui/wxgui/CemuApp.cpp | 61 +--- src/gui/wxgui/CemuUpdateWindow.cpp | 4 - src/gui/wxgui/ChecksumTool.cpp | 10 - src/gui/wxgui/ChecksumTool.h | 4 - src/gui/wxgui/DownloadGraphicPacksWindow.cpp | 5 - src/gui/wxgui/GameProfileWindow.cpp | 8 - src/gui/wxgui/GameUpdateWindow.cpp | 11 - src/gui/wxgui/GeneralSettings2.cpp | 17 +- src/gui/wxgui/GettingStartedDialog.cpp | 11 - src/gui/wxgui/GraphicPacksWindow2.cpp | 6 - src/gui/wxgui/LoggingWindow.cpp | 28 -- src/gui/wxgui/MainWindow.cpp | 316 ++---------------- src/gui/wxgui/MainWindow.h | 16 +- src/gui/wxgui/MemorySearcherTool.cpp | 10 - src/gui/wxgui/MemorySearcherTool.h | 4 - src/gui/wxgui/PadViewFrame.cpp | 76 ++--- src/gui/wxgui/TitleManager.cpp | 24 -- src/gui/wxgui/canvas/OpenGLCanvas.cpp | 50 +-- src/gui/wxgui/canvas/VulkanCanvas.cpp | 17 - src/gui/wxgui/canvas/VulkanCanvas.h | 4 - src/gui/wxgui/components/TextList.cpp | 4 - .../components/wxDownloadManagerList.cpp | 17 - .../wxgui/components/wxDownloadManagerList.h | 4 - src/gui/wxgui/components/wxGameList.cpp | 14 - src/gui/wxgui/components/wxInputDraw.cpp | 4 - src/gui/wxgui/components/wxLogCtrl.cpp | 4 - .../wxgui/components/wxTitleManagerList.cpp | 16 - src/gui/wxgui/components/wxTitleManagerList.h | 4 - src/gui/wxgui/debugger/BreakpointWindow.cpp | 13 - src/gui/wxgui/debugger/BreakpointWindow.h | 4 - src/gui/wxgui/debugger/DebuggerWindow2.cpp | 57 +--- src/gui/wxgui/debugger/DebuggerWindow2.h | 16 - src/gui/wxgui/debugger/DisasmCtrl.cpp | 13 +- src/gui/wxgui/debugger/DisasmCtrl.h | 4 - src/gui/wxgui/debugger/DumpCtrl.cpp | 5 - src/gui/wxgui/debugger/DumpCtrl.h | 4 - src/gui/wxgui/debugger/DumpWindow.cpp | 9 - src/gui/wxgui/debugger/DumpWindow.h | 4 - src/gui/wxgui/debugger/ModuleWindow.cpp | 13 - src/gui/wxgui/debugger/RegisterCtrl.cpp | 9 - src/gui/wxgui/debugger/RegisterCtrl.h | 4 - src/gui/wxgui/debugger/RegisterWindow.cpp | 9 - src/gui/wxgui/debugger/SymbolCtrl.cpp | 8 - src/gui/wxgui/debugger/SymbolWindow.cpp | 6 - src/gui/wxgui/debugger/SymbolWindow.h | 4 - .../CreateAccount/wxCreateAccountDialog.cpp | 4 - .../dialogs/SaveImport/SaveImportWindow.cpp | 4 - .../wxgui/dialogs/SaveImport/SaveTransfer.cpp | 4 - src/gui/wxgui/helpers/wxCustomEvents.cpp | 4 - src/gui/wxgui/helpers/wxHelpers.h | 12 +- src/gui/wxgui/helpers/wxWayland.cpp | 4 - src/gui/wxgui/input/InputAPIAddWindow.cpp | 8 - src/gui/wxgui/input/InputAPIAddWindow.h | 4 - src/gui/wxgui/input/InputSettings2.cpp | 25 -- .../panels/ClassicControllerInputPanel.cpp | 11 - .../panels/ClassicControllerInputPanel.h | 4 - src/gui/wxgui/input/panels/InputPanel.cpp | 12 - src/gui/wxgui/input/panels/InputPanel.h | 4 - .../input/panels/ProControllerInputPanel.cpp | 9 - .../input/panels/ProControllerInputPanel.h | 5 - src/gui/wxgui/input/panels/VPADInputPanel.cpp | 10 - src/gui/wxgui/input/panels/VPADInputPanel.h | 4 - .../wxgui/input/panels/WiimoteInputPanel.cpp | 12 - .../wxgui/input/panels/WiimoteInputPanel.h | 4 - .../settings/DefaultControllerSettings.cpp | 11 - .../settings/WiimoteControllerSettings.cpp | 11 - .../DebugPPCThreadsWindow.cpp | 4 - .../TextureRelationWindow.cpp | 4 - .../wxgui/wxcomponents/checkedlistctrl.cpp | 11 - src/gui/wxgui/wxcomponents/checktree.cpp | 12 - src/gui/wxgui/wxgui.h | 1 + 74 files changed, 79 insertions(+), 1078 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79d48947..8a820865 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,11 +42,7 @@ add_compile_definitions(VK_NO_PROTOTYPES) set(CMAKE_INCLUDE_CURRENT_DIR ON) add_subdirectory(Common) -if(ANDROID) - add_subdirectory(android/app/src/main/cpp) -else() - add_subdirectory(gui) -endif() +add_subdirectory(gui) add_subdirectory(Cafe) add_subdirectory(Cemu) add_subdirectory(config) @@ -57,10 +53,11 @@ add_subdirectory(imgui) add_subdirectory(resource) if(ANDROID) - add_library(CemuBin STATIC - main.cpp - mainLLE.cpp - ) + add_library(CemuBin STATIC + main.cpp + mainLLE.cpp + ) + add_subdirectory(android/app/src/main/cpp) else() add_executable(CemuBin main.cpp @@ -145,16 +142,13 @@ target_link_libraries(CemuBin PRIVATE CemuAudio CemuCafe CemuCommon + CemuGui CemuComponents CemuConfig CemuInput CemuUtil ) -if(NOT ANDROID) - target_link_libraries(CemuBin PRIVATE CemuGui) -endif() - if(ENABLE_OPENGL) target_link_libraries(CemuBin PRIVATE OpenGL::GL) endif() diff --git a/src/audio/IAudioAPI.h b/src/audio/IAudioAPI.h index 7688a464..40e42e04 100644 --- a/src/audio/IAudioAPI.h +++ b/src/audio/IAudioAPI.h @@ -8,8 +8,6 @@ class IAudioAPI { - friend class GeneralSettings2; - public: class DeviceDescription { @@ -70,7 +68,7 @@ public: static void PrintLogging(); static void InitializeStatic(); static bool IsAudioAPIAvailable(AudioAPI api); -static void SetAudioDelay(uint32 audioDelay) { s_audioDelay = audioDelay; } + static void SetAudioDelay(uint32 audioDelay) { s_audioDelay = audioDelay; } static std::unique_ptr CreateDeviceFromConfig(AudioType type, sint32 rate, sint32 samples_per_block, sint32 bits_per_sample); static std::unique_ptr CreateDeviceFromConfig(AudioType type, sint32 rate, sint32 channels, sint32 samples_per_block, sint32 bits_per_sample); static std::unique_ptr CreateDevice(AudioAPI api, const DeviceDescriptionPtr& device, sint32 samplerate, sint32 channels, sint32 samples_per_block, sint32 bits_per_sample); diff --git a/src/gui/wxgui/AudioDebuggerWindow.cpp b/src/gui/wxgui/AudioDebuggerWindow.cpp index f0c18cf4..b9bc45fc 100644 --- a/src/gui/wxgui/AudioDebuggerWindow.cpp +++ b/src/gui/wxgui/AudioDebuggerWindow.cpp @@ -1,9 +1,5 @@ #include "wxgui.h" -<<<<<<<< HEAD:src/gui/wxgui/debugger/AudioDebuggerWindow.cpp -#include "debugger/AudioDebuggerWindow.h" -======== #include "AudioDebuggerWindow.h" ->>>>>>>> public/main:src/gui/wxgui/AudioDebuggerWindow.cpp #include "Cafe/OS/libs/snd_core/ax.h" #include "Cafe/OS/libs/snd_core/ax_internal.h" diff --git a/src/gui/wxgui/CemuApp.cpp b/src/gui/wxgui/CemuApp.cpp index a55f5819..78f4b83f 100644 --- a/src/gui/wxgui/CemuApp.cpp +++ b/src/gui/wxgui/CemuApp.cpp @@ -1,28 +1,12 @@ -<<<<<<< HEAD:src/gui/CemuApp.cpp -#include "CemuApp.h" -#include "MainWindow.h" -#include "wxgui.h" -======= #include "wxgui/CemuApp.h" #include "wxCemuConfig.h" #include "wxgui/MainWindow.h" #include "wxgui/wxgui.h" ->>>>>>> public/main:src/gui/wxgui/CemuApp.cpp #include "config/CemuConfig.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h" #include "Cafe/HW/Latte/Core/LatteOverlay.h" #include "config/ActiveSettings.h" #include "config/LaunchSettings.h" -<<<<<<< HEAD:src/gui/CemuApp.cpp -#include "GettingStartedDialog.h" -#include "input/InputManager.h" -#include "helpers/wxHelpers.h" -#include "Cemu/ncrypto/ncrypto.h" -#include "Cemu/GuiSystem/GuiSystem.h" - -#if BOOST_OS_LINUX && HAS_WAYLAND -#include "helpers/wxWayland.h" -======= #include "wxgui/GettingStartedDialog.h" #include "input/InputManager.h" #include "wxgui/helpers/wxHelpers.h" @@ -32,7 +16,6 @@ #if BOOST_OS_LINUX && HAS_WAYLAND #include "wxgui/helpers/wxWayland.h" ->>>>>>> public/main:src/gui/wxgui/CemuApp.cpp #endif #if __WXGTK__ #include @@ -48,12 +31,8 @@ wxIMPLEMENT_APP_NO_MAIN(CemuApp); -<<<<<<< HEAD:src/gui/CemuApp.cpp -// defined in guiWrapper.cpp -======= // defined in wxWindowSystem.cpp extern WindowSystem::WindowInfo g_window_info; ->>>>>>> public/main:src/gui/wxgui/CemuApp.cpp extern std::shared_mutex g_mutex; // forward declarations from main.cpp @@ -278,7 +257,6 @@ std::string TranslationCallback(std::string_view msgId) bool CemuApp::OnInit() { - GuiSystem::registerKeyCodeToStringCallback(rawKeyCodeToString); #if __WXGTK__ GTKSuppressDiagnostics(G_LOG_LEVEL_MASK & ~G_LOG_FLAG_FATAL); #endif @@ -361,7 +339,8 @@ bool CemuApp::OnInit() m_mainFrame = new MainWindow(); - GuiSystem::getWindowInfo().app_active = true; + std::unique_lock lock(g_mutex); + g_window_info.app_active = true; HotkeySettings::Init(m_mainFrame); @@ -422,28 +401,21 @@ void CemuApp::OnAssertFailure(const wxChar* file, int line, const wxChar* func, int CemuApp::FilterEvent(wxEvent& event) { - auto& windowInfo = GuiSystem::getWindowInfo(); if(event.GetEventType() == wxEVT_KEY_DOWN) { const auto& key_event = (wxKeyEvent&)event; - windowInfo.set_keystate(fix_raw_keycode(key_event.GetRawKeyCode(), key_event.GetRawKeyFlags()), true); - auto platformKeyCode = rawKeyCodeToPlatformKeyCode(key_event.GetRawKeyCode()); - if (platformKeyCode.has_value()) - windowInfo.set_keystate(platformKeyCode.value(), true); + g_window_info.set_keystate(fix_raw_keycode(key_event.GetRawKeyCode(), key_event.GetRawKeyFlags()), true); } else if(event.GetEventType() == wxEVT_KEY_UP) { const auto& key_event = (wxKeyEvent&)event; - windowInfo.set_keystate(fix_raw_keycode(key_event.GetRawKeyCode(), key_event.GetRawKeyFlags()), false); - auto platformKeyCode = rawKeyCodeToPlatformKeyCode(key_event.GetRawKeyCode()); - if (platformKeyCode.has_value()) - windowInfo.set_keystate(platformKeyCode.value(), false); + g_window_info.set_keystate(fix_raw_keycode(key_event.GetRawKeyCode(), key_event.GetRawKeyFlags()), false); } else if(event.GetEventType() == wxEVT_ACTIVATE_APP) { const auto& activate_event = (wxActivateEvent&)event; if(!activate_event.GetActive()) - windowInfo.set_keystates_up(); + g_window_info.set_keystatesup(); } return wxApp::FilterEvent(event); @@ -605,29 +577,8 @@ void CemuApp::CreateDefaultCemuFiles() void CemuApp::ActivateApp(wxActivateEvent& event) { - GuiSystem::getWindowInfo().app_active = event.GetActive(); + g_window_info.app_active = event.GetActive(); event.Skip(); } -#if BOOST_OS_WINDOWS -void _wxLaunch() -{ - SetThreadName("MainThread_UI"); - wxEntry(); -} -#endif -void gui_create() -{ - SetThreadName("cemu"); -#if BOOST_OS_WINDOWS - // on Windows wxWidgets there is a bug where wxDirDialog->ShowModal will deadlock in Windows internals somehow - // moving the UI thread off the main thread fixes this - std::thread t = std::thread(_wxLaunch); - t.join(); -#else - int argc = 0; - char* argv[1]{}; - wxEntry(argc, argv); -#endif -} \ No newline at end of file diff --git a/src/gui/wxgui/CemuUpdateWindow.cpp b/src/gui/wxgui/CemuUpdateWindow.cpp index 2871b9cd..c45a0ab8 100644 --- a/src/gui/wxgui/CemuUpdateWindow.cpp +++ b/src/gui/wxgui/CemuUpdateWindow.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/CemuUpdateWindow.cpp -#include "CemuUpdateWindow.h" -======= #include "wxgui/CemuUpdateWindow.h" ->>>>>>> public/main:src/gui/wxgui/CemuUpdateWindow.cpp #include "Common/version.h" #include "util/helpers/helpers.h" diff --git a/src/gui/wxgui/ChecksumTool.cpp b/src/gui/wxgui/ChecksumTool.cpp index 8712ce67..daf59062 100644 --- a/src/gui/wxgui/ChecksumTool.cpp +++ b/src/gui/wxgui/ChecksumTool.cpp @@ -1,12 +1,3 @@ -<<<<<<< HEAD:src/gui/ChecksumTool.cpp -#include "ChecksumTool.h" - -#include "Cafe/TitleList/GameInfo.h" -#include "helpers/wxCustomEvents.h" -#include "util/helpers/helpers.h" -#include "helpers/wxHelpers.h" -#include "wxHelper.h" -======= #include "wxgui/ChecksumTool.h" #include "Cafe/TitleList/GameInfo.h" @@ -14,7 +5,6 @@ #include "util/helpers/helpers.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/wxHelper.h" ->>>>>>> public/main:src/gui/wxgui/ChecksumTool.cpp #include "Cafe/Filesystem/WUD/wud.h" #include diff --git a/src/gui/wxgui/ChecksumTool.h b/src/gui/wxgui/ChecksumTool.h index 9e0fc27a..ae0ea760 100644 --- a/src/gui/wxgui/ChecksumTool.h +++ b/src/gui/wxgui/ChecksumTool.h @@ -1,10 +1,6 @@ #pragma once #include -<<<<<<< HEAD:src/gui/ChecksumTool.h -#include "components/wxTitleManagerList.h" -======= #include "wxgui/components/wxTitleManagerList.h" ->>>>>>> public/main:src/gui/wxgui/ChecksumTool.h #include "Cafe/TitleList/TitleInfo.h" #include diff --git a/src/gui/wxgui/DownloadGraphicPacksWindow.cpp b/src/gui/wxgui/DownloadGraphicPacksWindow.cpp index bd48e898..c5de8d89 100644 --- a/src/gui/wxgui/DownloadGraphicPacksWindow.cpp +++ b/src/gui/wxgui/DownloadGraphicPacksWindow.cpp @@ -1,10 +1,5 @@ -<<<<<<< HEAD:src/gui/DownloadGraphicPacksWindow.cpp -#include "wxgui.h" -#include "DownloadGraphicPacksWindow.h" -======= #include "wxgui/wxgui.h" #include "wxgui/DownloadGraphicPacksWindow.h" ->>>>>>> public/main:src/gui/wxgui/DownloadGraphicPacksWindow.cpp #include #include diff --git a/src/gui/wxgui/GameProfileWindow.cpp b/src/gui/wxgui/GameProfileWindow.cpp index b6f24d5b..7948b1f9 100644 --- a/src/gui/wxgui/GameProfileWindow.cpp +++ b/src/gui/wxgui/GameProfileWindow.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/GameProfileWindow.cpp -#include "GameProfileWindow.h" -======= #include "wxgui/GameProfileWindow.h" ->>>>>>> public/main:src/gui/wxgui/GameProfileWindow.cpp #include #include @@ -12,11 +8,7 @@ #include #include -<<<<<<< HEAD:src/gui/GameProfileWindow.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/GameProfileWindow.cpp #include "input/InputManager.h" #if BOOST_OS_LINUX || BOOST_OS_MACOS diff --git a/src/gui/wxgui/GameUpdateWindow.cpp b/src/gui/wxgui/GameUpdateWindow.cpp index 03e85e12..ef32074e 100644 --- a/src/gui/wxgui/GameUpdateWindow.cpp +++ b/src/gui/wxgui/GameUpdateWindow.cpp @@ -1,24 +1,13 @@ -<<<<<<< HEAD:src/gui/GameUpdateWindow.cpp -#include "wxgui.h" -#include "GameUpdateWindow.h" -======= #include "wxgui/wxgui.h" #include "wxgui/GameUpdateWindow.h" ->>>>>>> public/main:src/gui/wxgui/GameUpdateWindow.cpp #include "util/helpers/helpers.h" #include #include #include "util/helpers/SystemException.h" -<<<<<<< HEAD:src/gui/GameUpdateWindow.cpp -#include "CemuApp.h" -#include "Cafe/TitleList/GameInfo.h" -#include "helpers/wxHelpers.h" -======= #include "wxgui/CemuApp.h" #include "Cafe/TitleList/GameInfo.h" #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/GameUpdateWindow.cpp #include "wxHelper.h" wxString _GetTitleIdTypeStr(TitleId titleId) diff --git a/src/gui/wxgui/GeneralSettings2.cpp b/src/gui/wxgui/GeneralSettings2.cpp index a6f10b51..8b576e4b 100644 --- a/src/gui/wxgui/GeneralSettings2.cpp +++ b/src/gui/wxgui/GeneralSettings2.cpp @@ -1,15 +1,8 @@ -<<<<<<< HEAD:src/gui/GeneralSettings2.cpp -#include "wxgui.h" -#include "GeneralSettings2.h" -#include "CemuApp.h" -#include "helpers/wxControlObject.h" -======= #include "wxCemuConfig.h" #include "wxgui/wxgui.h" #include "wxgui/GeneralSettings2.h" #include "wxgui/CemuApp.h" #include "wxgui/helpers/wxControlObject.h" ->>>>>>> public/main:src/gui/wxgui/GeneralSettings2.cpp #include "util/helpers/helpers.h" @@ -39,11 +32,7 @@ #include #include "util/helpers/SystemException.h" -<<<<<<< HEAD:src/gui/GeneralSettings2.cpp -#include "dialogs/CreateAccount/wxCreateAccountDialog.h" -======= #include "wxgui/dialogs/CreateAccount/wxCreateAccountDialog.h" ->>>>>>> public/main:src/gui/wxgui/GeneralSettings2.cpp #if BOOST_OS_WINDOWS #include @@ -51,11 +40,7 @@ #include "config/LaunchSettings.h" #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/GeneralSettings2.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/GeneralSettings2.cpp #include "resource/embedded/resources.h" @@ -1164,7 +1149,7 @@ void GeneralSettings2::DisableSettings(bool game_launched) void GeneralSettings2::OnAudioLatencyChanged(wxCommandEvent& event) { - IAudioAPI::s_audioDelay = event.GetInt(); + IAudioAPI::SetAudioDelay(event.GetInt()); event.Skip(); } diff --git a/src/gui/wxgui/GettingStartedDialog.cpp b/src/gui/wxgui/GettingStartedDialog.cpp index 92aca5e0..dc9bc811 100644 --- a/src/gui/wxgui/GettingStartedDialog.cpp +++ b/src/gui/wxgui/GettingStartedDialog.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/GettingStartedDialog.cpp -#include "GettingStartedDialog.h" -======= #include "wxgui/GettingStartedDialog.h" ->>>>>>> public/main:src/gui/wxgui/GettingStartedDialog.cpp #include #include @@ -12,18 +8,11 @@ #include #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/GettingStartedDialog.cpp -#include "CemuApp.h" -#include "DownloadGraphicPacksWindow.h" -#include "GraphicPacksWindow2.h" -#include "input/InputSettings2.h" -======= #include "wxCemuConfig.h" #include "wxgui/CemuApp.h" #include "wxgui/DownloadGraphicPacksWindow.h" #include "wxgui/GraphicPacksWindow2.h" #include "wxgui/input/InputSettings2.h" ->>>>>>> public/main:src/gui/wxgui/GettingStartedDialog.cpp #include "config/CemuConfig.h" #include "Cafe/TitleList/TitleList.h" diff --git a/src/gui/wxgui/GraphicPacksWindow2.cpp b/src/gui/wxgui/GraphicPacksWindow2.cpp index 8504d059..1298f72f 100644 --- a/src/gui/wxgui/GraphicPacksWindow2.cpp +++ b/src/gui/wxgui/GraphicPacksWindow2.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD:src/gui/GraphicPacksWindow2.cpp -#include "wxgui.h" -#include "GraphicPacksWindow2.h" -#include "DownloadGraphicPacksWindow.h" -======= #include "wxgui/wxgui.h" #include "wxgui/GraphicPacksWindow2.h" #include "wxgui/DownloadGraphicPacksWindow.h" ->>>>>>> public/main:src/gui/wxgui/GraphicPacksWindow2.cpp #include "Cafe/GraphicPack/GraphicPack2.h" #include "config/CemuConfig.h" #include "config/ActiveSettings.h" diff --git a/src/gui/wxgui/LoggingWindow.cpp b/src/gui/wxgui/LoggingWindow.cpp index 49e3c9cd..3d830f65 100644 --- a/src/gui/wxgui/LoggingWindow.cpp +++ b/src/gui/wxgui/LoggingWindow.cpp @@ -1,29 +1,17 @@ -<<<<<<< HEAD:src/gui/LoggingWindow.cpp -#include "LoggingWindow.h" - -#include "helpers/wxLogEvent.h" -======= #include "wxgui/LoggingWindow.h" #include "Cemu/Logging/CemuLogging.h" #include "wxgui/helpers/wxLogEvent.h" ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp #include #include #include -<<<<<<< HEAD:src/gui/LoggingWindow.cpp -#include "helpers/wxHelpers.h" - -======= ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp wxDEFINE_EVENT(EVT_LOG, wxLogEvent); LoggingWindow::LoggingWindow(wxFrame* parent) : wxFrame(parent, wxID_ANY, _("Logging window"), wxDefaultPosition, wxSize(800, 600), wxDEFAULT_FRAME_STYLE | wxTAB_TRAVERSAL) { - cemuLog_registerLogCallbacks(this); auto* sizer = new wxBoxSizer( wxVERTICAL ); { auto filter_row = new wxBoxSizer( wxHORIZONTAL ); @@ -50,49 +38,33 @@ LoggingWindow::LoggingWindow(wxFrame* parent) this->Layout(); this->Bind(EVT_LOG, &LoggingWindow::OnLogMessage, this); -<<<<<<< HEAD:src/gui/LoggingWindow.cpp -======= cemuLog_setCallbacks(this); ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp } LoggingWindow::~LoggingWindow() { - cemuLog_unregisterLogCallbacks(); this->Unbind(EVT_LOG, &LoggingWindow::OnLogMessage, this); -<<<<<<< HEAD:src/gui/LoggingWindow.cpp -======= cemuLog_clearCallbacks(); ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp } void LoggingWindow::Log(std::string_view filter, std::string_view message) { -<<<<<<< HEAD:src/gui/LoggingWindow.cpp - - wxLogEvent event(std::string {filter}, std::string{ message }); - OnLogMessage(event); -======= wxLogEvent event(std::string {filter}, std::string{ message }); OnLogMessage(event); //const auto log_event = new wxLogEvent(filter, message); //wxQueueEvent(s_instance, log_event); ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp } void LoggingWindow::Log(std::string_view filter, std::wstring_view message) { wxLogEvent event(std::string {filter}, std::wstring{ message }); OnLogMessage(event); -<<<<<<< HEAD:src/gui/LoggingWindow.cpp -======= //const auto log_event = new wxLogEvent(filter, message); //wxQueueEvent(s_instance, log_event); ->>>>>>> public/main:src/gui/wxgui/LoggingWindow.cpp } void LoggingWindow::OnLogMessage(wxLogEvent& event) diff --git a/src/gui/wxgui/MainWindow.cpp b/src/gui/wxgui/MainWindow.cpp index f0a65f8e..a81ce250 100644 --- a/src/gui/wxgui/MainWindow.cpp +++ b/src/gui/wxgui/MainWindow.cpp @@ -1,29 +1,12 @@ -<<<<<<< HEAD:src/gui/MainWindow.cpp -#include "wxgui.h" -#include "MainWindow.h" -======= #include "Cafe/HW/Latte/Renderer/Renderer.h" #include "interface/WindowSystem.h" #include "wxCemuConfig.h" #include "wxgui/wxgui.h" #include "wxgui/MainWindow.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #include #include -<<<<<<< HEAD:src/gui/MainWindow.cpp -#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/nfc/nfc.h" -#include "Cafe/OS/libs/swkbd/swkbd.h" -#include "debugger/DebuggerWindow2.h" -#include "debugger/AudioDebuggerWindow.h" -======= #include "wxgui/GameUpdateWindow.h" #include "wxgui/PadViewFrame.h" #include "wxgui/windows/TextureRelationViewer/TextureRelationWindow.h" @@ -34,57 +17,32 @@ #include "Cafe/OS/libs/nfc/nfc.h" #include "Cafe/OS/libs/swkbd/swkbd.h" #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #include "util/helpers/helpers.h" #include "config/CemuConfig.h" #include "Cemu/DiscordPresence/DiscordPresence.h" #include "util/ScreenSaver/ScreenSaver.h" -<<<<<<< HEAD:src/gui/MainWindow.cpp -#include "GeneralSettings2.h" -#include "GraphicPacksWindow2.h" -#include "GameProfileWindow.h" -#include "CemuApp.h" -#include "CemuUpdateWindow.h" -#include "helpers/wxCustomData.h" -#include "LoggingWindow.h" -======= #include "wxgui/GeneralSettings2.h" #include "wxgui/GraphicPacksWindow2.h" #include "wxgui/CemuApp.h" #include "wxgui/CemuUpdateWindow.h" #include "wxgui/LoggingWindow.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #include "config/ActiveSettings.h" #include "config/LaunchSettings.h" -#include "Cemu/GuiSystem/GuiSystem.h" #include "Cafe/Filesystem/FST/FST.h" -<<<<<<< HEAD:src/gui/MainWindow.cpp -#include "TitleManager.h" -#include "gui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h" -======= #include "wxgui/TitleManager.h" #include "wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #include "Cafe/CafeSystem.h" #include "util/helpers/SystemException.h" -<<<<<<< HEAD:src/gui/MainWindow.cpp -#include "DownloadGraphicPacksWindow.h" -#include "GettingStartedDialog.h" -#include "helpers/wxHelpers.h" -#include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h" -#include "input/InputSettings2.h" -======= #include "wxgui/DownloadGraphicPacksWindow.h" #include "wxgui/GettingStartedDialog.h" #include "wxgui/helpers/wxHelpers.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h" #include "wxgui/input/InputSettings2.h" #include "wxgui/input/HotkeySettings.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #include "input/InputManager.h" #if BOOST_OS_WINDOWS @@ -98,11 +56,7 @@ #endif #if BOOST_OS_LINUX && HAS_WAYLAND -<<<<<<< HEAD:src/gui/MainWindow.cpp -#include "helpers/wxWayland.h" -======= #include "wxgui/helpers/wxWayland.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp #endif //GameMode support @@ -114,12 +68,8 @@ #include "Cafe/TitleList/TitleList.h" #include "wxHelper.h" -<<<<<<< HEAD:src/gui/MainWindow.cpp -MainWindow* g_mainFrame; -======= extern WindowSystem::WindowInfo g_window_info; extern std::shared_mutex g_mutex; ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp enum { @@ -346,18 +296,13 @@ private: MainWindow::MainWindow() : wxFrame(nullptr, wxID_ANY, GetInitialWindowTitle(), wxDefaultPosition, wxSize(1280, 720), wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN | wxRESIZE_BORDER) { -<<<<<<< HEAD:src/gui/MainWindow.cpp - GuiSystem::getWindowInfo().window_main = get_window_handle_info_for_wxWindow(this); -======= #ifdef __WXMAC__ // Not necessary to set wxApp::s_macExitMenuItemId as automatically handled wxApp::s_macAboutMenuItemId = MAINFRAME_MENU_ID_HELP_ABOUT; wxApp::s_macPreferencesMenuItemId = MAINFRAME_MENU_ID_OPTIONS_MAC_SETTINGS; #endif g_window_info.window_main = initHandleContextFromWxWidgetsWindow(this); ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp g_mainFrame = this; - DownloadManager::GetInstance()->setOnGameListRefreshRequested([this](){RequestGameListRefresh();}); CafeSystem::SetImplementation(this); RecreateMenu(); @@ -431,12 +376,10 @@ MainWindow::MainWindow() { g_gdbstub = std::make_unique(GetConfig().gdb_port); } - CafeSystem::registerCafeSystemCallbacks(this); } MainWindow::~MainWindow() { - CafeSystem::unregisterCafeSystemCallbacks(); if (m_padView) { m_padView->Destroy(); @@ -445,93 +388,10 @@ MainWindow::~MainWindow() m_timer->Stop(); + std::unique_lock lock(g_mutex); g_mainFrame = nullptr; } -void MainWindow::updateWindowTitles(bool isIdle, bool isLoading, double fps) -{ - std::string windowText; - windowText = BUILD_VERSION_WITH_NAME_STRING; - - if (isIdle) - { - if (g_mainFrame) - g_mainFrame->AsyncSetTitle(windowText); - return; - } - if (isLoading) - { - windowText.append(" - loading..."); - if (g_mainFrame) - g_mainFrame->AsyncSetTitle(windowText); - return; - } - - const char* renderer = ""; - if(g_renderer) - { - switch(g_renderer->GetType()) - { - case RendererAPI::OpenGL: - renderer = "[OpenGL]"; - break; - case RendererAPI::Vulkan: - renderer = "[Vulkan]"; - break; - default: ; - } - } - - // get GPU vendor/mode - const char* graphicMode = "[Generic]"; - if (LatteGPUState.glVendor == GLVENDOR_AMD) - graphicMode = "[AMD GPU]"; - else if (LatteGPUState.glVendor == GLVENDOR_INTEL) - graphicMode = "[Intel GPU]"; - else if (LatteGPUState.glVendor == GLVENDOR_NVIDIA) - graphicMode = "[NVIDIA GPU]"; - else if (LatteGPUState.glVendor == GLVENDOR_APPLE) - graphicMode = "[Apple GPU]"; - - const uint64 titleId = CafeSystem::GetForegroundTitleId(); - windowText.append(fmt::format(" - FPS: {:.2f} {} {} [TitleId: {:08x}-{:08x}]", (double)fps, renderer, graphicMode, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF))); - - if (ActiveSettings::IsOnlineEnabled()) - { - if (ActiveSettings::GetNetworkService() == NetworkService::Nintendo) - windowText.append(" [Online]"); - else if (ActiveSettings::GetNetworkService() == NetworkService::Pretendo) - windowText.append(" [Online-Pretendo]"); - else if (ActiveSettings::GetNetworkService() == NetworkService::Custom) - windowText.append(" [Online-" + GetNetworkConfig().networkname.GetValue() + "]"); - } - windowText.append(" "); - windowText.append(CafeSystem::GetForegroundTitleName()); - // append region - CafeConsoleRegion region = CafeSystem::GetForegroundTitleRegion(); - uint16 titleVersion = CafeSystem::GetForegroundTitleVersion(); - if (region == CafeConsoleRegion::JPN) - windowText.append(fmt::format(" [JP v{}]", titleVersion)); - else if (region == CafeConsoleRegion::USA) - windowText.append(fmt::format(" [US v{}]", titleVersion)); - else if (region == CafeConsoleRegion::EUR) - windowText.append(fmt::format(" [EU v{}]", titleVersion)); - else - windowText.append(fmt::format(" [v{}]", titleVersion)); - - AsyncSetTitle(windowText); - auto* pad = GetPadView(); - if (pad) - pad->AsyncSetTitle(fmt::format("GamePad View - FPS: {:.02f}", fps)); -} - -void MainWindow::notifyGameLoaded() -{ - OnGameLoaded(); - UpdateSettingsAfterGameLaunch(); -} - - void MainWindow::CreateGameListAndStatusBar() { if(m_main_panel) @@ -578,11 +438,7 @@ void MainWindow::OnClose(wxCloseEvent& event) if(m_game_list) m_game_list->OnClose(event); -<<<<<<< HEAD:src/gui/MainWindow.cpp - if (!IsMaximized() && !IsFullScreen()) -======= if (!IsMaximized() && !WindowSystem::IsFullScreen()) ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp m_restored_size = GetSize(); SaveSettings(); @@ -1450,19 +1306,19 @@ void MainWindow::LoadSettings() if (config.window_maximized) this->Maximize(); } - auto& windowInfo = GuiSystem::getWindowInfo(); + if (config.pad_position != Vector2i{ -1,-1 }) { - windowInfo.restored_pad_x = config.pad_position.x; - windowInfo.restored_pad_y = config.pad_position.y; + g_window_info.restored_pad_x = config.pad_position.x; + g_window_info.restored_pad_y = config.pad_position.y; } if (config.pad_size != Vector2i{ -1,-1 }) { - windowInfo.restored_pad_width = config.pad_size.x; - windowInfo.restored_pad_height = config.pad_size.y; + g_window_info.restored_pad_width = config.pad_size.x; + g_window_info.restored_pad_height = config.pad_size.y; - windowInfo.pad_maximized = config.pad_maximized; + g_window_info.pad_maximized = config.pad_maximized; } this->TogglePadView(); @@ -1473,14 +1329,8 @@ void MainWindow::LoadSettings() void MainWindow::SaveSettings() { -<<<<<<< HEAD:src/gui/MainWindow.cpp - auto lock = g_config.Lock(); - auto& config = GetConfig(); - auto& windowInfo = GuiSystem::getWindowInfo(); -======= auto lock = GetConfigHandle().Lock(); auto& config = GetWxGUIConfig(); ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp if (config.window_position != Vector2i{ -1,-1 }) { @@ -1500,16 +1350,16 @@ void MainWindow::SaveSettings() config.pad_open = m_padView != nullptr; - if (config.pad_position != Vector2i{ -1,-1 } && windowInfo.restored_pad_x != -1) + if (config.pad_position != Vector2i{ -1,-1 } && g_window_info.restored_pad_x != -1) { - config.pad_position.x = windowInfo.restored_pad_x; - config.pad_position.y = windowInfo.restored_pad_y; + config.pad_position.x = g_window_info.restored_pad_x; + config.pad_position.y = g_window_info.restored_pad_y; } - if (config.pad_size != Vector2i{ -1,-1 } && windowInfo.restored_pad_width != -1) + if (config.pad_size != Vector2i{ -1,-1 } && g_window_info.restored_pad_width != -1) { - config.pad_size.x = windowInfo.restored_pad_width; - config.pad_size.y = windowInfo.restored_pad_height; - config.pad_maximized = windowInfo.pad_maximized; + config.pad_size.x = g_window_info.restored_pad_width; + config.pad_size.y = g_window_info.restored_pad_height; + config.pad_maximized = g_window_info.pad_maximized; } else { @@ -1599,102 +1449,6 @@ void MainWindow::OnSetWindowTitle(wxCommandEvent& event) this->SetTitle(event.GetString()); } -static std::optional GenerateScreenshotFilename(bool isDRC) -{ - fs::path screendir = ActiveSettings::GetUserDataPath("screenshots"); - // build screenshot name with format Screenshot_YYYY-MM-DD_HH-MM-SS[_GamePad].png - // if the file already exists add a suffix counter (_2.png, _3.png etc) - std::time_t time_t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); - std::tm* tm = std::localtime(&time_t); - - std::string screenshotFileName = fmt::format("Screenshot_{:04}-{:02}-{:02}_{:02}-{:02}-{:02}", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); - if (isDRC) - screenshotFileName.append("_GamePad"); - - fs::path screenshotPath; - for(sint32 i=0; i<999; i++) - { - screenshotPath = screendir; - if (i == 0) - screenshotPath.append(fmt::format("{}.png", screenshotFileName)); - else - screenshotPath.append(fmt::format("{}_{}.png", screenshotFileName, i + 1)); - - std::error_code ec; - bool exists = fs::exists(screenshotPath, ec); - - if (!ec && !exists) - return screenshotPath; - } - return std::nullopt; -} - -bool SaveScreenshotToFile(const fs::path& imagePath, const wxImage& image) -{ - - std::error_code ec; - fs::create_directories(imagePath.parent_path(), ec); - if (ec) return false; - - // suspend wxWidgets logging for the lifetime this object, to prevent a message box if wxImage::SaveFile fails - wxLogNull _logNo; - return image.SaveFile(imagePath.wstring()); -} - -bool SaveScreenshotToClipboard(const wxImage& image) -{ - static std::mutex s_clipboardMutex; - bool success = false; - - s_clipboardMutex.lock(); - if (wxTheClipboard->Open()) - { - wxTheClipboard->SetData(new wxImageDataObject(image)); - wxTheClipboard->Close(); - success = true; - } - s_clipboardMutex.unlock(); - - return success; -} - -std::optional SaveScreenshot(std::vector data, int width, int height, bool mainWindow) -{ -#if BOOST_OS_WINDOWS - // on Windows wxWidgets uses OLE API for the clipboard - // to make this work we need to call OleInitialize() on the same thread - OleInitialize(nullptr); -#endif - bool save_screenshot = g_config.data().save_screenshot; - wxImage image(width, height, data.data(), true); - if (mainWindow) - { - if(SaveScreenshotToClipboard(image)) - { - if (!save_screenshot) - return "Screenshot saved to clipboard"; - } - else - { - return "Failed to open clipboard"; - } - } - if (save_screenshot) - { - auto imagePath = GenerateScreenshotFilename(mainWindow); - if (imagePath.has_value() && SaveScreenshotToFile(imagePath.value(), image)) - { - if (mainWindow) - return "Screenshot saved"; - } - else - { - return "Failed to save screenshot to file"; - } - } - return std::nullopt; -} - void MainWindow::OnKeyUp(wxKeyEvent& event) { event.Skip(); @@ -1702,17 +1456,7 @@ void MainWindow::OnKeyUp(wxKeyEvent& event) if (swkbd::hasKeyboardInputHook()) return; -<<<<<<< HEAD:src/gui/MainWindow.cpp - 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_renderer) - g_renderer->RequestScreenshot(SaveScreenshot); // async screenshot request -======= HotkeySettings::CaptureInput(event); ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp } void MainWindow::OnKeyDown(wxKeyEvent& event) @@ -1897,20 +1641,15 @@ void MainWindow::DestroyCanvas() void MainWindow::OnSizeEvent(wxSizeEvent& event) { -<<<<<<< HEAD:src/gui/MainWindow.cpp - if (!IsMaximized() && !IsFullScreen()) -======= if (!IsMaximized() && !WindowSystem::IsFullScreen()) ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp m_restored_size = GetSize(); - auto& windowInfo = GuiSystem::getWindowInfo(); const wxSize client_size = GetClientSize(); - windowInfo.width = client_size.GetWidth(); - windowInfo.height = client_size.GetHeight(); - windowInfo.phys_width = ToPhys(client_size.GetWidth()); - windowInfo.phys_height = ToPhys(client_size.GetHeight()); - windowInfo.dpi_scale = GetDPIScaleFactor(); + g_window_info.width = client_size.GetWidth(); + g_window_info.height = client_size.GetHeight(); + g_window_info.phys_width = ToPhys(client_size.GetWidth()); + g_window_info.phys_height = ToPhys(client_size.GetHeight()); + g_window_info.dpi_scale = GetDPIScaleFactor(); if (m_debugger_window && m_debugger_window->IsShown()) m_debugger_window->OnParentMove(GetPosition(), event.GetSize()); @@ -1923,22 +1662,17 @@ void MainWindow::OnSizeEvent(wxSizeEvent& event) void MainWindow::OnDPIChangedEvent(wxDPIChangedEvent& event) { event.Skip(); - auto& windowInfo = GuiSystem::getWindowInfo(); const wxSize client_size = GetClientSize(); - windowInfo.width = client_size.GetWidth(); - windowInfo.height = client_size.GetHeight(); - windowInfo.phys_width = ToPhys(client_size.GetWidth()); - windowInfo.phys_height = ToPhys(client_size.GetHeight()); - windowInfo.dpi_scale = GetDPIScaleFactor(); + g_window_info.width = client_size.GetWidth(); + g_window_info.height = client_size.GetHeight(); + g_window_info.phys_width = ToPhys(client_size.GetWidth()); + g_window_info.phys_height = ToPhys(client_size.GetHeight()); + g_window_info.dpi_scale = GetDPIScaleFactor(); } void MainWindow::OnMove(wxMoveEvent& event) { -<<<<<<< HEAD:src/gui/MainWindow.cpp - if (!IsMaximized() && !IsFullScreen()) -======= if (!IsMaximized() && !WindowSystem::IsFullScreen()) ->>>>>>> public/main:src/gui/wxgui/MainWindow.cpp m_restored_position = GetPosition(); if (m_debugger_window && m_debugger_window->IsShown()) @@ -1998,7 +1732,7 @@ void MainWindow::SetFullScreen(bool state) } if (state && !m_game_launched) return; - GuiSystem::getWindowInfo().is_fullscreen = state; + g_window_info.is_fullscreen = state; m_fullscreenMenuItem->Check(state); this->ShowFullScreen(state); diff --git a/src/gui/wxgui/MainWindow.h b/src/gui/wxgui/MainWindow.h index e6c4817d..2f251ca8 100644 --- a/src/gui/wxgui/MainWindow.h +++ b/src/gui/wxgui/MainWindow.h @@ -5,15 +5,6 @@ #include #include "wxcomponents/checkedlistctrl.h" -<<<<<<< HEAD:src/gui/MainWindow.h -#include "PadViewFrame.h" -#include "MemorySearcherTool.h" - -#include "config/XMLConfig.h" - -#include "LoggingWindow.h" -#include "components/wxGameList.h" -======= #include "wxgui/PadViewFrame.h" #include "wxgui/MemorySearcherTool.h" @@ -21,7 +12,6 @@ #include "wxgui/LoggingWindow.h" #include "wxgui/components/wxGameList.h" ->>>>>>> public/main:src/gui/wxgui/MainWindow.h #include #include "Cafe/HW/Espresso/Debugger/GDBStub.h" @@ -63,7 +53,7 @@ private: INITIATED_BY m_initiatedBy; }; -class MainWindow : public wxFrame, public CafeSystem::CafeSystemCallbacks, public CafeSystem::SystemImplementation +class MainWindow : public wxFrame, public CafeSystem::SystemImplementation { friend class CemuApp; @@ -74,10 +64,6 @@ public: void CreateGameListAndStatusBar(); void DestroyGameListAndStatusBar(); - - virtual void updateWindowTitles(bool isIdle, bool isLoading, double fps) override; - virtual void notifyGameLoaded() override; - void UpdateSettingsAfterGameLaunch(); void RestoreSettingsAfterGameExited(); diff --git a/src/gui/wxgui/MemorySearcherTool.cpp b/src/gui/wxgui/MemorySearcherTool.cpp index 8d6c6e87..8faf87d9 100644 --- a/src/gui/wxgui/MemorySearcherTool.cpp +++ b/src/gui/wxgui/MemorySearcherTool.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD:src/gui/MemorySearcherTool.cpp -#include "wxgui.h" - -#include "MemorySearcherTool.h" -======= #include "wxgui/wxgui.h" #include "wxgui/MemorySearcherTool.h" ->>>>>>> public/main:src/gui/wxgui/MemorySearcherTool.cpp #include #include @@ -14,11 +8,7 @@ #include #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/MemorySearcherTool.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/MemorySearcherTool.cpp #include "Common/FileStream.h" #include "util/IniParser/IniParser.h" #include "util/helpers/StringHelpers.h" diff --git a/src/gui/wxgui/MemorySearcherTool.h b/src/gui/wxgui/MemorySearcherTool.h index 15fb0d2e..6ee36fbb 100644 --- a/src/gui/wxgui/MemorySearcherTool.h +++ b/src/gui/wxgui/MemorySearcherTool.h @@ -6,11 +6,7 @@ #include "Cafe/HW/MMU/MMU.h" #include "util/helpers/helpers.h" -<<<<<<< HEAD:src/gui/MemorySearcherTool.h -#include "helpers/wxCustomEvents.h" -======= #include "wxgui/helpers/wxCustomEvents.h" ->>>>>>> public/main:src/gui/wxgui/MemorySearcherTool.h enum SearchDataType { diff --git a/src/gui/wxgui/PadViewFrame.cpp b/src/gui/wxgui/PadViewFrame.cpp index a763b18a..7640342b 100644 --- a/src/gui/wxgui/PadViewFrame.cpp +++ b/src/gui/wxgui/PadViewFrame.cpp @@ -1,67 +1,45 @@ -<<<<<<< HEAD:src/gui/PadViewFrame.cpp -#include "wxgui.h" -#include "PadViewFrame.h" -======= #include "interface/WindowSystem.h" #include "wxgui/wxgui.h" #include "wxgui/PadViewFrame.h" ->>>>>>> public/main:src/gui/wxgui/PadViewFrame.cpp #include #include "config/ActiveSettings.h" #include "Cafe/OS/libs/swkbd/swkbd.h" -<<<<<<< HEAD:src/gui/PadViewFrame.cpp -#include "canvas/OpenGLCanvas.h" -#include "canvas/VulkanCanvas.h" -#include "config/CemuConfig.h" -#include "MainWindow.h" -#include "helpers/wxHelpers.h" -======= #include "wxgui/canvas/OpenGLCanvas.h" #include "wxgui/canvas/VulkanCanvas.h" #include "config/CemuConfig.h" #include "wxgui/MainWindow.h" #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/PadViewFrame.cpp #include "input/InputManager.h" -#include "Cemu/GuiSystem/GuiSystem.h" #if BOOST_OS_LINUX || BOOST_OS_MACOS #include "resource/embedded/resources.h" #endif #include "wxHelper.h" -<<<<<<< HEAD:src/gui/PadViewFrame.cpp -======= extern WindowSystem::WindowInfo g_window_info; ->>>>>>> public/main:src/gui/wxgui/PadViewFrame.cpp #define PAD_MIN_WIDTH 320 #define PAD_MIN_HEIGHT 180 PadViewFrame::PadViewFrame(wxFrame* parent) : wxFrame(nullptr, wxID_ANY, _("GamePad View"), wxDefaultPosition, wxDefaultSize, wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER | wxCLOSE_BOX | wxWANTS_CHARS) { -<<<<<<< HEAD:src/gui/PadViewFrame.cpp - auto& windowInfo = GuiSystem::getWindowInfo(); - windowInfo.window_pad = get_window_handle_info_for_wxWindow(this); -======= g_window_info.window_pad = initHandleContextFromWxWidgetsWindow(this); ->>>>>>> public/main:src/gui/wxgui/PadViewFrame.cpp SetIcon(wxICON(M_WND_ICON128)); wxWindow::EnableTouchEvents(wxTOUCH_PAN_GESTURES); SetMinClientSize({ PAD_MIN_WIDTH, PAD_MIN_HEIGHT }); - SetPosition({ windowInfo.restored_pad_x, windowInfo.restored_pad_y }); - if (windowInfo.restored_pad_width >= PAD_MIN_WIDTH && windowInfo.restored_pad_height >= PAD_MIN_HEIGHT) - SetClientSize({ windowInfo.restored_pad_width, windowInfo.restored_pad_height }); + SetPosition({ g_window_info.restored_pad_x, g_window_info.restored_pad_y }); + if (g_window_info.restored_pad_width >= PAD_MIN_WIDTH && g_window_info.restored_pad_height >= PAD_MIN_HEIGHT) + SetClientSize({ g_window_info.restored_pad_width, g_window_info.restored_pad_height }); else SetClientSize(wxSize(854, 480)); - if (windowInfo.pad_maximized) + if (g_window_info.pad_maximized) Maximize(); Bind(wxEVT_SIZE, &PadViewFrame::OnSizeEvent, this); @@ -71,22 +49,21 @@ PadViewFrame::PadViewFrame(wxFrame* parent) Bind(wxEVT_SET_WINDOW_TITLE, &PadViewFrame::OnSetWindowTitle, this); - windowInfo.pad_open = true; + g_window_info.pad_open = true; } PadViewFrame::~PadViewFrame() { - GuiSystem::getWindowInfo().pad_open = false; + g_window_info.pad_open = false; } bool PadViewFrame::Initialize() { - auto& windowInfo = GuiSystem::getWindowInfo(); const wxSize client_size = GetClientSize(); - windowInfo.pad_width = client_size.GetWidth(); - windowInfo.pad_height = client_size.GetHeight(); - windowInfo.phys_pad_width = ToPhys(client_size.GetWidth()); - windowInfo.phys_pad_height = ToPhys(client_size.GetHeight()); + g_window_info.pad_width = client_size.GetWidth(); + g_window_info.pad_height = client_size.GetHeight(); + g_window_info.phys_pad_width = ToPhys(client_size.GetWidth()); + g_window_info.phys_pad_height = ToPhys(client_size.GetHeight()); return true; } @@ -129,20 +106,19 @@ void PadViewFrame::DestroyCanvas() void PadViewFrame::OnSizeEvent(wxSizeEvent& event) { - auto& windowInfo = GuiSystem::getWindowInfo(); if (!IsMaximized() && !IsFullScreen()) { - windowInfo.restored_pad_width = GetSize().x; - windowInfo.restored_pad_height = GetSize().y; + g_window_info.restored_pad_width = GetSize().x; + g_window_info.restored_pad_height = GetSize().y; } - windowInfo.pad_maximized = IsMaximized() && !IsFullScreen(); + g_window_info.pad_maximized = IsMaximized() && !IsFullScreen(); const wxSize client_size = GetClientSize(); - windowInfo.pad_width = client_size.GetWidth(); - windowInfo.pad_height = client_size.GetHeight(); - windowInfo.phys_pad_width = ToPhys(client_size.GetWidth()); - windowInfo.phys_pad_height = ToPhys(client_size.GetHeight()); - windowInfo.pad_dpi_scale = GetDPIScaleFactor(); + g_window_info.pad_width = client_size.GetWidth(); + g_window_info.pad_height = client_size.GetHeight(); + g_window_info.phys_pad_width = ToPhys(client_size.GetWidth()); + g_window_info.phys_pad_height = ToPhys(client_size.GetHeight()); + g_window_info.pad_dpi_scale = GetDPIScaleFactor(); event.Skip(); } @@ -150,22 +126,20 @@ void PadViewFrame::OnSizeEvent(wxSizeEvent& event) void PadViewFrame::OnDPIChangedEvent(wxDPIChangedEvent& event) { event.Skip(); - auto& windowInfo = GuiSystem::getWindowInfo(); const wxSize client_size = GetClientSize(); - windowInfo.pad_width = client_size.GetWidth(); - windowInfo.pad_height = client_size.GetHeight(); - windowInfo.phys_pad_width = ToPhys(client_size.GetWidth()); - windowInfo.phys_pad_height = ToPhys(client_size.GetHeight()); - windowInfo.pad_dpi_scale = GetDPIScaleFactor(); + g_window_info.pad_width = client_size.GetWidth(); + g_window_info.pad_height = client_size.GetHeight(); + g_window_info.phys_pad_width = ToPhys(client_size.GetWidth()); + g_window_info.phys_pad_height = ToPhys(client_size.GetHeight()); + g_window_info.pad_dpi_scale = GetDPIScaleFactor(); } void PadViewFrame::OnMoveEvent(wxMoveEvent& event) { if (!IsMaximized() && !IsFullScreen()) { - auto& windowInfo = GuiSystem::getWindowInfo(); - windowInfo.restored_pad_x = GetPosition().x; - windowInfo.restored_pad_y = GetPosition().y; + g_window_info.restored_pad_x = GetPosition().x; + g_window_info.restored_pad_y = GetPosition().y; } } diff --git a/src/gui/wxgui/TitleManager.cpp b/src/gui/wxgui/TitleManager.cpp index d021d938..e94bb5bf 100644 --- a/src/gui/wxgui/TitleManager.cpp +++ b/src/gui/wxgui/TitleManager.cpp @@ -1,17 +1,3 @@ -<<<<<<< HEAD:src/gui/TitleManager.cpp -#include "TitleManager.h" - -#include "helpers/wxCustomEvents.h" -#include "helpers/wxCustomData.h" -#include "Cafe/TitleList/GameInfo.h" -#include "util/helpers/helpers.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 "wxgui/TitleManager.h" #include "wxgui/helpers/wxCustomEvents.h" @@ -24,7 +10,6 @@ #include "wxgui/components/wxDownloadManagerList.h" #include "wxgui/GameUpdateWindow.h" #include "wxgui/dialogs/SaveImport/SaveTransfer.h" ->>>>>>> public/main:src/gui/wxgui/TitleManager.cpp #include #include @@ -48,19 +33,10 @@ #include "Cafe/IOSU/legacy/iosu_crypto.h" #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/TitleManager.cpp -#include "dialogs/SaveImport/SaveImportWindow.h" -#include "Cafe/Account/Account.h" -#include "Cemu/Tools/DownloadManager/DownloadManager.h" -#include "CemuApp.h" - -#include "gui/CemuApp.h" -======= #include "wxgui/dialogs/SaveImport/SaveImportWindow.h" #include "Cafe/Account/Account.h" #include "Cemu/Tools/DownloadManager/DownloadManager.h" #include "wxgui/CemuApp.h" ->>>>>>> public/main:src/gui/wxgui/TitleManager.cpp #include "Cafe/TitleList/TitleList.h" #include "Cafe/TitleList/SaveList.h" #include "resource/embedded/resources.h" diff --git a/src/gui/wxgui/canvas/OpenGLCanvas.cpp b/src/gui/wxgui/canvas/OpenGLCanvas.cpp index fe03474b..4e48e26c 100644 --- a/src/gui/wxgui/canvas/OpenGLCanvas.cpp +++ b/src/gui/wxgui/canvas/OpenGLCanvas.cpp @@ -1,15 +1,11 @@ -<<<<<<< HEAD:src/gui/canvas/OpenGLCanvas.cpp -#include "canvas/OpenGLCanvas.h" -======= #include "wxgui/canvas/OpenGLCanvas.h" #include "wxgui/canvas/IRenderCanvas.h" ->>>>>>> public/main:src/gui/wxgui/canvas/OpenGLCanvas.cpp #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) @@ -87,7 +83,7 @@ class GLCanvasManager : public OpenGLCanvasCallbacks OpenGLCanvas* m_padView = nullptr; } s_glCanvasManager; -class OpenGLCanvas : public IRenderCanvas, public wxGLCanvas, public OpenGLRenderer::OpenGLCallbacks +class OpenGLCanvas : public IRenderCanvas, public wxGLCanvas { public: OpenGLCanvas(wxWindow* parent, const wxSize& size, bool is_main_window) @@ -95,16 +91,10 @@ public: { if (m_is_main_window) { -<<<<<<< HEAD:src/gui/canvas/OpenGLCanvas.cpp - sGLTVView = this; - sGLContext = new wxGLContext(this); -======= s_glCanvasManager.SetTVView(this); s_glCanvasManager.SetGLContext(new wxGLContext(this)); ->>>>>>> public/main:src/gui/wxgui/canvas/OpenGLCanvas.cpp g_renderer = std::make_unique(); - OpenGLRenderer::GetInstance()->RegisterOpenGLCallbacks(this); } else { @@ -126,10 +116,6 @@ public: s_glCanvasManager.DeleteGLContext(); } - bool GLCanvas_HasPadViewOpen() override; - bool GLCanvas_MakeCurrent(bool padView) override; - void GLCanvas_SwapBuffers(bool swapTV, bool swapDRC) override; - void UpdateVSyncState() { int configValue = GetConfig().vsync.GetValue(); @@ -163,11 +149,7 @@ wxWindow* GLCanvas_Create(wxWindow* parent, const wxSize& size, bool is_main_win return new OpenGLCanvas(parent, size, is_main_window); } -<<<<<<< HEAD:src/gui/canvas/OpenGLCanvas.cpp -bool OpenGLCanvas::GLCanvas_HasPadViewOpen() -======= void GLCanvasManager::SwapBuffers(bool swapTV, bool swapDRC) ->>>>>>> public/main:src/gui/wxgui/canvas/OpenGLCanvas.cpp { if (swapTV && m_tvView) { @@ -186,37 +168,11 @@ void GLCanvasManager::SwapBuffers(bool swapTV, bool swapDRC) MakeCurrent(false); } -<<<<<<< HEAD:src/gui/canvas/OpenGLCanvas.cpp -bool OpenGLCanvas::GLCanvas_MakeCurrent(bool padView) -======= bool GLCanvasManager::MakeCurrent(bool padView) ->>>>>>> public/main:src/gui/wxgui/canvas/OpenGLCanvas.cpp { OpenGLCanvas* canvas = padView ? m_padView : m_tvView; if (!canvas) return false; m_glContext->SetCurrent(*canvas); return true; -<<<<<<< HEAD:src/gui/canvas/OpenGLCanvas.cpp -} - -void OpenGLCanvas::GLCanvas_SwapBuffers(bool swapTV, bool swapDRC) -{ - if (swapTV && sGLTVView) - { - GLCanvas_MakeCurrent(false); - sGLTVView->SwapBuffers(); - sGLTVView->UpdateVSyncState(); - } - if (swapDRC && sGLPadView) - { - GLCanvas_MakeCurrent(true); - sGLPadView->SwapBuffers(); - sGLPadView->UpdateVSyncState(); - } - - GLCanvas_MakeCurrent(false); -} -======= -} ->>>>>>> public/main:src/gui/wxgui/canvas/OpenGLCanvas.cpp +} \ No newline at end of file diff --git a/src/gui/wxgui/canvas/VulkanCanvas.cpp b/src/gui/wxgui/canvas/VulkanCanvas.cpp index f022a19b..79d4de3b 100644 --- a/src/gui/wxgui/canvas/VulkanCanvas.cpp +++ b/src/gui/wxgui/canvas/VulkanCanvas.cpp @@ -1,18 +1,8 @@ -<<<<<<< HEAD:src/gui/canvas/VulkanCanvas.cpp -#include "canvas/VulkanCanvas.h" -#include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" -#include "Cemu/GuiSystem/GuiSystem.h" -#include "helpers/wxHelpers.h" - -#if BOOST_OS_LINUX && HAS_WAYLAND -#include "helpers/wxWayland.h" -======= #include "wxgui/canvas/VulkanCanvas.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" #if BOOST_OS_LINUX && HAS_WAYLAND #include "wxgui/helpers/wxWayland.h" ->>>>>>> public/main:src/gui/wxgui/canvas/VulkanCanvas.cpp #endif #include @@ -24,17 +14,10 @@ VulkanCanvas::VulkanCanvas(wxWindow* parent, const wxSize& size, bool is_main_wi Bind(wxEVT_PAINT, &VulkanCanvas::OnPaint, this); Bind(wxEVT_SIZE, &VulkanCanvas::OnResize, this); -<<<<<<< HEAD:src/gui/canvas/VulkanCanvas.cpp - auto& canvas = is_main_window ? GuiSystem::getWindowInfo().canvas_main : GuiSystem::getWindowInfo().canvas_pad; - canvas = get_window_handle_info_for_wxWindow(this); - #if BOOST_OS_LINUX && HAS_WAYLAND - if (canvas.backend == GuiSystem::WindowHandleInfo::Backend::Wayland) -======= auto& canvas = is_main_window ? WindowSystem::GetWindowInfo().canvas_main : WindowSystem::GetWindowInfo().canvas_pad; canvas = initHandleContextFromWxWidgetsWindow(this); #if BOOST_OS_LINUX && HAS_WAYLAND if (canvas.backend == WindowSystem::WindowHandleInfo::Backend::Wayland) ->>>>>>> public/main:src/gui/wxgui/canvas/VulkanCanvas.cpp { m_subsurface = std::make_unique(this); canvas.surface = m_subsurface->getSurface(); diff --git a/src/gui/wxgui/canvas/VulkanCanvas.h b/src/gui/wxgui/canvas/VulkanCanvas.h index 3229e874..3db31520 100644 --- a/src/gui/wxgui/canvas/VulkanCanvas.h +++ b/src/gui/wxgui/canvas/VulkanCanvas.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/canvas/VulkanCanvas.h -#include "canvas/IRenderCanvas.h" -======= #include "wxgui/canvas/IRenderCanvas.h" ->>>>>>> public/main:src/gui/wxgui/canvas/VulkanCanvas.h #include diff --git a/src/gui/wxgui/components/TextList.cpp b/src/gui/wxgui/components/TextList.cpp index 6dac768c..b7ff59e5 100644 --- a/src/gui/wxgui/components/TextList.cpp +++ b/src/gui/wxgui/components/TextList.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/components/TextList.cpp -#include "wxgui.h" -======= #include "wxgui/wxgui.h" ->>>>>>> public/main:src/gui/wxgui/components/TextList.cpp #include "TextList.h" #include #include diff --git a/src/gui/wxgui/components/wxDownloadManagerList.cpp b/src/gui/wxgui/components/wxDownloadManagerList.cpp index ee195e16..cfc3c52d 100644 --- a/src/gui/wxgui/components/wxDownloadManagerList.cpp +++ b/src/gui/wxgui/components/wxDownloadManagerList.cpp @@ -1,12 +1,3 @@ -<<<<<<< HEAD:src/gui/components/wxDownloadManagerList.cpp -#include "components/wxDownloadManagerList.h" - -#include "helpers/wxHelpers.h" -#include "util/helpers/SystemException.h" -#include "Cafe/TitleList/GameInfo.h" -#include "components/wxGameList.h" -#include "helpers/wxCustomEvents.h" -======= #include "wxgui/components/wxDownloadManagerList.h" #include "wxgui/helpers/wxHelpers.h" @@ -14,7 +5,6 @@ #include "Cafe/TitleList/GameInfo.h" #include "wxgui/components/wxGameList.h" #include "wxgui/helpers/wxCustomEvents.h" ->>>>>>> public/main:src/gui/wxgui/components/wxDownloadManagerList.cpp #include #include @@ -28,17 +18,10 @@ #include #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/components/wxDownloadManagerList.cpp -#include "ChecksumTool.h" -#include "Cemu/Tools/DownloadManager/DownloadManager.h" -#include "Cafe/TitleList/TitleId.h" -#include "MainWindow.h" -======= #include "wxgui/ChecksumTool.h" #include "Cemu/Tools/DownloadManager/DownloadManager.h" #include "Cafe/TitleList/TitleId.h" #include "wxgui/MainWindow.h" ->>>>>>> public/main:src/gui/wxgui/components/wxDownloadManagerList.cpp wxDEFINE_EVENT(wxEVT_REMOVE_ENTRY, wxCommandEvent); diff --git a/src/gui/wxgui/components/wxDownloadManagerList.h b/src/gui/wxgui/components/wxDownloadManagerList.h index 34b1c88f..e3988e13 100644 --- a/src/gui/wxgui/components/wxDownloadManagerList.h +++ b/src/gui/wxgui/components/wxDownloadManagerList.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/components/wxDownloadManagerList.h -#include "helpers/wxCustomData.h" -======= #include "wxgui/helpers/wxCustomData.h" ->>>>>>> public/main:src/gui/wxgui/components/wxDownloadManagerList.h #include "config/CemuConfig.h" #include diff --git a/src/gui/wxgui/components/wxGameList.cpp b/src/gui/wxgui/components/wxGameList.cpp index ff134d40..bb6e9653 100644 --- a/src/gui/wxgui/components/wxGameList.cpp +++ b/src/gui/wxgui/components/wxGameList.cpp @@ -1,17 +1,9 @@ -<<<<<<< HEAD:src/gui/components/wxGameList.cpp -#include "components/wxGameList.h" - -#include "helpers/wxCustomData.h" -#include "util/helpers/helpers.h" -#include "GameProfileWindow.h" -======= #include "wxgui/components/wxGameList.h" #include "wxgui/helpers/wxCustomData.h" #include "wxCemuConfig.h" #include "util/helpers/helpers.h" #include "wxgui/GameProfileWindow.h" ->>>>>>> public/main:src/gui/wxgui/components/wxGameList.cpp #include @@ -37,15 +29,9 @@ #include "Cafe/TitleList/GameInfo.h" #include "Cafe/TitleList/TitleList.h" -<<<<<<< HEAD:src/gui/components/wxGameList.cpp -#include "CemuApp.h" -#include "helpers/wxHelpers.h" -#include "MainWindow.h" -======= #include "wxgui/CemuApp.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/MainWindow.h" ->>>>>>> public/main:src/gui/wxgui/components/wxGameList.cpp #include "../wxHelper.h" diff --git a/src/gui/wxgui/components/wxInputDraw.cpp b/src/gui/wxgui/components/wxInputDraw.cpp index 3a478494..a979a1c5 100644 --- a/src/gui/wxgui/components/wxInputDraw.cpp +++ b/src/gui/wxgui/components/wxInputDraw.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/components/wxInputDraw.cpp -#include "components/wxInputDraw.h" -======= #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/components/wxInputDraw.cpp #include diff --git a/src/gui/wxgui/components/wxLogCtrl.cpp b/src/gui/wxgui/components/wxLogCtrl.cpp index 773df798..0ab38193 100644 --- a/src/gui/wxgui/components/wxLogCtrl.cpp +++ b/src/gui/wxgui/components/wxLogCtrl.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/components/wxLogCtrl.cpp -#include "components/wxLogCtrl.h" -======= #include "wxgui/components/wxLogCtrl.h" ->>>>>>> public/main:src/gui/wxgui/components/wxLogCtrl.cpp #include diff --git a/src/gui/wxgui/components/wxTitleManagerList.cpp b/src/gui/wxgui/components/wxTitleManagerList.cpp index 3f2a95ed..225993b9 100644 --- a/src/gui/wxgui/components/wxTitleManagerList.cpp +++ b/src/gui/wxgui/components/wxTitleManagerList.cpp @@ -1,23 +1,12 @@ -<<<<<<< HEAD:src/gui/components/wxTitleManagerList.cpp -#include "components/wxTitleManagerList.h" -#include "helpers/wxHelpers.h" -======= #include "wxgui/components/wxTitleManagerList.h" #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/components/wxTitleManagerList.cpp #include "util/helpers/SystemException.h" #include "Cafe/TitleList/GameInfo.h" #include "Cafe/TitleList/TitleInfo.h" #include "Cafe/TitleList/TitleList.h" -<<<<<<< HEAD:src/gui/components/wxTitleManagerList.cpp -#include "components/wxGameList.h" -#include "helpers/wxCustomEvents.h" -#include "helpers/wxHelpers.h" -======= #include "wxgui/components/wxGameList.h" #include "wxgui/helpers/wxCustomEvents.h" #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/components/wxTitleManagerList.cpp #include #include @@ -33,13 +22,8 @@ #include #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/components/wxTitleManagerList.cpp -#include "ChecksumTool.h" -#include "MainWindow.h" -======= #include "wxgui/ChecksumTool.h" #include "wxgui/MainWindow.h" ->>>>>>> public/main:src/gui/wxgui/components/wxTitleManagerList.cpp #include "Cafe/TitleList/TitleId.h" #include "Cafe/TitleList/SaveList.h" #include "Cafe/TitleList/TitleList.h" diff --git a/src/gui/wxgui/components/wxTitleManagerList.h b/src/gui/wxgui/components/wxTitleManagerList.h index 0cf2a794..5781e3bf 100644 --- a/src/gui/wxgui/components/wxTitleManagerList.h +++ b/src/gui/wxgui/components/wxTitleManagerList.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/components/wxTitleManagerList.h -#include "helpers/wxCustomData.h" -======= #include "wxgui/helpers/wxCustomData.h" ->>>>>>> public/main:src/gui/wxgui/components/wxTitleManagerList.h #include "config/CemuConfig.h" #include diff --git a/src/gui/wxgui/debugger/BreakpointWindow.cpp b/src/gui/wxgui/debugger/BreakpointWindow.cpp index f8bc4172..9b352553 100644 --- a/src/gui/wxgui/debugger/BreakpointWindow.cpp +++ b/src/gui/wxgui/debugger/BreakpointWindow.cpp @@ -1,18 +1,9 @@ -<<<<<<< HEAD:src/gui/debugger/BreakpointWindow.cpp -#include "wxgui.h" -#include "debugger/BreakpointWindow.h" - -#include - -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/BreakpointWindow.h" #include #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/BreakpointWindow.cpp #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cemu/ExpressionParser/ExpressionParser.h" @@ -188,11 +179,7 @@ void BreakpointWindow::OnLeftDClick(wxMouseEvent& event) const auto item = m_breakpoints->GetItemText(index, ColumnAddress); const auto address = std::stoul(item.ToStdString(), nullptr, 16); debuggerState.debugSession.instructionPointer = address; -<<<<<<< HEAD:src/gui/debugger/BreakpointWindow.cpp - debugger_getDebuggerCallbacks()->moveIP(); -======= g_debuggerDispatcher.MoveIP(); ->>>>>>> public/main:src/gui/wxgui/debugger/BreakpointWindow.cpp return; } diff --git a/src/gui/wxgui/debugger/BreakpointWindow.h b/src/gui/wxgui/debugger/BreakpointWindow.h index ef11bc7c..ac8fca53 100644 --- a/src/gui/wxgui/debugger/BreakpointWindow.h +++ b/src/gui/wxgui/debugger/BreakpointWindow.h @@ -1,9 +1,5 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/BreakpointWindow.h -#include "wxcomponents/checkedlistctrl.h" -======= #include "wxgui/wxcomponents/checkedlistctrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/BreakpointWindow.h class DebuggerWindow2; diff --git a/src/gui/wxgui/debugger/DebuggerWindow2.cpp b/src/gui/wxgui/debugger/DebuggerWindow2.cpp index 5c8db412..c4758977 100644 --- a/src/gui/wxgui/debugger/DebuggerWindow2.cpp +++ b/src/gui/wxgui/debugger/DebuggerWindow2.cpp @@ -1,10 +1,5 @@ -<<<<<<< HEAD:src/gui/debugger/DebuggerWindow2.cpp -#include "wxgui.h" -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DebuggerWindow2.cpp #include @@ -12,28 +7,16 @@ #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl_debug_symbols.h" -<<<<<<< HEAD:src/gui/debugger/DebuggerWindow2.cpp -#include "debugger/RegisterWindow.h" -#include "debugger/DumpWindow.h" -======= #include "wxgui/debugger/RegisterWindow.h" #include "wxgui/debugger/DumpWindow.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DebuggerWindow2.cpp #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" -<<<<<<< HEAD:src/gui/debugger/DebuggerWindow2.cpp -#include "debugger/DisasmCtrl.h" -#include "debugger/SymbolWindow.h" -#include "debugger/BreakpointWindow.h" -#include "debugger/ModuleWindow.h" -======= #include "wxgui/debugger/DisasmCtrl.h" #include "wxgui/debugger/SymbolWindow.h" #include "wxgui/debugger/BreakpointWindow.h" #include "wxgui/debugger/ModuleWindow.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DebuggerWindow2.cpp #include "util/helpers/helpers.h" #include "resource/embedded/resources.h" @@ -88,6 +71,8 @@ wxBEGIN_EVENT_TABLE(DebuggerWindow2, wxFrame) EVT_MENU_RANGE(MENU_ID_WINDOW_REGISTERS, MENU_ID_WINDOW_MODULE, DebuggerWindow2::OnWindowMenu) wxEND_EVENT_TABLE() +DebuggerWindow2* g_debugger_window; + void DebuggerConfig::Load(XMLConfigParser& parser) { pin_to_main = parser.get("PinToMainWindow", true); @@ -346,7 +331,8 @@ DebuggerWindow2::DebuggerWindow2(wxFrame& parent, const wxRect& display_size) m_config.data().pin_to_main = true; OnParentMove(m_main_position, m_main_size); m_config.data().pin_to_main = value; - debugger_registerDebuggerCallbacks(this); + + g_debugger_window = this; } DebuggerWindow2::~DebuggerWindow2() @@ -354,7 +340,7 @@ DebuggerWindow2::~DebuggerWindow2() g_debuggerDispatcher.ClearDebuggerCallbacks(); debuggerState.breakOnEntry = false; - debugger_unregisterDebuggerCallbacks(); + g_debugger_window = nullptr; // save configs for all modules that are still loaded // doesn't delete breakpoints since that should (in the future) be done by unloading the rpl modules when exiting the current game @@ -499,39 +485,6 @@ std::wstring DebuggerWindow2::GetModuleStoragePath(std::string module_name, uint return ActiveSettings::GetConfigPath("debugger/{}_{:#10x}.xml", module_name, crc_hash).generic_wstring(); } -void DebuggerWindow2::updateViewThreadsafe() -{ - auto* evt = new wxCommandEvent(wxEVT_UPDATE_VIEW); - wxQueueEvent(this, evt); -} -void DebuggerWindow2::notifyDebugBreakpointHit() -{ - auto* evt = new wxCommandEvent(wxEVT_BREAKPOINT_HIT); - wxQueueEvent(this, evt); -} -void DebuggerWindow2::notifyRun() -{ - auto* evt = new wxCommandEvent(wxEVT_RUN); - wxQueueEvent(this, evt); -} -void DebuggerWindow2::moveIP() -{ - auto* evt = new wxCommandEvent(wxEVT_MOVE_IP); - wxQueueEvent(this, evt); -} -void DebuggerWindow2::notifyModuleLoaded(void* module) -{ - auto* evt = new wxCommandEvent(wxEVT_NOTIFY_MODULE_LOADED); - evt->SetClientData(module); - wxQueueEvent(this, evt); -} -void DebuggerWindow2::notifyModuleUnloaded(void* module) -{ - auto* evt = new wxCommandEvent(wxEVT_NOTIFY_MODULE_UNLOADED); - evt->SetClientData(module); - wxQueueEvent(this, evt); -} - void DebuggerWindow2::OnBreakpointHit(wxCommandEvent& event) { const auto ip = debuggerState.debugSession.instructionPointer; diff --git a/src/gui/wxgui/debugger/DebuggerWindow2.h b/src/gui/wxgui/debugger/DebuggerWindow2.h index ea863cb8..a2dbbebf 100644 --- a/src/gui/wxgui/debugger/DebuggerWindow2.h +++ b/src/gui/wxgui/debugger/DebuggerWindow2.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/DebuggerWindow2.h -#include "debugger/DisasmCtrl.h" -======= #include "wxgui/debugger/DisasmCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DebuggerWindow2.h #include "config/XMLConfig.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" @@ -60,11 +56,7 @@ struct DebuggerModuleStorage }; typedef XMLDataConfig XMLDebuggerModuleConfig; -<<<<<<< HEAD:src/gui/debugger/DebuggerWindow2.h -class DebuggerWindow2 : public wxFrame, DebuggerCallbacks -======= class DebuggerWindow2 : public wxFrame, public DebuggerCallbacks ->>>>>>> public/main:src/gui/wxgui/debugger/DebuggerWindow2.h { public: void CreateToolBar(); @@ -80,14 +72,6 @@ public: bool Show(bool show = true) override; std::wstring GetModuleStoragePath(std::string module_name, uint32_t crc_hash) const; - - virtual void updateViewThreadsafe() override; - virtual void notifyDebugBreakpointHit() override; - virtual void notifyRun() override; - virtual void moveIP() override; - virtual void notifyModuleLoaded(void* module) override; - virtual void notifyModuleUnloaded(void* module) override; - private: void OnBreakpointHit(wxCommandEvent& event); void OnRunProgram(wxCommandEvent& event); diff --git a/src/gui/wxgui/debugger/DisasmCtrl.cpp b/src/gui/wxgui/debugger/DisasmCtrl.cpp index a35fdc1b..6d258cc5 100644 --- a/src/gui/wxgui/debugger/DisasmCtrl.cpp +++ b/src/gui/wxgui/debugger/DisasmCtrl.cpp @@ -1,10 +1,5 @@ -<<<<<<< HEAD:src/gui/debugger/DisasmCtrl.cpp -#include "wxgui.h" -#include "debugger/DisasmCtrl.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/DisasmCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DisasmCtrl.cpp #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl.h" @@ -12,11 +7,7 @@ #include "Cafe/OS/RPL/rpl_debug_symbols.h" #include "Cemu/PPCAssembler/ppcAssembler.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" -<<<<<<< HEAD:src/gui/debugger/DisasmCtrl.cpp -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DisasmCtrl.cpp #include "util/helpers/helpers.h" #include "Cemu/ExpressionParser/ExpressionParser.h" @@ -841,7 +832,9 @@ void DisasmCtrl::GoToAddressDialog() const auto result = (uint32)parser.Evaluate(value); m_lastGotoTarget = result; CenterOffset(result); - debugger_getDebuggerCallbacks()->updateViewThreadsafe(); + wxCommandEvent evt(wxEVT_DISASMCTRL_NOTIFY_GOTO_ADDRESS); + evt.SetExtraLong(static_cast(result)); + wxPostEvent(GetParent(), evt); } else { diff --git a/src/gui/wxgui/debugger/DisasmCtrl.h b/src/gui/wxgui/debugger/DisasmCtrl.h index 123fa43e..85a962e0 100644 --- a/src/gui/wxgui/debugger/DisasmCtrl.h +++ b/src/gui/wxgui/debugger/DisasmCtrl.h @@ -1,9 +1,5 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/DisasmCtrl.h -#include "components/TextList.h" -======= #include "wxgui/components/TextList.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DisasmCtrl.h wxDECLARE_EVENT(wxEVT_DISASMCTRL_NOTIFY_GOTO_ADDRESS, wxCommandEvent); // Notify parent that goto address operation completed. Event contains the address that was jumped to. diff --git a/src/gui/wxgui/debugger/DumpCtrl.cpp b/src/gui/wxgui/debugger/DumpCtrl.cpp index 52105650..2f192ec8 100644 --- a/src/gui/wxgui/debugger/DumpCtrl.cpp +++ b/src/gui/wxgui/debugger/DumpCtrl.cpp @@ -1,10 +1,5 @@ -<<<<<<< HEAD:src/gui/debugger/DumpCtrl.cpp -#include "wxgui.h" -#include "debugger/DumpCtrl.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/DumpCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DumpCtrl.cpp #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/wxgui/debugger/DumpCtrl.h b/src/gui/wxgui/debugger/DumpCtrl.h index 0466d19e..eb7fc53b 100644 --- a/src/gui/wxgui/debugger/DumpCtrl.h +++ b/src/gui/wxgui/debugger/DumpCtrl.h @@ -1,9 +1,5 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/DumpCtrl.h -#include "components/TextList.h" -======= #include "wxgui/components/TextList.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DumpCtrl.h class DumpCtrl : public TextList diff --git a/src/gui/wxgui/debugger/DumpWindow.cpp b/src/gui/wxgui/debugger/DumpWindow.cpp index cfde1bce..738b738a 100644 --- a/src/gui/wxgui/debugger/DumpWindow.cpp +++ b/src/gui/wxgui/debugger/DumpWindow.cpp @@ -1,18 +1,9 @@ -<<<<<<< HEAD:src/gui/debugger/DumpWindow.cpp -#include "wxgui.h" -#include "debugger/DumpWindow.h" - -#include "debugger/DebuggerWindow2.h" -#include "Cafe/HW/Espresso/Debugger/Debugger.h" -#include "debugger/DumpCtrl.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/DumpWindow.h" #include "wxgui/debugger/DebuggerWindow2.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "wxgui/debugger/DumpCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DumpWindow.cpp enum { diff --git a/src/gui/wxgui/debugger/DumpWindow.h b/src/gui/wxgui/debugger/DumpWindow.h index c85aa146..e45f3489 100644 --- a/src/gui/wxgui/debugger/DumpWindow.h +++ b/src/gui/wxgui/debugger/DumpWindow.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/DumpWindow.h -#include "debugger/DumpCtrl.h" -======= #include "wxgui/debugger/DumpCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/DumpWindow.h class DebuggerWindow2; diff --git a/src/gui/wxgui/debugger/ModuleWindow.cpp b/src/gui/wxgui/debugger/ModuleWindow.cpp index 497f53b1..56b69cd4 100644 --- a/src/gui/wxgui/debugger/ModuleWindow.cpp +++ b/src/gui/wxgui/debugger/ModuleWindow.cpp @@ -1,18 +1,9 @@ -<<<<<<< HEAD:src/gui/debugger/ModuleWindow.cpp -#include "wxgui.h" -#include "debugger/ModuleWindow.h" - -#include - -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/ModuleWindow.h" #include #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/ModuleWindow.cpp #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl.h" @@ -141,9 +132,5 @@ void ModuleWindow::OnLeftDClick(wxMouseEvent& event) if (address == 0) return; debuggerState.debugSession.instructionPointer = address; -<<<<<<< HEAD:src/gui/debugger/ModuleWindow.cpp - debugger_getDebuggerCallbacks()->moveIP(); -======= g_debuggerDispatcher.MoveIP(); ->>>>>>> public/main:src/gui/wxgui/debugger/ModuleWindow.cpp } diff --git a/src/gui/wxgui/debugger/RegisterCtrl.cpp b/src/gui/wxgui/debugger/RegisterCtrl.cpp index 2b9cedb0..2a71770a 100644 --- a/src/gui/wxgui/debugger/RegisterCtrl.cpp +++ b/src/gui/wxgui/debugger/RegisterCtrl.cpp @@ -1,21 +1,12 @@ -<<<<<<< HEAD:src/gui/debugger/RegisterCtrl.cpp -#include "wxgui.h" -#include "debugger/RegisterCtrl.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/RegisterCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/RegisterCtrl.cpp #include #include "Cafe/OS/RPL/rpl_structs.h" #include "Cafe/OS/RPL/rpl.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" -<<<<<<< HEAD:src/gui/debugger/RegisterCtrl.cpp -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/RegisterCtrl.cpp #define COLOR_DEBUG_ACTIVE_BP 0xFFFFA0FF #define COLOR_DEBUG_ACTIVE 0xFFFFA080 diff --git a/src/gui/wxgui/debugger/RegisterCtrl.h b/src/gui/wxgui/debugger/RegisterCtrl.h index 888b9e2a..19e5d199 100644 --- a/src/gui/wxgui/debugger/RegisterCtrl.h +++ b/src/gui/wxgui/debugger/RegisterCtrl.h @@ -1,9 +1,5 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/RegisterCtrl.h -#include "components/TextList.h" -======= #include "wxgui/components/TextList.h" ->>>>>>> public/main:src/gui/wxgui/debugger/RegisterCtrl.h #include "Cafe/HW/Espresso/Debugger/Debugger.h" class RegisterCtrl : public TextList diff --git a/src/gui/wxgui/debugger/RegisterWindow.cpp b/src/gui/wxgui/debugger/RegisterWindow.cpp index 7191b50f..0a2e4af2 100644 --- a/src/gui/wxgui/debugger/RegisterWindow.cpp +++ b/src/gui/wxgui/debugger/RegisterWindow.cpp @@ -1,18 +1,9 @@ -<<<<<<< HEAD:src/gui/debugger/RegisterWindow.cpp -#include "wxgui.h" -#include "debugger/RegisterWindow.h" - -#include - -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/RegisterWindow.h" #include #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/RegisterWindow.cpp #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/wxgui/debugger/SymbolCtrl.cpp b/src/gui/wxgui/debugger/SymbolCtrl.cpp index 3060c129..a02269fe 100644 --- a/src/gui/wxgui/debugger/SymbolCtrl.cpp +++ b/src/gui/wxgui/debugger/SymbolCtrl.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/debugger/SymbolCtrl.cpp -#include "debugger/SymbolCtrl.h" -======= #include "wxgui/debugger/SymbolCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/SymbolCtrl.cpp #include "Cafe/OS/RPL/rpl_symbol_storage.h" #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include @@ -117,11 +113,7 @@ void SymbolListCtrl::OnLeftDClick(wxListEvent& event) if (address == 0) return; debuggerState.debugSession.instructionPointer = address; -<<<<<<< HEAD:src/gui/debugger/SymbolCtrl.cpp - debugger_getDebuggerCallbacks()->moveIP(); -======= g_debuggerDispatcher.MoveIP(); ->>>>>>> public/main:src/gui/wxgui/debugger/SymbolCtrl.cpp } void SymbolListCtrl::OnRightClick(wxListEvent& event) diff --git a/src/gui/wxgui/debugger/SymbolWindow.cpp b/src/gui/wxgui/debugger/SymbolWindow.cpp index 993019d5..23537efe 100644 --- a/src/gui/wxgui/debugger/SymbolWindow.cpp +++ b/src/gui/wxgui/debugger/SymbolWindow.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD:src/gui/debugger/SymbolWindow.cpp -#include "wxgui.h" -#include "debugger/SymbolWindow.h" -#include "debugger/DebuggerWindow2.h" -======= #include "wxgui/wxgui.h" #include "wxgui/debugger/SymbolWindow.h" #include "wxgui/debugger/DebuggerWindow2.h" ->>>>>>> public/main:src/gui/wxgui/debugger/SymbolWindow.cpp #include "Cafe/HW/Espresso/Debugger/Debugger.h" #include "Cafe/OS/RPL/rpl_symbol_storage.h" diff --git a/src/gui/wxgui/debugger/SymbolWindow.h b/src/gui/wxgui/debugger/SymbolWindow.h index 531a5959..766ac65e 100644 --- a/src/gui/wxgui/debugger/SymbolWindow.h +++ b/src/gui/wxgui/debugger/SymbolWindow.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/debugger/SymbolWindow.h -#include "debugger/SymbolCtrl.h" -======= #include "wxgui/debugger/SymbolCtrl.h" ->>>>>>> public/main:src/gui/wxgui/debugger/SymbolWindow.h class DebuggerWindow2; diff --git a/src/gui/wxgui/dialogs/CreateAccount/wxCreateAccountDialog.cpp b/src/gui/wxgui/dialogs/CreateAccount/wxCreateAccountDialog.cpp index b3677e61..4e309113 100644 --- a/src/gui/wxgui/dialogs/CreateAccount/wxCreateAccountDialog.cpp +++ b/src/gui/wxgui/dialogs/CreateAccount/wxCreateAccountDialog.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/dialogs/CreateAccount/wxCreateAccountDialog.cpp -#include "dialogs/CreateAccount/wxCreateAccountDialog.h" -======= #include "wxgui/dialogs/CreateAccount/wxCreateAccountDialog.h" ->>>>>>> public/main:src/gui/wxgui/dialogs/CreateAccount/wxCreateAccountDialog.cpp #include "Cafe/Account/Account.h" #include diff --git a/src/gui/wxgui/dialogs/SaveImport/SaveImportWindow.cpp b/src/gui/wxgui/dialogs/SaveImport/SaveImportWindow.cpp index 308abafa..6d232d71 100644 --- a/src/gui/wxgui/dialogs/SaveImport/SaveImportWindow.cpp +++ b/src/gui/wxgui/dialogs/SaveImport/SaveImportWindow.cpp @@ -16,11 +16,7 @@ #include "Cafe/OS/libs/coreinit/coreinit_Time.h" #include "util/helpers/helpers.h" #include "Cafe/HW/Espresso/PPCState.h" -<<<<<<< HEAD:src/gui/dialogs/SaveImport/SaveImportWindow.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/dialogs/SaveImport/SaveImportWindow.cpp 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/wxgui/dialogs/SaveImport/SaveTransfer.cpp b/src/gui/wxgui/dialogs/SaveImport/SaveTransfer.cpp index 095b88f0..53cdbcc4 100644 --- a/src/gui/wxgui/dialogs/SaveImport/SaveTransfer.cpp +++ b/src/gui/wxgui/dialogs/SaveImport/SaveTransfer.cpp @@ -12,11 +12,7 @@ #include "Cafe/Account/Account.h" #include "config/ActiveSettings.h" #include "util/helpers/helpers.h" -<<<<<<< HEAD:src/gui/dialogs/SaveImport/SaveTransfer.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/dialogs/SaveImport/SaveTransfer.cpp 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/wxgui/helpers/wxCustomEvents.cpp b/src/gui/wxgui/helpers/wxCustomEvents.cpp index 014d1783..589b7c80 100644 --- a/src/gui/wxgui/helpers/wxCustomEvents.cpp +++ b/src/gui/wxgui/helpers/wxCustomEvents.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/helpers/wxCustomEvents.cpp -#include "helpers/wxCustomEvents.h" -======= #include "wxgui/helpers/wxCustomEvents.h" ->>>>>>> public/main:src/gui/wxgui/helpers/wxCustomEvents.cpp wxDEFINE_EVENT(wxEVT_SET_STATUS_BAR_TEXT, wxSetStatusBarTextEvent); wxDEFINE_EVENT(wxEVT_SET_GAUGE_VALUE, wxSetGaugeValue); diff --git a/src/gui/wxgui/helpers/wxHelpers.h b/src/gui/wxgui/helpers/wxHelpers.h index aef2e290..fd03cbca 100644 --- a/src/gui/wxgui/helpers/wxHelpers.h +++ b/src/gui/wxgui/helpers/wxHelpers.h @@ -5,8 +5,6 @@ #include #include -#include "Cemu/GuiSystem/GuiSystem.h" - template <> struct fmt::formatter : formatter { @@ -113,12 +111,4 @@ void update_slider_text(wxCommandEvent& event, const wxFormatString& format = "% uint32 fix_raw_keycode(uint32 keycode, uint32 raw_flags); -<<<<<<< HEAD:src/gui/helpers/wxHelpers.h -std::string rawKeyCodeToString(uint32 keyCode); - -std::optional rawKeyCodeToPlatformKeyCode(uint32 keyCode); - -GuiSystem::WindowHandleInfo get_window_handle_info_for_wxWindow(wxWindow* wxw); -======= -WindowSystem::WindowHandleInfo initHandleContextFromWxWidgetsWindow(wxWindow* wxw); ->>>>>>> public/main:src/gui/wxgui/helpers/wxHelpers.h +WindowSystem::WindowHandleInfo initHandleContextFromWxWidgetsWindow(wxWindow* wxw); \ No newline at end of file diff --git a/src/gui/wxgui/helpers/wxWayland.cpp b/src/gui/wxgui/helpers/wxWayland.cpp index d498b2c5..6ec932bd 100644 --- a/src/gui/wxgui/helpers/wxWayland.cpp +++ b/src/gui/wxgui/helpers/wxWayland.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/helpers/wxWayland.cpp -#include "helpers/wxWayland.h" -======= #include "wxgui/helpers/wxWayland.h" ->>>>>>> public/main:src/gui/wxgui/helpers/wxWayland.cpp #if BOOST_OS_LINUX && HAS_WAYLAND diff --git a/src/gui/wxgui/input/InputAPIAddWindow.cpp b/src/gui/wxgui/input/InputAPIAddWindow.cpp index de0cc0ca..6a9d74bd 100644 --- a/src/gui/wxgui/input/InputAPIAddWindow.cpp +++ b/src/gui/wxgui/input/InputAPIAddWindow.cpp @@ -1,16 +1,8 @@ -<<<<<<< HEAD:src/gui/input/InputAPIAddWindow.cpp -#include "input/InputAPIAddWindow.h" - -#include "input/InputManager.h" -#include "helpers/wxCustomData.h" -#include "helpers/wxHelpers.h" -======= #include "wxgui/input/InputAPIAddWindow.h" #include "input/InputManager.h" #include "wxgui/helpers/wxCustomData.h" #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/input/InputAPIAddWindow.cpp #include "input/api/Controller.h" #include diff --git a/src/gui/wxgui/input/InputAPIAddWindow.h b/src/gui/wxgui/input/InputAPIAddWindow.h index d97de2cd..1e17a8db 100644 --- a/src/gui/wxgui/input/InputAPIAddWindow.h +++ b/src/gui/wxgui/input/InputAPIAddWindow.h @@ -6,11 +6,7 @@ #include #include -<<<<<<< HEAD:src/gui/input/InputAPIAddWindow.h -#include "helpers/wxCustomData.h" -======= #include "wxgui/helpers/wxCustomData.h" ->>>>>>> public/main:src/gui/wxgui/input/InputAPIAddWindow.h #include "input/api/Controller.h" class wxComboBox; diff --git a/src/gui/wxgui/input/InputSettings2.cpp b/src/gui/wxgui/input/InputSettings2.cpp index dc2211ea..b36b2993 100644 --- a/src/gui/wxgui/input/InputSettings2.cpp +++ b/src/gui/wxgui/input/InputSettings2.cpp @@ -1,21 +1,11 @@ -<<<<<<< HEAD:src/gui/input/InputSettings2.cpp -#include "input/InputSettings2.h" -======= #include "wxgui/input/InputSettings2.h" ->>>>>>> public/main:src/gui/wxgui/input/InputSettings2.cpp #include #include "input/InputManager.h" -<<<<<<< HEAD:src/gui/input/InputSettings2.cpp -#include "helpers/wxHelpers.h" -#include "helpers/wxControlObject.h" -#include "helpers/wxCustomData.h" -======= #include "wxgui/helpers/wxHelpers.h" #include "wxgui/helpers/wxControlObject.h" #include "wxgui/helpers/wxCustomData.h" ->>>>>>> public/main:src/gui/wxgui/input/InputSettings2.cpp #include #include @@ -27,20 +17,6 @@ #include #include "config/ActiveSettings.h" -<<<<<<< HEAD:src/gui/input/InputSettings2.cpp -#include "input/InputAPIAddWindow.h" -#include "input/ControllerFactory.h" - -#include "input/PairingDialog.h" - -#include "input/panels/VPADInputPanel.h" -#include "input/panels/ProControllerInputPanel.h" - -#include "input/settings/DefaultControllerSettings.h" -#include "input/panels/ClassicControllerInputPanel.h" -#include "input/panels/WiimoteInputPanel.h" -#include "input/settings/WiimoteControllerSettings.h" -======= #include "wxgui/input/InputAPIAddWindow.h" #include "input/ControllerFactory.h" @@ -53,7 +29,6 @@ #include "wxgui/input/panels/ClassicControllerInputPanel.h" #include "wxgui/input/panels/WiimoteInputPanel.h" #include "wxgui/input/settings/WiimoteControllerSettings.h" ->>>>>>> public/main:src/gui/wxgui/input/InputSettings2.cpp #include "util/EventService.h" #include "resource/embedded/resources.h" diff --git a/src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp b/src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp index 9f46d520..ced1cede 100644 --- a/src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp +++ b/src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/panels/ClassicControllerInputPanel.cpp -#include "input/panels/ClassicControllerInputPanel.h" -======= #include "wxgui/input/panels/ClassicControllerInputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp #include #include @@ -10,17 +6,10 @@ #include #include -<<<<<<< HEAD:src/gui/input/panels/ClassicControllerInputPanel.cpp -#include "helpers/wxControlObject.h" -#include "input/emulated/ClassicController.h" -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -======= #include "wxgui/helpers/wxControlObject.h" #include "input/emulated/ClassicController.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ClassicControllerInputPanel.cpp 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/wxgui/input/panels/ClassicControllerInputPanel.h b/src/gui/wxgui/input/panels/ClassicControllerInputPanel.h index 8bde7f04..8be8c52e 100644 --- a/src/gui/wxgui/input/panels/ClassicControllerInputPanel.h +++ b/src/gui/wxgui/input/panels/ClassicControllerInputPanel.h @@ -2,11 +2,7 @@ #include #include "input/emulated/ClassicController.h" -<<<<<<< HEAD:src/gui/input/panels/ClassicControllerInputPanel.h -#include "input/panels/InputPanel.h" -======= #include "wxgui/input/panels/InputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ClassicControllerInputPanel.h class wxInputDraw; diff --git a/src/gui/wxgui/input/panels/InputPanel.cpp b/src/gui/wxgui/input/panels/InputPanel.cpp index 81f9922a..e460f0c6 100644 --- a/src/gui/wxgui/input/panels/InputPanel.cpp +++ b/src/gui/wxgui/input/panels/InputPanel.cpp @@ -1,17 +1,9 @@ -<<<<<<< HEAD:src/gui/input/panels/InputPanel.cpp -#include "input/panels/InputPanel.h" -======= #include "wxgui/input/panels/InputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/InputPanel.cpp #include #include -<<<<<<< HEAD:src/gui/input/panels/InputPanel.cpp -#include "helpers/wxHelpers.h" -======= #include "wxgui/helpers/wxHelpers.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/InputPanel.cpp InputPanel::InputPanel(wxWindow* parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER | wxWANTS_CHARS) @@ -34,11 +26,7 @@ void InputPanel::on_timer(const EmulatedControllerPtr& emulated_controller, cons const auto mapping = reinterpret_cast(element->GetClientData()); // reset mapping -<<<<<<< HEAD:src/gui/input/panels/InputPanel.cpp - if(std::exchange(m_right_down, false)) -======= if(std::exchange(m_right_down, false) || WindowSystem::IsKeyDown(WindowSystem::PlatformKeyCodes::ESCAPE)) ->>>>>>> public/main:src/gui/wxgui/input/panels/InputPanel.cpp { element->SetBackgroundColour(kKeyColourNormalMode); m_color_backup[element->GetId()] = kKeyColourNormalMode; diff --git a/src/gui/wxgui/input/panels/InputPanel.h b/src/gui/wxgui/input/panels/InputPanel.h index d25b790c..ef189191 100644 --- a/src/gui/wxgui/input/panels/InputPanel.h +++ b/src/gui/wxgui/input/panels/InputPanel.h @@ -5,11 +5,7 @@ #include "input/emulated/EmulatedController.h" #include "input/api/Controller.h" -<<<<<<< HEAD:src/gui/input/panels/InputPanel.h -#include "wxHelper.h" -======= #include "wxgui/wxHelper.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/InputPanel.h class ControllerBase; class wxTextCtrl; diff --git a/src/gui/wxgui/input/panels/ProControllerInputPanel.cpp b/src/gui/wxgui/input/panels/ProControllerInputPanel.cpp index c20fda63..d8e50b03 100644 --- a/src/gui/wxgui/input/panels/ProControllerInputPanel.cpp +++ b/src/gui/wxgui/input/panels/ProControllerInputPanel.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/panels/ProControllerInputPanel.cpp -#include "input/panels/ProControllerInputPanel.h" -======= #include "wxgui/input/panels/ProControllerInputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ProControllerInputPanel.cpp #include #include @@ -10,13 +6,8 @@ #include #include "input/emulated/ProController.h" -<<<<<<< HEAD:src/gui/input/panels/ProControllerInputPanel.cpp -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -======= #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ProControllerInputPanel.cpp 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/wxgui/input/panels/ProControllerInputPanel.h b/src/gui/wxgui/input/panels/ProControllerInputPanel.h index ae825e46..cd82a957 100644 --- a/src/gui/wxgui/input/panels/ProControllerInputPanel.h +++ b/src/gui/wxgui/input/panels/ProControllerInputPanel.h @@ -2,13 +2,8 @@ #include #include "input/emulated/ProController.h" -<<<<<<< HEAD:src/gui/input/panels/ProControllerInputPanel.h -#include "input/panels/InputPanel.h" -#include "components/wxInputDraw.h" -======= #include "wxgui/input/panels/InputPanel.h" #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/ProControllerInputPanel.h class ProControllerInputPanel : public InputPanel { diff --git a/src/gui/wxgui/input/panels/VPADInputPanel.cpp b/src/gui/wxgui/input/panels/VPADInputPanel.cpp index 19de0e9d..f59aad10 100644 --- a/src/gui/wxgui/input/panels/VPADInputPanel.cpp +++ b/src/gui/wxgui/input/panels/VPADInputPanel.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/panels/VPADInputPanel.cpp -#include "input/panels/VPADInputPanel.h" -======= #include "wxgui/input/panels/VPADInputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/VPADInputPanel.cpp #include #include @@ -12,15 +8,9 @@ #include -<<<<<<< HEAD:src/gui/input/panels/VPADInputPanel.cpp -#include "helpers/wxControlObject.h" -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -======= #include "wxgui/helpers/wxControlObject.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/VPADInputPanel.cpp #include "input/emulated/VPADController.h" constexpr VPADController::ButtonId g_kFirstColumnItems[] = diff --git a/src/gui/wxgui/input/panels/VPADInputPanel.h b/src/gui/wxgui/input/panels/VPADInputPanel.h index 7fba8058..97b3ad1b 100644 --- a/src/gui/wxgui/input/panels/VPADInputPanel.h +++ b/src/gui/wxgui/input/panels/VPADInputPanel.h @@ -1,11 +1,7 @@ #pragma once #include -<<<<<<< HEAD:src/gui/input/panels/VPADInputPanel.h -#include "input/panels/InputPanel.h" -======= #include "wxgui/input/panels/InputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/VPADInputPanel.h class wxInputDraw; class wxCheckBox; diff --git a/src/gui/wxgui/input/panels/WiimoteInputPanel.cpp b/src/gui/wxgui/input/panels/WiimoteInputPanel.cpp index 94ed316d..e40c601f 100644 --- a/src/gui/wxgui/input/panels/WiimoteInputPanel.cpp +++ b/src/gui/wxgui/input/panels/WiimoteInputPanel.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/panels/WiimoteInputPanel.cpp -#include "input/panels/WiimoteInputPanel.h" -======= #include "wxgui/input/panels/WiimoteInputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/WiimoteInputPanel.cpp #include #include @@ -12,18 +8,10 @@ #include #include -<<<<<<< HEAD:src/gui/input/panels/WiimoteInputPanel.cpp -#include "helpers/wxControlObject.h" -#include "input/emulated/WiimoteController.h" -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -#include "../PairingDialog.h" -======= #include "wxgui/helpers/wxControlObject.h" #include "input/emulated/WiimoteController.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/WiimoteInputPanel.cpp constexpr WiimoteController::ButtonId g_kFirstColumnItems[] = { diff --git a/src/gui/wxgui/input/panels/WiimoteInputPanel.h b/src/gui/wxgui/input/panels/WiimoteInputPanel.h index 4a438794..946f7cd5 100644 --- a/src/gui/wxgui/input/panels/WiimoteInputPanel.h +++ b/src/gui/wxgui/input/panels/WiimoteInputPanel.h @@ -1,10 +1,6 @@ #pragma once -<<<<<<< HEAD:src/gui/input/panels/WiimoteInputPanel.h -#include "input/panels/InputPanel.h" -======= #include "wxgui/input/panels/InputPanel.h" ->>>>>>> public/main:src/gui/wxgui/input/panels/WiimoteInputPanel.h #include "input/emulated/WiimoteController.h" #include diff --git a/src/gui/wxgui/input/settings/DefaultControllerSettings.cpp b/src/gui/wxgui/input/settings/DefaultControllerSettings.cpp index 78ee5deb..c10c15ce 100644 --- a/src/gui/wxgui/input/settings/DefaultControllerSettings.cpp +++ b/src/gui/wxgui/input/settings/DefaultControllerSettings.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/settings/DefaultControllerSettings.cpp -#include "input/settings/DefaultControllerSettings.h" -======= #include "wxgui/input/settings/DefaultControllerSettings.h" ->>>>>>> public/main:src/gui/wxgui/input/settings/DefaultControllerSettings.cpp #include #include @@ -13,17 +9,10 @@ #include #include -<<<<<<< HEAD:src/gui/input/settings/DefaultControllerSettings.cpp -#include "helpers/wxControlObject.h" -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -#include "input/InputAPIAddWindow.h" -======= #include "wxgui/helpers/wxControlObject.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" #include "wxgui/input/InputAPIAddWindow.h" ->>>>>>> public/main:src/gui/wxgui/input/settings/DefaultControllerSettings.cpp DefaultControllerSettings::DefaultControllerSettings(wxWindow* parent, const wxPoint& position, std::shared_ptr controller) diff --git a/src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp b/src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp index 5a88c162..320a895a 100644 --- a/src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp +++ b/src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/input/settings/WiimoteControllerSettings.cpp -#include "input/settings/WiimoteControllerSettings.h" -======= #include "wxgui/input/settings/WiimoteControllerSettings.h" ->>>>>>> public/main:src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp #include #include @@ -13,17 +9,10 @@ #include #include -<<<<<<< HEAD:src/gui/input/settings/WiimoteControllerSettings.cpp -#include "helpers/wxControlObject.h" -#include "helpers/wxHelpers.h" -#include "components/wxInputDraw.h" -#include "input/InputAPIAddWindow.h" -======= #include "wxgui/helpers/wxControlObject.h" #include "wxgui/helpers/wxHelpers.h" #include "wxgui/components/wxInputDraw.h" #include "wxgui/input/InputAPIAddWindow.h" ->>>>>>> public/main:src/gui/wxgui/input/settings/WiimoteControllerSettings.cpp #ifdef SUPPORTS_WIIMOTE diff --git a/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp b/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp index 72818b95..6bfcd69e 100644 --- a/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp +++ b/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp -#include "wxgui.h" -======= #include "wxgui/wxgui.h" ->>>>>>> public/main:src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.cpp #include "Cafe/OS/libs/coreinit/coreinit_Thread.h" #include "Cafe/OS/libs/coreinit/coreinit_Scheduler.h" #include "DebugPPCThreadsWindow.h" diff --git a/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.cpp b/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.cpp index e8f30349..3350d0c5 100644 --- a/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.cpp +++ b/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.cpp @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/gui/windows/TextureRelationViewer/TextureRelationWindow.cpp -#include "wxgui.h" -======= #include "wxgui/wxgui.h" ->>>>>>> public/main:src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.cpp #include "TextureRelationWindow.h" #include "Cafe/HW/Latte/Core/LatteTexture.h" diff --git a/src/gui/wxgui/wxcomponents/checkedlistctrl.cpp b/src/gui/wxgui/wxcomponents/checkedlistctrl.cpp index c9a517c5..62100f44 100644 --- a/src/gui/wxgui/wxcomponents/checkedlistctrl.cpp +++ b/src/gui/wxgui/wxcomponents/checkedlistctrl.cpp @@ -18,11 +18,7 @@ #endif // includes -<<<<<<< HEAD:src/gui/wxcomponents/checkedlistctrl.cpp -#include "wxcomponents/checkedlistctrl.h" -======= #include "wxgui/wxcomponents/checkedlistctrl.h" ->>>>>>> public/main:src/gui/wxgui/wxcomponents/checkedlistctrl.cpp #include #include @@ -31,17 +27,10 @@ // resources -<<<<<<< HEAD:src/gui/wxcomponents/checkedlistctrl.cpp -#include "wxcomponents/checked.xpm" -#include "wxcomponents/unchecked.xpm" -#include "wxcomponents/checked_dis.xpm" -#include "wxcomponents/unchecked_dis.xpm" -======= #include "wxgui/wxcomponents/checked.xpm" #include "wxgui/wxcomponents/unchecked.xpm" #include "wxgui/wxcomponents/checked_dis.xpm" #include "wxgui/wxcomponents/unchecked_dis.xpm" ->>>>>>> public/main:src/gui/wxgui/wxcomponents/checkedlistctrl.cpp IMPLEMENT_CLASS(wxCheckedListCtrl, wxListCtrl) BEGIN_EVENT_TABLE(wxCheckedListCtrl, wxListCtrl) diff --git a/src/gui/wxgui/wxcomponents/checktree.cpp b/src/gui/wxgui/wxcomponents/checktree.cpp index 53fa2c78..a6818626 100644 --- a/src/gui/wxgui/wxcomponents/checktree.cpp +++ b/src/gui/wxgui/wxcomponents/checktree.cpp @@ -1,14 +1,3 @@ -<<<<<<< HEAD:src/gui/wxcomponents/checktree.cpp -#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 "wxgui/wxcomponents/checktree.h" #include "wxgui/wxcomponents/checked2.xpm" #include "wxgui/wxcomponents/checked_d.xpm" @@ -18,7 +7,6 @@ #include "wxgui/wxcomponents/unchecked_d.xpm" #include "wxgui/wxcomponents/unchecked_ld.xpm" #include "wxgui/wxcomponents/unchecked_mo.xpm" ->>>>>>> public/main:src/gui/wxgui/wxcomponents/checktree.cpp #include #include diff --git a/src/gui/wxgui/wxgui.h b/src/gui/wxgui/wxgui.h index 4d80f5a5..bb4352d1 100644 --- a/src/gui/wxgui/wxgui.h +++ b/src/gui/wxgui/wxgui.h @@ -36,6 +36,7 @@ #include #include +extern bool g_inputConfigWindowHasFocus; inline bool SendSliderEvent(wxSlider* slider, int new_value) {