Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-09-22 13:01:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

window: use native SDL drivers for terminal runtime

Browse Source 
Use Cocoa, Windows, and Haiku native drivers for terminal-mode OpenGL context
hosts instead of the unsupported offscreen driver. Keep hosts hidden and work
around Haiku SDL2 showing hidden windows during creation.
This commit is contained in:
Martín Lucas Golini
2026-09-12 00:51:33 -03:00
parent 86277832fc
commit e88d068acc
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eepp/window/backend/SDL2/windowsdl2.cpp
View File

@@ -162,6 +162,16 @@ bool WindowSDL::create( WindowSettings Settings, ContextSettings Context ) {
return false;
}
#if EE_PLATFORM == EE_PLATFORM_HAIKU
// Haiku's SDL2 driver shows the window during creation even when SDL_WINDOW_HIDDEN was
// requested. Transition it through SDL's visible state so SDL_HideWindow can reach the native
// driver and restore the hidden context-host contract used by terminal mode and tests.
if ( mWindow.WindowConfig.Style & WindowStyle::Hidden ) {
SDL_ShowWindow( mSDLWindow );
SDL_HideWindow( mSDLWindow );
}
#endif
#if EE_PLATFORM == EE_PLATFORM_ANDROID || EE_PLATFORM == EE_PLATFORM_IOS
Log::notice( "Choosing GL Version from: %d", Context.Version );

34
src/eepp/window/engine.cpp
View File

@@ -73,10 +73,34 @@ Engine::WindowContext::WindowContext( WindowContext&& other ) noexcept :
namespace {
void configureRuntimeVideoDriver() {
if ( !Runtime::isOffscreen() )
if ( Runtime::mode() == RuntimeMode::Headless ) {
Sys::setEnv( "SDL_VIDEODRIVER", "offscreen" );
Sys::setEnv( "SDL_VIDEO_DRIVER", "offscreen" );
return;
}
#if EE_PLATFORM == EE_PLATFORM_MACOS || EE_PLATFORM == EE_PLATFORM_WIN || \
EE_PLATFORM == EE_PLATFORM_HAIKU
if ( Runtime::mode() == RuntimeMode::Terminal ) {
// Terminal mode still needs a real OpenGL context host. These native SDL drivers are the
// supported OpenGL paths on their platforms, while the offscreen driver is unavailable or
// unusable there.
#if EE_PLATFORM == EE_PLATFORM_MACOS
constexpr char nativeVideoDriver[] = "cocoa";
#elif EE_PLATFORM == EE_PLATFORM_WIN
constexpr char nativeVideoDriver[] = "windows";
#else
constexpr char nativeVideoDriver[] = "haiku";
#endif
Sys::setEnv( "SDL_VIDEODRIVER", nativeVideoDriver );
Sys::setEnv( "SDL_VIDEO_DRIVER", nativeVideoDriver );
}
#else
if ( Runtime::mode() != RuntimeMode::Terminal )
return;
Sys::setEnv( "SDL_VIDEODRIVER", "offscreen" );
Sys::setEnv( "SDL_VIDEO_DRIVER", "offscreen" );
#endif
}
} // namespace
@@ -270,6 +294,14 @@ EE::Window::Window* Engine::createWindow( WindowSettings Settings, ContextSettin
TerminalRuntime& terminal = TerminalRuntime::instance();
if ( !terminal.initialize() )
return nullptr;
#if EE_PLATFORM == EE_PLATFORM_MACOS || EE_PLATFORM == EE_PLATFORM_WIN || \
EE_PLATFORM == EE_PLATFORM_HAIKU
// Terminal mode presents through Kitty, not through the native window manager. Keep the
// native context host hidden and avoid asking the native window manager to enter
// fullscreen.
Settings.Style |= WindowStyle::Hidden;
Settings.Style &= ~( WindowStyle::Fullscreen | WindowStyle::UseDesktopResolution );
#endif
const Sizei terminalSize = terminal.pixelSize();
if ( terminalSize.x > 0 && terminalSize.y > 0 ) {
Settings.Width = terminalSize.x;