GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Move GetDisplayServer to LinuxPlatform (add support for custom platform scripting api)

Browse Source 
#2800
This commit is contained in:
Wojtek Figat
2026-02-12 09:24:11 +01:00
parent 3c5c6f9883
commit c4d20f06ee
12 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Modules/UIModule.cs
View File

@@ -814,9 +814,12 @@ namespace FlaxEditor.Modules
private void InitWindowDecorations(RootControl mainWindow)
{
ScriptsBuilder.GetBinariesConfiguration(out _, out _, out _, out var configuration);
var driver = Platform.DisplayServer;
string driver = string.Empty;
#if PLATFORM_LINUX
driver = LinuxPlatform.DisplayServer;
if (!string.IsNullOrEmpty(driver))
driver = $" ({driver})";
#endif
WindowDecorations = new MainWindowDecorations(mainWindow, !Utilities.Utils.UseCustomWindowDecorations(isMainWindow: true))
{

13
Source/Engine/Platform/Android/AndroidPlatform.h
View File

@@ -12,15 +12,20 @@ struct android_app;
/// <summary>
/// The Android platform implementation and application management utilities.
/// </summary>
API_CLASS(Static, Tag="NoTypeInitializer")
class FLAXENGINE_API AndroidPlatform : public UnixPlatform
{
public:
static android_app* GetApp();
static String GetAppPackageName();
static String GetDeviceManufacturer();
static String GetDeviceModel();
static String GetDeviceBuildNumber();
// Gets 'getPackageName()' value.
API_PROPERTY() static String GetAppPackageName();
// Gets 'android.os.Build.MANUFACTURER' value.
API_PROPERTY() static String GetDeviceManufacturer();
// Gets 'android.os.Build.MODEL' value.
API_PROPERTY() static String GetDeviceModel();
// Gets 'android.os.Build.DISPLAY' value.
API_PROPERTY() static String GetDeviceBuildNumber();
static void PreInit(android_app* app);
public:

5
Source/Engine/Platform/Base/PlatformBase.cpp
View File

@@ -294,11 +294,6 @@ PlatformType PlatformBase::GetPlatformType()
#if !PLATFORM_SDL
String PlatformBase::GetDisplayServer()
{
return String::Empty;
}
bool PlatformBase::SupportsNativeDecorations()
{
return true;

5
Source/Engine/Platform/Base/PlatformBase.h
View File

@@ -369,11 +369,6 @@ public:
/// </summary>
API_PROPERTY() static PlatformType GetPlatformType();
/// <summary>
/// Returns the display server name on Linux.
/// </summary>
API_PROPERTY() static String GetDisplayServer();
/// <summary>
/// Returns true if system provides decorations for windows.
/// </summary>

12
Source/Engine/Platform/GDK/GDKPlatform.h
View File

@@ -9,6 +9,7 @@
/// <summary>
/// The GDK platform implementation and application management utilities.
/// </summary>
API_CLASS(Static, Tag="NoTypeInitializer")
class FLAXENGINE_API GDKPlatform : public Win32Platform
{
public:
@@ -37,10 +38,13 @@ public:
/// <param name="hInstance">The Win32 application instance.</param>
static void PreInit(void* hInstance);
static bool IsRunningOnDevKit();
static void SignInSilently();
static void SignInWithUI();
// True, if game is running Xbox Devkit.
API_PROPERTY() static bool IsRunningOnDevKit();
// Signs in user without showing UI. If user is not signed in, it will fail and return false. Use SignInWithUI to show UI and let user sign in.
API_FUNCTION() static void SignInSilently();
// Signs in user with showing UI. If user is already signed in, it will succeed and return true. If user is not signed in, it will show UI and let user sign in.
API_FUNCTION() static void SignInWithUI();
// Searches for a user with a specific local ID.
static User* FindUser(const struct XUserLocalId& id);
public:

5
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -1801,6 +1801,11 @@ const String& LinuxPlatform::GetHomeDirectory()
return HomeDir;
}
String LinuxPlatform::GetDisplayServer()
{
return xDisplay ? TEXT("X11") : TEXT("");
}
bool LinuxPlatform::Is64BitPlatform()
{
#ifdef PLATFORM_64BITS

7
Source/Engine/Platform/Linux/LinuxPlatform.h
View File

@@ -10,6 +10,7 @@
/// <summary>
/// The Linux platform implementation and application management utilities.
/// </summary>
API_CLASS(Static, Tag="NoTypeInitializer")
class FLAXENGINE_API LinuxPlatform : public UnixPlatform
{
public:
@@ -30,9 +31,13 @@ public:
/// <summary>
/// Gets the current user home directory.
/// </summary>
/// <returns>The user home directory.</returns>
static const String& GetHomeDirectory();
/// <summary>
/// Returns the display server name on Linux (eg. X11, Wayland).
/// </summary>
API_PROPERTY() static String GetDisplayServer();
/// <summary>
/// An event that is fired when an XEvent is received during platform tick.
/// </summary>

8
Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp
View File

@@ -1691,6 +1691,14 @@ void* SDLPlatform::GetXDisplay()
return X11Impl::xDisplay;
}
String SDLPlatform::GetDisplayServer()
{
String driver(SDL_GetCurrentVideoDriver());
if (driver.Length() > 0)
driver[0] = StringUtils::ToUpper(driver[0]);
return driver;
}
void SDLPlatform::SetHighDpiAwarenessEnabled(bool enable)
{
base::SetHighDpiAwarenessEnabled(enable);

12
Source/Engine/Platform/SDL/SDLPlatform.cpp
View File

@@ -196,18 +196,6 @@ bool SDLPlatform::HandleEvent(SDL_Event& event)
return true;
}
String SDLPlatform::GetDisplayServer()
{
#if PLATFORM_LINUX
String driver(SDL_GetCurrentVideoDriver());
if (driver.Length() > 0)
driver[0] = StringUtils::ToUpper(driver[0]);
return driver;
#else
return String::Empty;
#endif
}
bool SDLPlatform::SupportsNativeDecorations()
{
return SDLImpl::WindowDecorationsSupported;

3
Source/Engine/Platform/SDL/SDLPlatform.h
View File

@@ -62,18 +62,17 @@ private:
public:
#if PLATFORM_LINUX
static void* GetXDisplay();
static String GetDisplayServer();
#endif
static bool UsesWindows();
static bool UsesWayland();
static bool UsesX11();
public:
// [PlatformBase]
static bool Init();
static void LogInfo();
static void Tick();
static String GetDisplayServer();
static bool SupportsNativeDecorations();
static bool SupportsNativeDecorationDragging();
static void SetHighDpiAwarenessEnabled(bool enable);

5
Source/Tools/Flax.Build/Bindings/ApiTypeInfo.cs
View File

@@ -126,6 +126,11 @@ namespace Flax.Build.Bindings
}
}
public bool HasTag(string tag)
{
return Tags != null && Tags.ContainsKey(tag);
}
public string GetTag(string tag)
{
if (Tags != null && Tags.TryGetValue(tag, out var value))

4
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -1220,7 +1220,7 @@ namespace Flax.Build.Bindings
if (functionInfo.IsStatic)
{
// Call native static method
string nativeType = caller.Tags != null && caller.Tags.ContainsKey("NativeInvokeUseName") ? caller.Name : caller.NativeName;
string nativeType = caller.HasTag("NativeInvokeUseName") ? caller.Name : caller.NativeName;
if (caller.Parent != null && !(caller.Parent is FileInfo))
nativeType = caller.Parent.FullNameNative + "::" + nativeType;
call = $"{nativeType}::{functionInfo.Name}";
@@ -2363,6 +2363,8 @@ namespace Flax.Build.Bindings
var interfacesTable = GenerateCppInterfaceInheritanceTable(buildData, contents, moduleInfo, classInfo, classTypeNameNative, classTypeNameInternal);
// Type initializer
if (classInfo.HasTag("NoTypeInitializer"))
return;
if (GenerateCppIsTemplateInstantiationType(classInfo))
contents.Append("template<> ");
contents.Append($"ScriptingTypeInitializer {classTypeNameNative}::TypeInitializer((BinaryModule*)GetBinaryModule{moduleInfo.Name}(), ");