Restructuring (#365)

* Remove launcher proxy

* Restructuring

* More restructuring

* Fix include dirs

* Fix merge

* Remove clang thing

* Filters

* Oops

1 files changed, 92 insertions, 0 deletions

diff --git a/NorthstarDLL/logging/sourceconsole.cpp b/NorthstarDLL/logging/sourceconsole.cpp
new file mode 100644
index 00000000..62b41e1a
--- /dev/null
+++ b/NorthstarDLL/logging/sourceconsole.cpp
@@ -0,0 +1,92 @@
+#include "pch.h"
+#include "core/convar/convar.h"
+#include "sourceconsole.h"
+#include "shared/sourceinterface.h"
+#include "core/convar/concommand.h"
+#include "util/printcommands.h"
+
+SourceInterface<CGameConsole>* g_pSourceGameConsole;
+
+void ConCommand_toggleconsole(const CCommand& arg)
+{
+	if ((*g_pSourceGameConsole)->IsConsoleVisible())
+		(*g_pSourceGameConsole)->Hide();
+	else
+		(*g_pSourceGameConsole)->Activate();
+}
+
+void ConCommand_showconsole(const CCommand& arg)
+{
+	(*g_pSourceGameConsole)->Activate();
+}
+
+void ConCommand_hideconsole(const CCommand& arg)
+{
+	(*g_pSourceGameConsole)->Hide();
+}
+
+void SourceConsoleSink::custom_sink_it_(const custom_log_msg& msg)
+{
+	if (!(*g_pSourceGameConsole)->m_bInitialized)
+		return;
+
+	spdlog::memory_buf_t formatted;
+	spdlog::sinks::base_sink<std::mutex>::formatter_->format(msg, formatted);
+
+	// get message string
+	std::string str = fmt::to_string(formatted);
+
+	SourceColor levelColor = m_LogColours[msg.level];
+	std::string name {msg.logger_name.begin(), msg.logger_name.end()};
+
+	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->ColorPrint(msg.origin->SRCColor, ("[" + name + "]").c_str());
+	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(" ");
+	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->ColorPrint(levelColor, ("[" + std::string(level_names[msg.level]) + "]").c_str());
+	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(" ");
+	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(fmt::to_string(formatted).c_str());
+}
+
+void SourceConsoleSink::sink_it_(const spdlog::details::log_msg& msg)
+{
+	throw std::runtime_error("sink_it_ called on SourceConsoleSink with pure log_msg. This is an error!");
+}
+
+void SourceConsoleSink::flush_() {}
+
+// clang-format off
+HOOK(OnCommandSubmittedHook, OnCommandSubmitted, 
+void, __fastcall, (CConsoleDialog* consoleDialog, const char* pCommand))
+// clang-format on
+{
+	consoleDialog->m_pConsolePanel->Print("] ");
+	consoleDialog->m_pConsolePanel->Print(pCommand);
+	consoleDialog->m_pConsolePanel->Print("\n");
+
+	TryPrintCvarHelpForCommand(pCommand);
+
+	OnCommandSubmitted(consoleDialog, pCommand);
+}
+
+// called from sourceinterface.cpp in client createinterface hooks, on GameClientExports001
+void InitialiseConsoleOnInterfaceCreation()
+{
+	(*g_pSourceGameConsole)->Initialize();
+	// hook OnCommandSubmitted so we print inputted commands
+	OnCommandSubmittedHook.Dispatch((*g_pSourceGameConsole)->m_pConsole->m_vtable->OnCommandSubmitted);
+
+	auto consoleSink = std::make_shared<SourceConsoleSink>();
+	if (g_bSpdLog_UseAnsiColor)
+		consoleSink->set_pattern("%v"); // no need to include the level in the game console, the text colour signifies it anyway
+	else
+		consoleSink->set_pattern("[%n] [%l] %v"); // no colour, so we should show the level for colourblind people
+	RegisterCustomSink(consoleSink);
+}
+
+ON_DLL_LOAD_CLIENT_RELIESON("client.dll", SourceConsole, ConCommand, (CModule module))
+{
+	g_pSourceGameConsole = new SourceInterface<CGameConsole>("client.dll", "GameConsole004");
+
+	RegisterConCommand("toggleconsole", ConCommand_toggleconsole, "Show/hide the console.", FCVAR_DONTRECORD);
+	RegisterConCommand("showconsole", ConCommand_showconsole, "Show the console.", FCVAR_DONTRECORD);
+	RegisterConCommand("hideconsole", ConCommand_hideconsole, "Hide the console.", FCVAR_DONTRECORD);
+}