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] improve cursor updates

Browse Source 
* use std::unique_ptr for temporary SDL_Surface (ease up cleanup)
* better logging of errors (add full surface details)
This commit is contained in:
Armin Novak
2026-02-14 09:29:47 +01:00
parent 1b577a755e
commit 07bf4e9c10
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/SDL/SDL3/sdl_pointer.cpp
View File

@@ -170,31 +170,33 @@ bool sdl_Pointer_Set_Process(SdlContext* sdl)
const auto hidpi_scale =
sdl->pixelToScreen(fw->id(), SDL_FPoint{ static_cast<float>(ptr->image->w),
static_cast<float>(ptr->image->h) });
auto normal = SDL_CreateSurface(static_cast<int>(hidpi_scale.x),
static_cast<int>(hidpi_scale.y), ptr->image->format);
std::unique_ptr<SDL_Surface, void (*)(SDL_Surface*)> normal{
SDL_CreateSurface(static_cast<int>(hidpi_scale.x), static_cast<int>(hidpi_scale.y),
ptr->image->format),
SDL_DestroySurface
};
assert(normal);
if (!SDL_BlitSurfaceScaled(ptr->image, nullptr, normal, nullptr,
if (!SDL_BlitSurfaceScaled(ptr->image, nullptr, normal.get(), nullptr,
SDL_ScaleMode::SDL_SCALEMODE_LINEAR))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_BlitSurfaceScaled failed");
return false;
}
if (!SDL_AddSurfaceAlternateImage(normal, ptr->image))
if (!SDL_AddSurfaceAlternateImage(normal.get(), ptr->image))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_AddSurfaceAlternateImage failed");
return false;
}
ptr->cursor = SDL_CreateColorCursor(normal, static_cast<int>(pos.x), static_cast<int>(pos.y));
ptr->cursor =
SDL_CreateColorCursor(normal.get(), static_cast<int>(pos.x), static_cast<int>(pos.y));
if (!ptr->cursor)
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_CreateColorCursor(%fx%f) failed",
static_cast<double>(pos.x), static_cast<double>(pos.y));
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_CreateColorCursor(display:%s, pixel:%s} failed",
sdl::utils::toString(pos).c_str(), sdl::utils::toString(orig).c_str());
return false;
}
SDL_DestroySurface(normal);
if (!SDL_SetCursor(ptr->cursor))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_SetCursor failed");