Isolate wxWidgets code from non-GUI code

Author: SSimco

.github/workflows/build_check.yml

@@ -11,7 +11,7 @@ on:
     paths-ignore:
       - "*.md"
     branches:
-      - main
+      - wx_widgets_decouple
 
 jobs:
   build:

src/CMakeLists.txt

@@ -150,7 +150,3 @@ if(UNIX AND NOT APPLE)
 	# most likely not helpful in debugging problems with cemu code
 	target_link_options(CemuBin PRIVATE "$<$<CONFIG:Release>:-Xlinker;--strip-debug>")
 endif()
-
-if (ENABLE_WXWIDGETS)
-	target_link_libraries(CemuBin PRIVATE wx::base wx::core)
-endif()

src/Cafe/CMakeLists.txt

@@ -597,10 +597,6 @@ else ()
   target_link_libraries(CemuCafe PRIVATE libusb::libusb)
 endif ()
 
-if (ENABLE_WXWIDGETS)
-	target_link_libraries(CemuCafe PRIVATE wx::base wx::core)
-endif()
-
 if(WIN32)
 	target_link_libraries(CemuCafe PRIVATE iphlpapi)
 endif()

src/Cafe/CafeSystem.cpp

@@ -1,5 +1,5 @@
 #include "Cafe/OS/common/OSCommon.h"
-#include "gui/wxgui.h"
+#include "WindowSystem.h"
 #include "Cafe/OS/libs/gx2/GX2.h"
 #include "Cafe/GameProfile/GameProfile.h"
 #include "Cafe/HW/Espresso/Interpreter/PPCInterpreterInternal.h"
@@ -65,9 +65,6 @@
 // HW interfaces
 #include "Cafe/HW/SI/si.h"
 
-// dependency to be removed
-#include "gui/guiWrapper.h"
-
 #include <time.h>
 
 #if BOOST_OS_LINUX
@@ -131,7 +128,7 @@ void SetEntryPoint(MPTR entryPoint)
 }
 
 // load executable into virtual memory and set entrypoint
-void LoadMainExecutable()
+bool LoadMainExecutable()
 {
 	isLaunchTypeELF = false;
 	// when launching from a disc image _pathToExecutable is initially empty
@@ -145,6 +142,7 @@ void LoadMainExecutable()
 			cemuLog_log(LogType::Force, "Unable to find RPX executable");
 			cemuLog_waitForFlush();
 			cemu_assert(false);
+			return false;
 		}
 	}
 	// extract and load RPX
@@ -155,6 +153,7 @@ void LoadMainExecutable()
 		cemuLog_log(LogType::Force, "Failed to load \"{}\"", _pathToExecutable);
 		cemuLog_waitForFlush();
 		cemu_assert(false);
+		return false;
 	}
 	currentUpdatedApplicationHash = generateHashFromRawRPXData(rpxData, rpxSize);
 	// determine if this file is an ELF
@@ -172,10 +171,10 @@ void LoadMainExecutable()
 		applicationRPX = RPLLoader_LoadFromMemory(rpxData, rpxSize, (char*)_pathToExecutable.c_str());
 		if (!applicationRPX)
 		{
-			wxMessageBox(_("Failed to run this title because the executable is damaged"));
-			cemuLog_createLogFile(false);
+			cemuLog_log(LogType::Force, "Failed to run this title because the executable is damaged");
 			cemuLog_waitForFlush();
-			exit(0);
+			cemu_assert(false);
+			return false;
 		}
 		RPLLoader_SetMainModule(applicationRPX);
 		SetEntryPoint(RPLLoader_GetModuleEntrypoint(applicationRPX));
@@ -194,6 +193,7 @@ void LoadMainExecutable()
 	}
 	free(baseRpxData);
 	debug_printf("RPXHash: 0x%08x\n", currentBaseApplicationHash);
+	return true;
 }
 
 fs::path getTitleSavePath()
