mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
48c2401cf9
Fix a rare crash that occurs in AMD driver code, when ImGui shutdown was called. The crash did not occur if the library was shutdown after having rendered one of the ImGui panels for one frame. The fix is to just never call 'ImGui_ImplDX11_NewFrame()', 'ImGui_ImplWin32_NewFrame()' and 'ImGui::NewFrame()', 'ImGui::EndFrame()', 'ImGui::Render()' if none of the windows are visible. code has been tested on a system that would trigger the crash, and after the patch, the crash no longer happened.
115 lines
3.7 KiB
C++
115 lines
3.7 KiB
C++
#pragma once
|
|
#ifndef DEDICATED
|
|
#include "common/sdkdefs.h"
|
|
#include "windows/resource.h"
|
|
#include "public/isurfacesystem.h"
|
|
#include "thirdparty/imgui/misc/imgui_logger.h"
|
|
#include "thirdparty/imgui/misc/imgui_utility.h"
|
|
|
|
class CConsole : public ISurface
|
|
{
|
|
public:
|
|
///////////////////////////////////////////////////////////////////////////
|
|
CConsole(void);
|
|
virtual ~CConsole(void);
|
|
|
|
virtual bool Init(void);
|
|
virtual void Think(void);
|
|
|
|
virtual void RunFrame(void);
|
|
virtual void RunTask(void);
|
|
|
|
virtual void DrawSurface(void);
|
|
|
|
private:
|
|
void OptionsPanel(void);
|
|
void SuggestPanel(void);
|
|
|
|
bool AutoComplete(void);
|
|
void ResetAutoComplete(void);
|
|
void ClearAutoComplete(void);
|
|
|
|
void FindFromPartial(void);
|
|
void ProcessCommand(string svCommand);
|
|
|
|
void BuildSummary(string svConVar = "");
|
|
void BuildInputFromSelected(const CSuggest& suggest, string& svInput);
|
|
void BuildSuggestPanelRect(void);
|
|
|
|
void ClampLogSize(void);
|
|
void ClampHistorySize(void);
|
|
|
|
bool LoadFlagIcons(void);
|
|
int GetFlagTextureIndex(int nFlags) const;
|
|
|
|
int TextEditCallback(ImGuiInputTextCallbackData* pData);
|
|
static int TextEditCallbackStub(ImGuiInputTextCallbackData* pData);
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
public:
|
|
void AddLog(const ConLog_t& conLog);
|
|
void RemoveLog(int nStart, int nEnd);
|
|
void ClearLog(void);
|
|
|
|
vector<string> GetHistory(void) const;
|
|
void ClearHistory(void);
|
|
|
|
inline bool IsVisible() { return m_flFadeAlpha > 0.0f; }
|
|
|
|
private: // Internal only.
|
|
void AddLog(const ImVec4& color, const char* fmt, ...) /*IM_FMTARGS(2)*/;
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
virtual void SetStyleVar(void);
|
|
|
|
private:
|
|
///////////////////////////////////////////////////////////////////////////
|
|
const char* m_pszConsoleLabel;
|
|
const char* m_pszLoggingLabel;
|
|
char m_szInputBuf[512];
|
|
char m_szSummary[512];
|
|
char m_szWindowLabel[512];
|
|
|
|
string m_svInputConVar;
|
|
ssize_t m_nHistoryPos;
|
|
ssize_t m_nSuggestPos;
|
|
int m_nScrollBack;
|
|
int m_nSelectBack;
|
|
int m_nInputTextLen;
|
|
float m_flScrollX;
|
|
float m_flScrollY;
|
|
float m_flFadeAlpha;
|
|
|
|
bool m_bInitialized;
|
|
bool m_bReclaimFocus;
|
|
bool m_bCopyToClipBoard;
|
|
bool m_bModifyInput;
|
|
|
|
bool m_bCanAutoComplete;
|
|
bool m_bSuggestActive;
|
|
bool m_bSuggestMoved;
|
|
bool m_bSuggestUpdate;
|
|
|
|
vector<CSuggest> m_vSuggest;
|
|
vector<MODULERESOURCE> m_vFlagIcons;
|
|
vector<string> m_vHistory;
|
|
|
|
ImGuiStyle_t m_Style;
|
|
ImVec2 m_ivSuggestWindowPos;
|
|
ImVec2 m_ivSuggestWindowSize;
|
|
CTextLogger m_Logger;
|
|
mutable std::mutex m_Mutex;
|
|
|
|
ImGuiInputTextFlags m_nInputFlags;
|
|
ImGuiWindowFlags m_nSuggestFlags;
|
|
ImGuiWindowFlags m_nLoggingFlags;
|
|
|
|
public:
|
|
bool m_bActivate = false;
|
|
vector<CSuggest> m_vsvCommandBases;
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
extern CConsole* g_pConsole;
|
|
#endif // !DEDICATED
|