Added all options menus

game/check-content-hash.py

@@ -56,7 +56,7 @@ def main():
 	with open(os.path.join(SCRIPT_DIR, "content-hash.txt"), "r") as in_file:
 		content_hash = in_file.read().strip()
 
-	content_hash_match = re.match(r"^([^\s-]+)-([0-9a-f]{40})(-dirty)?$", content_hash)
+	content_hash_match = re.match(r"^([^\s]+)-([0-9a-f]{40})(-dirty)?$", content_hash)
 
 	if not content_hash_match:
 		raise RuntimeError(f"Could not parse hash from content-hash.txt. Output:\n{content_hash}")

game/content-hash.txt

@@ -1 +1 @@
-master-58bb220e7886c291bc5f8f7aa7322e2314b33329
+master-c3312fa76076c1b2e32b7e4bf49ac647e6c5f87c

game/game_libs/ui/menus/Controls.cpp

@@ -284,7 +284,7 @@ void CMenuControls::ResetKeysList(void)
 
 	if ( !afile )
 	{
-		Con_Printf("UI_Parse_KeysList: kb_act.lst not found\n");
+		Con_Printf("UI_Parse_KeysList: kb_def.lst not found\n");
 		return;
 	}
 
@@ -420,17 +420,20 @@ void CMenuControls::_Init(void)
 		L("Adv. Controls"),
 		L("Change mouse sensitivity, enable autoaim, mouselook and crosshair"),
 		PC_ADV_CONTROLS,
-		UI_AdvControls_Menu);
+		UI_AdvControls_Menu
+	);
 	AddButton(
 		L("GameUI_OK"),
 		L("Save changed and return to configuration menu"),
 		PC_DONE,
-		VoidCb(&CMenuControls::SaveAndPopMenu));
+		VoidCb(&CMenuControls::SaveAndPopMenu)
+	);
 	AddButton(
 		L("GameUI_Cancel"),
 		L("Discard changes and return to configuration menu"),
 		PC_CANCEL,
-		VoidCb(&CMenuControls::Cancel));
+		VoidCb(&CMenuControls::Cancel)
+	);
 	AddItem(keysList);
 }
 

game/game_libs/ui_new/CMakeLists.txt

