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

Fix headless mode in Editor on Linux without X11

Browse Source
This commit is contained in:
Wojtek Figat
2021-10-03 18:55:26 +02:00
parent 51bcaeb812
commit 147e5ada46
2 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,6 +639,9 @@ static int X11_MessageBoxLoop(MessageBoxData* data)
DialogResult MessageBox::Show(Window* parent, const StringView& text, const StringView& caption, MessageBoxButtons buttons, MessageBoxIcon icon)
{
if (CommandLine::Options.Headless)
return DialogResult::None;
// Setup for simple popup
const StringAsANSI<127> textAnsi(text.Get(), text.Length());
const StringAsANSI<511> captionAnsi(caption.Get(), caption.Length());
@@ -1352,6 +1355,8 @@ public:
DragDropEffect LinuxWindow::DoDragDrop(const StringView& data)
{
if (CommandLine::Options.Headless)
return DragDropEffect::None;
auto cursorWrong = X11::XCreateFontCursor(xDisplay, 54);
auto cursorTransient = X11::XCreateFontCursor(xDisplay, 24);
auto cursorGood = X11::XCreateFontCursor(xDisplay, 4);
@@ -1654,6 +1659,8 @@ void LinuxClipboard::Clear()
void LinuxClipboard::SetText(const StringView& text)
{
if (CommandLine::Options.Headless)
return;
auto mainWindow = (LinuxWindow*)Engine::MainWindow;
if (!mainWindow)
return;
@@ -1674,6 +1681,8 @@ void LinuxClipboard::SetFiles(const Array<String>& files)
String LinuxClipboard::GetText()
{
if (CommandLine::Options.Headless)
return String::Empty;
String result;
auto mainWindow = (LinuxWindow*)Engine::MainWindow;
if (!mainWindow)
@@ -2062,10 +2071,8 @@ bool LinuxPlatform::Init()
Platform::MemoryClear(CursorsImg, sizeof(CursorsImg));
// Skip setup if running in headless mode (X11 might not be available on servers)
if (CommandLine::Options.Headless.IsTrue())
{
if (CommandLine::Options.Headless)
return false;
}
X11::XInitThreads();