LunaSVG: add custom font support

Client/mods/deathmatch/logic/CClientVectorGraphic.cpp

@@ -54,6 +54,10 @@ bool CClientVectorGraphic::SetDocument(CXMLNode* node)
     m_pXMLDocument = node;
     m_pSVGDocument = lunasvg::Document::loadFromData(node->ToString());
 
+    // Check if LunaSVG successfully parsed the document
+    if (!m_pSVGDocument)
+        return false;
+
     m_pVectorGraphicDisplay->Update();
 
     return true;

Client/mods/deathmatch/logic/CClientVectorGraphicDisplay.cpp

@@ -92,6 +92,10 @@ void CClientVectorGraphicDisplay::UpdateTexture()
     if (!surface)
         return;
 
+    // Check for valid SVG dimensions to avoid division by zero
+    if (svgDocument->width() <= 0 || svgDocument->height() <= 0)
+        return;
+
     // SVG has a predefined width and height. We need transform it to the requested size
     const Matrix transformationMatrix(pVectorGraphicItem->m_uiSizeX / svgDocument->width(), 0, 0, pVectorGraphicItem->m_uiSizeY / svgDocument->height(), 0, 0);
 

Client/mods/deathmatch/logic/CResource.cpp

@@ -13,6 +13,7 @@
 #define DECLARE_PROFILER_SECTION_CResource
 #include "profiler/SharedUtil.Profiler.h"
 #include "CServerIdManager.h"
+#include "CSVGFontManager.h"
 
 using namespace std;
 