@@ -12,22 +12,49 @@ include(nf_utils)
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 
 set(SOURCES_UI
+	src/components/ModalComponent.h
+	src/components/ModalComponent.cpp
+	src/framework/BaseComponent.h
+	src/framework/BaseComponent.cpp
 	src/framework/BaseMenu.h
 	src/framework/BaseMenu.cpp
-	src/framework/DataBinding.h
+	src/framework/BaseTableModel.h
+	src/framework/BaseTemplateBinding.h
+	src/framework/CvarAccessor.h
+	src/framework/CvarDataVar.h
+	src/framework/DataVar.h
+	src/framework/DocumentObserver.h
+	src/framework/DocumentObserver.cpp
+	src/framework/ElementFinder.h
+	src/framework/ElementFinder.cpp
+	src/framework/EventListenerObject.h
 	src/framework/MenuDirectory.h
 	src/framework/MenuDirectory.cpp
+	src/framework/MenuPage.h
+	src/framework/MenuPage.cpp
 	src/framework/MenuStack.h
 	src/framework/MenuStack.cpp
+	src/menus/options/AvOptionsMenu.h
+	src/menus/options/AvOptionsMenu.cpp
+	src/menus/options/BaseOptionsMenu.h
+	src/menus/options/BaseOptionsMenu.cpp
+	src/menus/options/GameplayOptionsMenu.h
+	src/menus/options/GameplayOptionsMenu.cpp
+	src/menus/options/KeysOptionsMenu.h
+	src/menus/options/KeysOptionsMenu.cpp
+	src/menus/options/MouseOptionsMenu.h
+	src/menus/options/MouseOptionsMenu.cpp
 	src/menus/MainMenu.h
 	src/menus/MainMenu.cpp
 	src/menus/MainMenu.cpp
 	src/menus/MultiplayerMenu.h
 	src/menus/MultiplayerMenu.cpp
-	src/menus/OptionsMenu.h
-	src/menus/OptionsMenu.cpp
-	src/menus/ZooMenu.h
-	src/menus/ZooMenu.cpp
+	src/models/CvarModel.h
+	src/models/CvarModel.cpp
+	src/models/KeyBindingModel.h
+	src/models/KeyBindingModel.cpp
+	src/models/VideoModesModel.h
+	src/models/VideoModesModel.cpp
 	src/rmlui/EventListenerImpl.h
 	src/rmlui/EventListenerImpl.cpp
 	src/rmlui/EventListenerInstancerImpl.h
@@ -42,9 +69,13 @@ set(SOURCES_UI
 	src/rmlui/SystemInterfaceImpl.cpp
 	src/rmlui/TextInputHandlerImpl.h
 	src/rmlui/TextInputHandlerImpl.cpp
-	src/templatebindings/BaseTemplateBinding.h
+	src/rmlui/Utils.h
+	src/rmlui/Utils.cpp
 	src/templatebindings/MenuFrameDataBinding.h
 	src/templatebindings/MenuFrameDataBinding.cpp
+	src/templatebindings/OptionsTabBarDataBinding.h
+	src/templatebindings/OptionsTabBarDataBinding.cpp
+	src/utils/InFilePtr.h
 	src/udll_int.h
 	src/udll_int.cpp
 	src/UIDebug.h
@@ -61,6 +92,7 @@ target_link_libraries(${TARGETNAME_LIB_UI} PRIVATE
 	${TARGETNAME_LIB_ENGINEPUBLICAPI}
 	${TARGETNAME_LIB_ENGINEINTERNALAPI}
 	${TARGETNAME_LIB_RMLUI}
+	${TARGETNAME_LIB_CRTLIB}
 )
 
 set_common_library_compiler_settings(${TARGETNAME_LIB_UI})

game/game_libs/ui_new/src/UIDebug.h

@@ -1,14 +1,17 @@
 #pragma once
 
 #include <stdlib.h>
+#include <RmlUi/Core/Log.h>
 
 #ifdef _DEBUG
 void UIDBG_AssertFunction(bool fExpr, const char* szExpr, const char* szFile, int szLine, const char* szMessage);
 #define ASSERT(f) UIDBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL)
 #define ASSERTSZ(f, sz) UIDBG_AssertFunction(f, #f, __FILE__, __LINE__, sz)
 #define ASSERTSZ_Q(f, sz) UIDBG_AssertFunction(f, #f, __FILE__, __LINE__, sz, false)
+#define RML_DBGLOG(level, ...) Rml::Log::Message((level), __VA_ARGS__)
 #else  // !DEBUG
 #define ASSERT(f)
 #define ASSERTSZ(f, sz)
 #define ASSERTSZ_Q(f, sz)
+#define RML_DBGLOG(level, ...)
 #endif  // !DEBUG

game/game_libs/ui_new/src/components/ModalComponent.cpp

@@ -0,0 +1,163 @@
+#include "components/ModalComponent.h"
+#include <RmlUi/Core/ElementDocument.h>
+#include <RmlUi/Core/StringUtilities.h>
+#include "framework/ElementFinder.h"
+
+static constexpr const char* const PARAM_TITLE = "title";
+static constexpr const char* const PARAM_BUTTONS = "buttons";
+
+ModalComponent::ModalComponent(BaseMenu* parentMenu, Rml::String id) :
+	BaseComponent(parentMenu, std::move(id)),
+	m_ButtonEventListener(this, &ModalComponent::HandleButtonEvent)
+{
+	AddParamSpec(PARAM_TITLE, Rml::Variant(""));
+	AddParamSpec(PARAM_BUTTONS, Rml::Variant(""));
+}
+
+void ModalComponent::SetTitle(const Rml::String& title)
+{
+	ASSERTSZ(m_Elems.modalHeader, "SetTitle called before modal elements were loaded");
+
+	if ( !m_Elems.modalHeader )
+	{
+		return;
+	}
+
+	if ( !title.empty() )
+	{
+		m_Elems.modalHeader->SetInnerRML("<h2>" + Rml::StringUtilities::EncodeRml(title) + "</h2>");
+	}
+	else
+	{
+		m_Elems.modalHeader->SetInnerRML("");
+	}
+}
+
+void ModalComponent::SetContentsRml(const Rml::String& rml)
+{
+	ASSERTSZ(m_Elems.modalBody, "SetContentsRml called before modal elements were loaded");
+
+	if ( !m_Elems.modalBody )
+	{
+		return;
+	}
+
+	m_Elems.modalBody->SetInnerRML(rml);
+}
+
+void ModalComponent::SetButtons(const Rml::StringList& buttons)
+{
+	ASSERTSZ(m_Elems.modalFooter, "SetButtons called before modal elements were loaded");
+
+	if ( !m_Elems.modalFooter )
+	{
+		return;
+	}
+
+	m_Elems.buttons.clear();
+
+	while ( m_Elems.modalFooter->HasChildNodes() )
+	{
+		m_Elems.modalFooter->RemoveChild(m_Elems.modalFooter->GetFirstChild());
+	}
+
+	Rml::String rmlString = "";
+
+	for ( const Rml::String& button : buttons )
+	{
+		rmlString += "<button class=\"primary\">" + Rml::StringUtilities::EncodeRml(button) + "</button>";
+	}
+
+	m_Elems.modalFooter->SetInnerRML(rmlString);
+	m_Elems.buttons.reserve(m_Elems.modalFooter->GetNumChildren());
+
+	for ( Rml::Element* child = m_Elems.modalFooter->GetFirstChild(); child; child = child->GetNextSibling() )
+	{
+		m_Elems.buttons.push_back(child);
+		child->AddEventListener(Rml::EventId::Click, &m_ButtonEventListener);
+		child->AddEventListener(Rml::EventId::Mouseup, &m_ButtonEventListener);
+	}
+}
+
+void ModalComponent::SetButtonClickCallback(ButtonClickCallback callback)
+{
+	m_ButtonClickCallback = std::move(callback);
+}
+
+const Rml::Variant& ModalComponent::UserData() const
+{
+	return m_UserData;
+}
+
+void ModalComponent::SetUserData(Rml::Variant data)
+{
+	m_UserData = std::move(data);
+}
+
+bool ModalComponent::OnLoadFromDocument(Rml::ElementDocument*)
+{
+	ElementFinder finder;
+
+	finder.Add(ComponentElementPtrPtr(), ".modal-shade", &m_Elems.shade);
+	finder.Add(&m_Elems.shade, "modal", &m_Elems.modal);
+	finder.Add(&m_Elems.modal, ".modal-header", &m_Elems.modalHeader);
+	finder.Add(&m_Elems.modal, ".modal-body", &m_Elems.modalBody);
+	finder.Add(&m_Elems.modal, ".modal-footer", &m_Elems.modalFooter);
+
+	if ( !finder.FindAll() )
+	{
+		return false;
+	}
+
+	LoadParams();
+	return true;
+}
+
+void ModalComponent::OnUnload()
+{
+	for ( Rml::Element* button : m_Elems.buttons )
+	{
+		button->RemoveEventListener(Rml::EventId::Click, &m_ButtonEventListener);
+		button->RemoveEventListener(Rml::EventId::Mouseup, &m_ButtonEventListener);
+	}
+
+	m_Elems = Elements {};
+}
+
+void ModalComponent::LoadParams()
+{
+	SetTitle(GetParam(PARAM_TITLE).Get<Rml::String>());
+
+	const Rml::String buttons = GetParam(PARAM_BUTTONS).Get<Rml::String>();
+
+	if ( !buttons.empty() )
+	{
+		m_Elems.buttons.clear();
+
+		Rml::StringList buttonsList;
+		Rml::StringUtilities::ExpandString(buttonsList, buttons, ';');
+		SetButtons(buttonsList);
+	}
+}
+
+void ModalComponent::HandleButtonEvent(Rml::Event& event)
+{
+	if ( !m_ButtonClickCallback )
+	{
+		return;
+	}
+
+	Rml::Element* button = event.GetTargetElement();
+	const auto buttonIt = std::find(m_Elems.buttons.begin(), m_Elems.buttons.end(), button);
+
+	// We should only get events for buttons we know about.
+	ASSERT(buttonIt != m_Elems.buttons.end());
+
+	if ( buttonIt == m_Elems.buttons.end() )
+	{
+		return;
+	}
+
+	event.StopPropagation();
+	m_ButtonClickCallback(event, buttonIt - m_Elems.buttons.begin(), m_UserData);
+}

game/game_libs/ui_new/src/components/ModalComponent.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include "framework/BaseComponent.h"
+#include "framework/EventListenerObject.h"
+#include <functional>
+
+class ModalComponent : public BaseComponent
+{
+public:
+	using ButtonClickCallback =
+		std::function<void(Rml::Event& /*event*/, size_t /*buttonIndex*/, const Rml::Variant& /*userData*/)>;
+
+	explicit ModalComponent(BaseMenu* parentMenu, Rml::String id);
+
+	void SetTitle(const Rml::String& title);
+	void SetContentsRml(const Rml::String& rml);
+	void SetButtons(const Rml::StringList& buttons);
+	void SetButtonClickCallback(ButtonClickCallback callback);
+
+	const Rml::Variant& UserData() const;
+	void SetUserData(Rml::Variant data);
+
+protected:
+	bool OnLoadFromDocument(Rml::ElementDocument* document) override;
+	void OnUnload() override;
+
+private:
+	struct Elements
+	{
+		Rml::Element* shade = nullptr;
+		Rml::Element* modal = nullptr;
+		Rml::Element* modalHeader = nullptr;
+		Rml::Element* modalBody = nullptr;
+		Rml::Element* modalFooter = nullptr;
+		Rml::ElementList buttons;
+	};
+
+	void LoadParams();
+	void HandleButtonEvent(Rml::Event& event);
+
+	Elements m_Elems {};
+	ButtonClickCallback m_ButtonClickCallback;
+	EventListenerObject m_ButtonEventListener;
+	Rml::Variant m_UserData;
+};