@@ -357,7 +357,7 @@ uint32 LoadSharedData()
 
 void cemu_initForGame()
 {
-	gui_updateWindowTitles(false, true, 0.0);
+	WindowSystem::updateWindowTitles(false, true, 0.0);
 	// input manager apply game profile
 	InputManager::instance().apply_game_profile();
 	// log info for launched title
@@ -755,7 +755,12 @@ namespace CafeSystem
 				}
 			}
 		}
-		LoadMainExecutable();
+
+		if (!LoadMainExecutable())
+		{
+			return PREPARE_STATUS_CODE::INVALID_RPX;
+		}
+
 		return PREPARE_STATUS_CODE::SUCCESS;
 	}
 
@@ -855,7 +860,7 @@ namespace CafeSystem
 		PPCTimer_waitForInit();
 		// start system
 		sSystemRunning = true;
-		gui_notifyGameLoaded();
+		WindowSystem::notifyGameLoaded();
 		std::thread t(_LaunchTitleThread);
 		t.detach();
 	}

src/Cafe/Filesystem/FST/KeyCache.cpp

@@ -1,7 +1,6 @@
-#include <wx/msgdlg.h>
 #include <mutex>
-#include <gui/helpers/wxHelpers.h>
 
+#include "Cemu/Logging/CemuLogging.h"
 #include "config/ActiveSettings.h"
 #include "util/crypto/aes128.h"
 #include "Common/FileStream.h"
@@ -75,7 +74,7 @@ void KeyCache_Prepare()
 		}
 		else
 		{
-			wxMessageBox(_("Unable to create file keys.txt\nThis can happen if Cemu does not have write permission to its own directory, the disk is full or if anti-virus software is blocking Cemu."), _("Error"), wxOK | wxCENTRE | wxICON_ERROR);
+			cemuLog_log(LogType::Force, "Unable to create file keys.txt\nThis can happen if Cemu does not have write permission to its own directory, the disk is full or if anti-virus software is blocking Cemu.");
 		}
 		mtxKeyCache.unlock();
 		return;
@@ -108,8 +107,7 @@ void KeyCache_Prepare()
 			continue;
 		if( strishex(line) == false )
 		{
-			auto errorMsg = formatWxString(_("Error in keys.txt at line {}"), lineNumber);
-			wxMessageBox(errorMsg, _("Error"), wxOK | wxCENTRE | wxICON_ERROR);
+			cemuLog_log(LogType::Force, "Error in keys.txt at line {}", lineNumber);
 			continue;
 		}
 		if(line.size() == 32 )

src/Cafe/GraphicPack/GraphicPack2Patches.cpp

@@ -1,13 +1,11 @@
 #include "Cafe/GraphicPack/GraphicPack2.h"
+#include "Cemu/Logging/CemuLogging.h"
 #include "Common/FileStream.h"
 #include "util/helpers/StringParser.h"
 #include "Cemu/PPCAssembler/ppcAssembler.h"
 #include "Cafe/OS/RPL/rpl_structs.h"
 #include "boost/algorithm/string.hpp"
 