@@ -94,6 +95,9 @@ CResource::CResource(unsigned short usNetID, const char* szResourceName, CClient
 
 CResource::~CResource()
 {
+    // Unregister SVG fonts registered by this resource
+    CSVGFontManager::GetSingleton().UnregisterResourceFonts(this);
+
     // Remove refrences from requested models
     m_modelStreamer.ReleaseAll();
 

Client/mods/deathmatch/logic/CSVGFontManager.cpp

@@ -0,0 +1,139 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+#include "StdInc.h"
+#include "CSVGFontManager.h"
+#include <lunasvg.h>
+#include <ranges>
+
+CSVGFontManager& CSVGFontManager::GetSingleton()
+{
+    static CSVGFontManager instance;
+    return instance;
+}
+
+void CSVGFontManager::FontDataDestroyCallback(void* pData)
+{
+    // We don't need to worry about our own tracking here (already handled), just free the memory
+    delete[] static_cast<char*>(pData);
+}
+
+bool CSVGFontManager::RegisterFont(const SString& strFontFamily, const SString& strFontPath, CResource* pResource)
+{
+    if (strFontFamily.empty() || strFontPath.empty() || !pResource)
+        return false;
+
+    if (IsFontRegistered(strFontFamily))
+        return false;
+
+    SString strAbsPath;
+    SString strMetaPath;
+
+    CResource* pFileResource = pResource;
+    if (!g_pClientGame->GetResourceManager()->ParseResourcePathInput(strFontPath, pFileResource, &strAbsPath, &strMetaPath))
+        return false;
+
+    if (!FileExists(strAbsPath))
+        return false;
+
+    // Get file size
+    uint64 fileSize = FileSize(strAbsPath);
+    if (fileSize == 0 || fileSize > 10 * 1024 * 1024) // max 10MB
+        return false;
+
+    // Allocate memory for font data that will be owned by LunaSVG
+    size_t dataSize = static_cast<size_t>(fileSize);
+    char* pFontData = new (std::nothrow) char[dataSize];
+    if (!pFontData)
+        return false;
+
+    // Read file directly into our allocated buffer
+    FILE* pFile = File::Fopen(strAbsPath, "rb");
+    if (!pFile)
+    {
+        delete[] pFontData;
+        return false;
+    }
+
+    size_t bytesRead = fread(pFontData, 1, dataSize, pFile);
+    fclose(pFile);
+
+    if (bytesRead != dataSize)
+    {
+        delete[] pFontData;
+        return false;
+    }
+
+    // Register font with LunaSVG using data API
+    // LunaSVG takes ownership of the data, we provide a callback to implement destruct behaviour, and notify when we're done
+    if (!lunasvg_add_font_face_from_data(strFontFamily.c_str(), false, false, pFontData, dataSize, FontDataDestroyCallback, pFontData))
+    {
+        // Registration failed, clean up the memory ourselves
+        delete[] pFontData;
+        return false;
+    }
+
+    // Store font info for tracking
+    SFontInfo fontInfo;
+    fontInfo.strOriginalPath = strFontPath;
+    fontInfo.strAbsolutePath = strAbsPath;
+    fontInfo.pOwnerResource = pResource;
+
+    m_RegisteredFonts[strFontFamily] = std::move(fontInfo);
+
+    return true;
+}
+
+bool CSVGFontManager::UnregisterFont(const SString& strFontFamily)
+{
+    auto it = m_RegisteredFonts.find(strFontFamily);
+    if (it == m_RegisteredFonts.end())
+        return false;
+
+    // TODO: unregister font face with lunasvg here (see https://github.com/sammycage/lunasvg/issues/258)
+    m_RegisteredFonts.erase(it);
+    return true;
+}
+
+bool CSVGFontManager::IsFontRegistered(const SString& strFontFamily) const
+{
+    return m_RegisteredFonts.contains(strFontFamily);
+}
+
+CResource* CSVGFontManager::GetFontOwnerResource(const SString& strFontFamily) const
+{
+    auto it = m_RegisteredFonts.find(strFontFamily);
+    if (it != m_RegisteredFonts.end())
+        return it->second.pOwnerResource;
+    return nullptr;
+}
+
+void CSVGFontManager::UnregisterResourceFonts(CResource* pResource)
+{
+    if (!pResource)
+        return;
+
+    // Collect fonts to remove
+    std::vector<SString> fontsToRemove;
+    for (const auto& pair : m_RegisteredFonts)
+    {
+        if (pair.second.pOwnerResource == pResource)
+            fontsToRemove.push_back(pair.first);
+    }
+
+    // Remove collected fonts from our tracking
+    for (const auto& fontFamily : fontsToRemove)
+        UnregisterFont(fontFamily);
+}
+
+std::vector<SString> CSVGFontManager::GetRegisteredFonts() const
+{
+    auto keys = std::views::keys(m_RegisteredFonts);
+    return {keys.begin(), keys.end()};
+}

Client/mods/deathmatch/logic/CSVGFontManager.h

@@ -0,0 +1,49 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+#pragma once
+
+#include <string>
+#include <map>
+#include <vector>
+
+class CResource;
+
+class CSVGFontManager
+{
+public:
+    struct SFontInfo
+    {
+        SString    strOriginalPath;    // Original resource path for debugging
+        SString    strAbsolutePath;    // Absolute path to font file
+        CResource* pOwnerResource;     // Resource that registered this font
+    };
+
+    static CSVGFontManager& GetSingleton();
+
+
+    bool RegisterFont(const SString& strFontFamily, const SString& strFontPath, CResource* pResource);
+    bool UnregisterFont(const SString& strFontFamily);
+    bool IsFontRegistered(const SString& strFontFamily) const;
+    CResource* GetFontOwnerResource(const SString& strFontFamily) const;
+    void UnregisterResourceFonts(CResource* pResource);
+    std::vector<SString> GetRegisteredFonts() const;
+
+private:
+    CSVGFontManager() = default;
+    ~CSVGFontManager() = default;
+
+    CSVGFontManager(const CSVGFontManager&) = delete;
+    CSVGFontManager& operator=(const CSVGFontManager&) = delete;
+
+    static void FontDataDestroyCallback(void* pData);
+
+    // Fonts we're currently tracking (owned by resources)
+    std::map<SString, SFontInfo> m_RegisteredFonts;
+};

Client/mods/deathmatch/logic/luadefs/CLuaVectorGraphicDefs.cpp

@@ -10,6 +10,7 @@
 #include "StdInc.h"
 #include "lua/CLuaFunctionParser.h"
 #include "CLuaVectorGraphicDefs.h"
+#include "../CSVGFontManager.h"
 
 void CLuaVectorGraphicDefs::LoadFunctions()
 {
@@ -20,7 +21,8 @@ void CLuaVectorGraphicDefs::LoadFunctions()
         {"svgGetSize", ArgumentParser<SVGGetSize>},
         {"svgSetSize", ArgumentParser<SVGSetSize>},
         {"svgSetUpdateCallback", ArgumentParser<SVGSetUpdateCallback>},
-
+        {"svgRegisterFont", ArgumentParser<SVGRegisterFont>},
+        {"svgUnregisterFont", ArgumentParser<SVGUnregisterFont>},
     };
 
     // Add functions
@@ -271,3 +273,46 @@ std::variant<CLuaFunctionRef, bool> CLuaVectorGraphicDefs::SVGGetUpdateCallback(
 
     return false;
 }
+
+bool CLuaVectorGraphicDefs::SVGRegisterFont(lua_State* luaVM, std::string fontFamily, std::string fontPath)
+{
+    if (fontFamily.empty())
+        throw std::invalid_argument("Font family name cannot be empty");
+
+    if (fontPath.empty())
+        throw std::invalid_argument("Font path cannot be empty");
+
+    CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+    if (!pLuaMain)
+        return false;
+
+    CResource* pResource = pLuaMain->GetResource();
+    if (!pResource)
+        return false;
+
+    // Check if the font is already registered
+    CSVGFontManager& fontManager = CSVGFontManager::GetSingleton();
+    if (fontManager.IsFontRegistered(fontFamily))
+    {
+        CResource* pOwnerResource = fontManager.GetFontOwnerResource(fontFamily);
+        if (pOwnerResource)
+        {
+            m_pScriptDebugging->LogWarning(luaVM, "Font '%s' is already registered by resource '%s'", fontFamily.c_str(), pOwnerResource->GetName());
+        }
+        else
+        {
+            m_pScriptDebugging->LogWarning(luaVM, "Font '%s' is already registered", fontFamily.c_str());
+        }
+        return false;
+    }
+
+    return fontManager.RegisterFont(fontFamily, fontPath, pResource);
+}
+
+bool CLuaVectorGraphicDefs::SVGUnregisterFont(std::string fontFamily)
+{
+    if (fontFamily.empty())
+        throw std::invalid_argument("Font family name cannot be empty");
+
+    return CSVGFontManager::GetSingleton().UnregisterFont(fontFamily);
+}

Client/mods/deathmatch/logic/luadefs/CLuaVectorGraphicDefs.h

@@ -26,6 +26,10 @@ class CLuaVectorGraphicDefs : public CLuaDefs
     static CLuaMultiReturn<int, int> SVGGetSize(CClientVectorGraphic* vectorGraphic);
     static bool                      SVGSetSize(CClientVectorGraphic* vectorGraphic, CVector2D size, std::optional<CLuaFunctionRef> luaFunctionRef);
 
+    // Font management functions
+    static bool SVGRegisterFont(lua_State* luaVM, std::string fontFamily, std::string fontPath);
+    static bool SVGUnregisterFont(std::string fontFamily);
+
 private:
     static bool LoadFromData(lua_State* luaVM, CClientVectorGraphic* vectorGraphic, std::string rawData);
     static bool LoadFromFile(lua_State* luaVM, CClientVectorGraphic* vectorGraphic, CScriptFile* file, std::string path, CResource* parentResource);