From d113774a6d96a0776c2c35d2e9f39647fae43051 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 18 Oct 2022 02:11:52 +0200
Subject: [PATCH] Console improvements and new command

* Commented "ImGui::SetItemDefaultFocus()", this seems to somewhat fix the issue where the input field does not claim focus on console invocation.
* Added command "con_removeline" (removes lines from start to end index).
---
 r5dev/gameui/IConsole.cpp  | 46 ++++++++++++++++++++++++++++++++++++--
 r5dev/gameui/IConsole.h    |  1 +
 r5dev/tier1/cmd.cpp        |  1 +
 r5dev/vstdlib/callback.cpp | 22 ++++++++++++++++++
 r5dev/vstdlib/callback.h   |  1 +
 5 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 8ad01a3a..2fe4fcb7 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -149,7 +149,7 @@ void CConsole::Think(void)
 {
     if (m_bActivate)
     {
-        if (m_flFadeAlpha <= 1.f)
+        if (m_flFadeAlpha < 1.f)
         {
             m_flFadeAlpha += .1f;
         }
@@ -254,7 +254,7 @@ void CConsole::DrawSurface(void)
     }
 
     // Auto-focus on window apparition.
-    ImGui::SetItemDefaultFocus();
+    //ImGui::SetItemDefaultFocus();
 
     // Auto-focus previous widget.
     if (m_bReclaimFocus)
@@ -915,6 +915,48 @@ void CConsole::AddLog(const ImVec4& color, const char* fmt, ...) IM_FMTARGS(2)
     m_Logger.InsertText(ConLog_t(Strdup(buf), color));
 }
 
+//-----------------------------------------------------------------------------
+// Purpose: removes lines from console with sanitized start and end indices
+// input  : nStart - 
+//          nEnd - 
+//-----------------------------------------------------------------------------
+void CConsole::RemoveLog(int nStart, int nEnd)
+{
+    int nLines = m_Logger.GetTotalLines();
+    if (nEnd >= nLines)
+    {
+        // Sanitize for last array elem.
+        nEnd = (nLines - 1);
+    }
+
+    if (nStart >= nEnd)
+    {
+        if (nEnd > 0)
+        {
+            nStart = (nEnd - 1);
+        }
+        else
+        {
+            // First elem cannot be removed!
+            return;
+        }
+    }
+    else if (nStart < 0)
+    {
+        nStart = 0;
+    }
+
+    // User wants to remove everything.
+    if (nLines <= (nStart - nEnd))
+    {
+        ClearLog();
+        return;
+    }
+
+    std::lock_guard<std::mutex> l(m_Mutex);
+    m_Logger.RemoveLine(nStart, nEnd);
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: clears the entire log vector
 //-----------------------------------------------------------------------------
diff --git a/r5dev/gameui/IConsole.h b/r5dev/gameui/IConsole.h
index 9e22b1aa..1f24e076 100644
--- a/r5dev/gameui/IConsole.h
+++ b/r5dev/gameui/IConsole.h
@@ -47,6 +47,7 @@ private:
     ///////////////////////////////////////////////////////////////////////////
 public:
     void AddLog(const ConLog_t& conLog);
+    void RemoveLog(int nStart, int nEnd);
 
 private:
     void AddLog(const ImVec4& color, const char* fmt, ...) IM_FMTARGS(2);
diff --git a/r5dev/tier1/cmd.cpp b/r5dev/tier1/cmd.cpp
index f6700c2a..12ffe519 100644
--- a/r5dev/tier1/cmd.cpp
+++ b/r5dev/tier1/cmd.cpp
@@ -351,6 +351,7 @@ void ConCommand::Init(void)
 	ConCommand::Create("cl_showbrowser", "Opens the server browser.", FCVAR_CLIENTDLL | FCVAR_RELEASE, ServerBrowser_Invoke_f, nullptr);
 	ConCommand::Create("rcon", "Forward RCON query to remote server. | Usage: rcon \"<query>\".", FCVAR_CLIENTDLL | FCVAR_RELEASE, RCON_CmdQuery_f, nullptr);
 	ConCommand::Create("rcon_disconnect", "Disconnect from RCON server.", FCVAR_CLIENTDLL | FCVAR_RELEASE, RCON_Disconnect_f, nullptr);
+	ConCommand::Create("con_removeline", "Removes a range of lines from the console.", FCVAR_CLIENTDLL | FCVAR_RELEASE, CON_RemoveLine_f, nullptr);
 	//-------------------------------------------------------------------------
 	// UI DLL                                                                 |
 	ConCommand::Create("script_ui", "Run input code as UI script on the VM.", FCVAR_CLIENTDLL | FCVAR_CHEAT, SQVM_UIScript_f, nullptr);
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 55e9d352..8a14a2f7 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -628,6 +628,28 @@ void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float f
 	}
 }
 #ifndef DEDICATED
+/*
+=====================
+CON_RemoveLine_f
+
+  Removes a range of lines
+  from the console.
+=====================
+*/
+void CON_RemoveLine_f(const CCommand& args)
+{
+	if (args.ArgC() < 3)
+	{
+		DevMsg(eDLL_T::CLIENT, "Usage 'con_removeline': start(int) end(int)\n");
+		return;
+	}
+
+	int start = atoi(args[1]);
+	int end = atoi(args[2]);
+
+	g_pConsole->RemoveLog(start, end);
+}
+
 /*
 =====================
 RCON_CmdQuery_f
diff --git a/r5dev/vstdlib/callback.h b/r5dev/vstdlib/callback.h
index a6b8016b..61f32952 100644
--- a/r5dev/vstdlib/callback.h
+++ b/r5dev/vstdlib/callback.h
@@ -38,6 +38,7 @@ void NET_SetKey_f(const CCommand& args);
 void NET_GenerateKey_f(const CCommand& args);
 void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue);
 #ifndef DEDICATED
+void CON_RemoveLine_f(const CCommand& args);
 void RCON_CmdQuery_f(const CCommand& args);
 void RCON_Disconnect_f(const CCommand& args);
 #endif // !DEDICATED