convar: fix usertype registration for ConVars

This address a regression introduced by 50583f6.
Fixes #2161.

Author: oSoMoN

src/convar.cpp

@@ -1,6 +1,8 @@
 #include "convar.h"
 #include "Utils/Version.h"
+
 #include <algorithm>
+#include <cassert>
 
 LogScope console_log("console");
 
@@ -16,8 +18,10 @@ namespace gamescope
         assert( !GetCommands().contains( pszName ) );
         GetCommands()[ std::string( pszName ) ] = this;
 
+#if HAVE_SCRIPTING
         if ( bRegisterScript )
             RegisterScript( pszName, this );
+#endif
     }
 
     ConCommand::~ConCommand()
@@ -79,10 +83,4 @@ namespace gamescope
     {
         PrintVersion();
     });
-
-#if !HAVE_SCRIPTING
-    void ConCommand::RegisterScript( std::string_view, ConCommand * )
-    {
-    }
-#endif
-}
+}

src/convar.h

@@ -3,14 +3,11 @@
 #include <span>
 #include <string>
 #include <string_view>
-#include <unordered_map>
-#include <utility>
 #include <optional>
 #include <charconv>
 #include <type_traits>
 #include <cstdint>
 #include <functional>
-#include <cassert>
 
 #include "Utils/Dict.h"
 
@@ -116,7 +113,9 @@ namespace gamescope
         std::string_view GetDescription() const { return m_pszDescription; }
 
         static Dict<ConCommand *>& GetCommands();
+#if HAVE_SCRIPTING
         static void RegisterScript( std::string_view name, ConCommand *cmd );
+#endif
     protected:
         std::string_view m_pszName;
         std::string_view m_pszDescription;
@@ -140,12 +139,16 @@ namespace gamescope
                 RunCallback();
             }
 
+#if HAVE_SCRIPTING
             if ( bRegisterScript )
-            {
                 RegisterScript( pszName, this );
-            }
+#endif
         }
 
+#if HAVE_SCRIPTING
+        static void RegisterScript( std::string_view name, ConVar<T> *cv );
+#endif
+
         const T& Get() const
         {
             return m_Value;

src/convar_script.cpp

@@ -1,10 +1,11 @@
+#if HAVE_SCRIPTING
+
 #include "convar.h"
 #include "Script/Script.h"
 #include "backend.h"
 
 namespace gamescope
 {
-#if HAVE_SCRIPTING
     namespace detail
     {
         struct ConVarScriptRegistrar
@@ -30,23 +31,33 @@ namespace gamescope
         };
     }
 
-    static auto s_ConCommandType = detail::ConVarScriptRegistrar::RegisterConCommand();
-    static auto s_CVBool   = detail::ConVarScriptRegistrar::RegisterConVarType<bool>();
-    static auto s_CVInt    = detail::ConVarScriptRegistrar::RegisterConVarType<int>();
-    static auto s_CVFloat  = detail::ConVarScriptRegistrar::RegisterConVarType<float>();
-    static auto s_CVU32    = detail::ConVarScriptRegistrar::RegisterConVarType<uint32_t>();
-    static auto s_CVU64    = detail::ConVarScriptRegistrar::RegisterConVarType<uint64_t>();
-    static auto s_CVString = detail::ConVarScriptRegistrar::RegisterConVarType<std::string>();
-    static auto s_CVVCS    = detail::ConVarScriptRegistrar::RegisterConVarType<VirtualConnectorStrategy>();
-    static auto s_CVTCM    = detail::ConVarScriptRegistrar::RegisterConVarType<TouchClickMode>();
-
     void ConCommand::RegisterScript( std::string_view name, ConCommand *cmd )
     {
         CScriptScopedLock().Manager().Gamescope().Convars.Base[name] = cmd;
     }
-#else
-    void ConCommand::RegisterScript( std::string_view, ConCommand * )
+
+    template <typename T>
+    void ConVar<T>::RegisterScript( std::string_view name, ConVar<T> *cv )
     {
+        CScriptScopedLock().Manager().Gamescope().Convars.Base[name] = cv;
     }
-#endif
+
+#define REGISTER_CONVAR_TYPE_IMPL( T, N ) \
+    static auto s_ConVarType_##N = detail::ConVarScriptRegistrar::RegisterConVarType<T>(); \
+    template void ConVar<T>::RegisterScript( std::string_view, ConVar<T> * );
+
+#define REGISTER_CONVAR_TYPE_EXPAND( T, N ) REGISTER_CONVAR_TYPE_IMPL( T, N )
+#define REGISTER_CONVAR_TYPE( T ) REGISTER_CONVAR_TYPE_EXPAND( T, __COUNTER__ )
+
+    static auto s_ConCommandType = detail::ConVarScriptRegistrar::RegisterConCommand();
+    REGISTER_CONVAR_TYPE( bool )
+    REGISTER_CONVAR_TYPE( int )
+    REGISTER_CONVAR_TYPE( float )
+    REGISTER_CONVAR_TYPE( uint32_t )
+    REGISTER_CONVAR_TYPE( uint64_t )
+    REGISTER_CONVAR_TYPE( std::string )
+    REGISTER_CONVAR_TYPE( VirtualConnectorStrategy )
+    REGISTER_CONVAR_TYPE( TouchClickMode )
 }
+
+#endif