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

Fix text input not working on X11

Browse Source
This commit is contained in:
Ari Vuollet
2025-01-28 02:43:03 +02:00
parent 9e937776ac
commit 1528d458d9
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Platform/SDL/SDLWindow.cpp
View File

@@ -184,6 +184,10 @@ SDLWindow::SDLWindow(const CreateWindowSettings& settings)
// Initialize using the shared Display instance from SDL // Initialize using the shared Display instance from SDL
if (SDLPlatform::UsesX11() && SDLPlatform::GetXDisplay() == nullptr) if (SDLPlatform::UsesX11() && SDLPlatform::GetXDisplay() == nullptr)
SDLPlatform::InitX11(GetX11Display()); SDLPlatform::InitX11(GetX11Display());
// Window focus changes breaks the text input for some reason, just keep it enabled for good
if (SDLPlatform::UsesX11() && _settings.AllowInput)
SDL_StartTextInput(_window);
#endif #endif
} }
@@ -416,7 +420,10 @@ void SDLWindow::HandleEvent(SDL_Event& event)
case SDL_EVENT_WINDOW_FOCUS_GAINED: case SDL_EVENT_WINDOW_FOCUS_GAINED:
{ {
OnGotFocus(); OnGotFocus();
SDL_StartTextInput(_window); if (IsPopupWindow(_settings.Type))
_window = _window;
if (_settings.AllowInput && !SDLPlatform::UsesX11())
SDL_StartTextInput(_window);
const SDL_Rect* currentClippingRect = SDL_GetWindowMouseRect(_window); const SDL_Rect* currentClippingRect = SDL_GetWindowMouseRect(_window);
if (_isClippingCursor && currentClippingRect == nullptr) if (_isClippingCursor && currentClippingRect == nullptr)
{ {
@@ -427,7 +434,10 @@ void SDLWindow::HandleEvent(SDL_Event& event)
} }
case SDL_EVENT_WINDOW_FOCUS_LOST: case SDL_EVENT_WINDOW_FOCUS_LOST:
{ {
SDL_StopTextInput(_window); if (IsPopupWindow(_settings.Type))
_window = _window;
if (_settings.AllowInput && !SDLPlatform::UsesX11())
SDL_StopTextInput(_window);
const SDL_Rect* currentClippingRect = SDL_GetWindowMouseRect(_window); const SDL_Rect* currentClippingRect = SDL_GetWindowMouseRect(_window);
if (currentClippingRect != nullptr) if (currentClippingRect != nullptr)
SDL_SetWindowMouseRect(_window, nullptr); SDL_SetWindowMouseRect(_window, nullptr);