-#include "gui/wxgui.h" // for wxMessageBox
-#include "gui/helpers/wxHelpers.h"
-
 // error handler
 void PatchErrorHandler::printError(class PatchGroup* patchGroup, sint32 lineNumber, std::string_view errorMsg)
 {
@@ -38,15 +36,15 @@ void PatchErrorHandler::printError(class PatchGroup* patchGroup, sint32 lineNumb
 		errorMessages.emplace_back(msg);
 }
 
-void PatchErrorHandler::showStageErrorMessageBox()
+void PatchErrorHandler::logStageError()
 {
-	wxString errorMsg;
+	std::string errorMsg;
 	if (m_gp)
 	{
 		if (m_stage == STAGE::PARSER)
-			errorMsg.assign(formatWxString(_("Failed to load patches for graphic pack \'{}\'"), m_gp->GetName()));
+			errorMsg = fmt::format("Failed to load patches for graphic pack \'{}\'", m_gp->GetName());
 		else
-			errorMsg.assign(formatWxString(_("Failed to apply patches for graphic pack \'{}\'"), m_gp->GetName()));
+			errorMsg = fmt::format("Failed to apply patches for graphic pack \'{}\'", m_gp->GetName());
 	}
 	else
 	{
@@ -55,7 +53,7 @@ void PatchErrorHandler::showStageErrorMessageBox()
 	if (cemuLog_isLoggingEnabled(LogType::Patches))
 	{
 		errorMsg.append("\n \n")
-			.append(_("Details:"))
+			.append("Details:")
 			.append("\n");
 		for (auto& itr : errorMessages)
 		{
@@ -64,7 +62,7 @@ void PatchErrorHandler::showStageErrorMessageBox()
 		}
 	}
 
-	wxMessageBox(errorMsg, _("Graphic pack error"));
+	cemuLog_log(LogType::Force, errorMsg);
 }
 
 // loads Cemu-style patches (patch_<anything>.asm)

src/Cafe/GraphicPack/GraphicPack2PatchesApply.cpp

@@ -691,13 +691,13 @@ void GraphicPack2::ApplyPatchGroups(std::vector<PatchGroup*>& groups, const RPLM
 				patchContext.errorHandler.printError(nullptr, -1, "Some symbols could not be resolved because the dependency chain is too deep");
 			for (auto& itr : patchContext.unresolvedSymbols)
 				patchContext.errorHandler.printError(itr.patchGroup, itr.lineNumber, fmt::format("Unresolved symbol: {}", itr.symbolName));
-			patchContext.errorHandler.showStageErrorMessageBox();
+			patchContext.errorHandler.logStageError();
 			return;
 		}
 	}
 	if (!isUnresolvedPatchesEmpty() || patchContext.errorHandler.hasError())
 	{
-		patchContext.errorHandler.showStageErrorMessageBox();
+		patchContext.errorHandler.logStageError();
 		return;
 	}
 	// apply relocated patches

src/Cafe/GraphicPack/GraphicPackError.h

@@ -21,7 +21,7 @@ class PatchErrorHandler
 	}
 
 	void printError(class PatchGroup* patchGroup, sint32 lineNumber, std::string_view errorMsg);
-	void showStageErrorMessageBox();
+	void logStageError();
 
 	bool hasError() const { return m_anyErrorTriggered; };
 

src/Cafe/HW/Espresso/Debugger/Debugger.cpp

@@ -1,19 +1,20 @@
-#include "gui/guiWrapper.h"
+#include "Common/precompiled.h"
 #include "Debugger.h"
 #include "Cafe/OS/RPL/rpl_structs.h"
 #include "Cemu/PPCAssembler/ppcAssembler.h"
 #include "Cafe/HW/Espresso/Recompiler/PPCRecompiler.h"
 #include "Cemu/ExpressionParser/ExpressionParser.h"
 
-#include "gui/debugger/DebuggerWindow2.h"
-
 #include "Cafe/OS/libs/coreinit/coreinit.h"
+#include "OS/RPL/rpl.h"
 #include "util/helpers/helpers.h"
 
 #if BOOST_OS_WINDOWS
 #include <Windows.h>
 #endif
 
+DebuggerDispatcher g_debuggerDispatcher;
+
 debuggerState_t debuggerState{ };
 
 DebuggerBreakpoint* debugger_getFirstBP(uint32 address)
