morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,sdl] ignore missing renderer

Browse Source 
When trying to map screen to pixel coordinates ignore a NULL renderer.
This was sometimes observed with X11 backend.
This commit is contained in:
akallabeth
2026-01-28 21:05:22 +01:00
parent 241f338ad1
commit 7e220eee98
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/SDL/SDL3/sdl_context.cpp
View File

@@ -763,7 +763,7 @@ int SdlContext::error_info_to_error(DWORD* pcode, char** msg, size_t* len) const
return exit_code;
}
void SdlContext::applyMonitorOffset(SDL_WindowID window, float& x, float& y)
void SdlContext::applyMonitorOffset(SDL_WindowID window, float& x, float& y) const
{
if (!freerdp_settings_get_bool(context()->settings, FreeRDP_UseMultimon))
return;
@@ -850,6 +850,14 @@ bool SdlContext::removeDisplay(SDL_DisplayID id)
return true;
}
const SdlWindow* SdlContext::getWindowForId(SDL_WindowID id) const
{
auto it = _windows.find(id);
if (it == _windows.end())
return nullptr;
return &it->second;
}
SdlWindow* SdlContext::getWindowForId(SDL_WindowID id)
{
auto it = _windows.find(id);
@@ -1048,9 +1056,11 @@ bool SdlContext::eventToPixelCoordinates(SDL_WindowID id, SDL_Event& ev)
auto w = getWindowForId(id);
if (!w)
return false;
/* Ignore errors here, sometimes SDL has no renderer */
auto renderer = SDL_GetRenderer(w->window());
if (!renderer)
return false;
return true;
return SDL_ConvertEventToRenderCoordinates(renderer, &ev);
}
@@ -1078,9 +1088,11 @@ SDL_FPoint SdlContext::screenToPixel(SDL_WindowID id, const SDL_FPoint& pos)
auto w = getWindowForId(id);
if (!w)
return {};
/* Ignore errors here, sometimes SDL has no renderer */
auto renderer = SDL_GetRenderer(w->window());
if (!renderer)
return {};
return pos;
SDL_FPoint rpos{};
if (!SDL_RenderCoordinatesFromWindow(renderer, pos.x, pos.y, &rpos.x, &rpos.y))
@@ -1094,9 +1106,11 @@ SDL_FPoint SdlContext::pixelToScreen(SDL_WindowID id, const SDL_FPoint& pos)
auto w = getWindowForId(id);
if (!w)
return {};
/* Ignore errors here, sometimes SDL has no renderer */
auto renderer = SDL_GetRenderer(w->window());
if (!renderer)
return {};
return pos;
SDL_FPoint rpos{};
if (!SDL_RenderCoordinatesToWindow(renderer, pos.x, pos.y, &rpos.x, &rpos.y))

3
client/SDL/SDL3/sdl_context.hpp
View File

@@ -106,6 +106,7 @@ class SdlContext
[[nodiscard]] int exitCode() const;
[[nodiscard]] SDL_PixelFormat pixelFormat() const;
[[nodiscard]] const SdlWindow* getWindowForId(SDL_WindowID id) const;
[[nodiscard]] SdlWindow* getWindowForId(SDL_WindowID id);
[[nodiscard]] SdlWindow* getFirstWindow();
@@ -162,7 +163,7 @@ class SdlContext
[[nodiscard]] int error_info_to_error(DWORD* pcode, char** msg, size_t* len) const;
void applyMonitorOffset(SDL_WindowID window, float& x, float& y);
void applyMonitorOffset(SDL_WindowID window, float& x, float& y) const;
rdpContext* _context = nullptr;
wLog* _log = nullptr;