@@ -337,7 +338,7 @@ void debugger_toggleBreakpoint(uint32 address, bool state, DebuggerBreakpoint* b
 			{
 				bp->enabled = state;
 				debugger_updateExecutionBreakpoint(address);
-				debuggerWindow_updateViewThreadsafe2();
+				g_debuggerDispatcher.updateViewThreadsafe();
 			}
 			else if (bpItr->isMemBP())
 			{
@@ -359,7 +360,7 @@ void debugger_toggleBreakpoint(uint32 address, bool state, DebuggerBreakpoint* b
 					debugger_updateMemoryBreakpoint(bpItr);
 				else
 					debugger_updateMemoryBreakpoint(nullptr);
-				debuggerWindow_updateViewThreadsafe2();
+				g_debuggerDispatcher.updateViewThreadsafe();
 			}
 			return;
 		}
@@ -496,7 +497,7 @@ void debugger_stepInto(PPCInterpreter_t* hCPU, bool updateDebuggerWindow = true)
 	debugger_updateExecutionBreakpoint(initialIP);
 	debuggerState.debugSession.instructionPointer = hCPU->instructionPointer;
 	if(updateDebuggerWindow)
-		debuggerWindow_moveIP();
+		g_debuggerDispatcher.moveIP();
 	ppcRecompilerEnabled = isRecEnabled;
 }
 
@@ -515,15 +516,15 @@ bool debugger_stepOver(PPCInterpreter_t* hCPU)
 		// nothing to skip, use step-into
 		debugger_stepInto(hCPU);
 		debugger_updateExecutionBreakpoint(initialIP);
-		debuggerWindow_moveIP();
+		g_debuggerDispatcher.moveIP();
 		ppcRecompilerEnabled = isRecEnabled;
 		return false;
 	}
 	// create one-shot breakpoint at next instruction
 	debugger_createCodeBreakpoint(initialIP + 4, DEBUGGER_BP_T_ONE_SHOT);
 	// step over current instruction (to avoid breakpoint)
 	debugger_stepInto(hCPU);
-	debuggerWindow_moveIP();
+	g_debuggerDispatcher.moveIP();
 	// restore breakpoints
 	debugger_updateExecutionBreakpoint(initialIP);
 	// run
@@ -621,8 +622,8 @@ void debugger_enterTW(PPCInterpreter_t* hCPU)
 	DebuggerBreakpoint* singleshotBP = debugger_getFirstBP(debuggerState.debugSession.instructionPointer, DEBUGGER_BP_T_ONE_SHOT);
 	if (singleshotBP)
 		debugger_deleteBreakpoint(singleshotBP);
-	debuggerWindow_notifyDebugBreakpointHit2();
-	debuggerWindow_updateViewThreadsafe2();
+	g_debuggerDispatcher.notifyDebugBreakpointHit();
+	g_debuggerDispatcher.updateViewThreadsafe();
 	// reset step control
 	debuggerState.debugSession.stepInto = false;
 	debuggerState.debugSession.stepOver = false;
@@ -639,14 +640,14 @@ void debugger_enterTW(PPCInterpreter_t* hCPU)
 				break; // if true is returned, continue with execution
 			}
 			debugger_createPPCStateSnapshot(hCPU);
-			debuggerWindow_updateViewThreadsafe2();
+			g_debuggerDispatcher.updateViewThreadsafe();
 			debuggerState.debugSession.stepOver = false;
 		}
 		if (debuggerState.debugSession.stepInto)
 		{
 			debugger_stepInto(hCPU);
 			debugger_createPPCStateSnapshot(hCPU);
-			debuggerWindow_updateViewThreadsafe2();
+			g_debuggerDispatcher.updateViewThreadsafe();
 			debuggerState.debugSession.stepInto = false;
 			continue;
 		}
@@ -663,8 +664,8 @@ void debugger_enterTW(PPCInterpreter_t* hCPU)
 
 	debuggerState.debugSession.isTrapped = false;
 	debuggerState.debugSession.hCPU = nullptr;
-	debuggerWindow_updateViewThreadsafe2();
-	debuggerWindow_notifyRun();
+	g_debuggerDispatcher.updateViewThreadsafe();
+	g_debuggerDispatcher.notifyRun();
 }
 
 void debugger_shouldBreak(PPCInterpreter_t* hCPU)