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

Merge pull request #12214 from akallabeth/sdl-error-more

Browse Source 
[client,sdl] add SDL_Error to exceptions
This commit is contained in:
akallabeth
2026-01-29 22:01:44 +01:00
committed by GitHub
parent 031597d172 b7a92956e6
commit c3c6e694e7
4 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1303,7 +1303,10 @@ bool SdlContext::restoreCursor()
{
case CURSOR_NULL:
if (!SDL_HideCursor())
{
WLog_Print(getWLog(), WLOG_ERROR, "SDL_HideCursor failed");
return false;
}
setHasCursor(false);
return true;
@@ -1312,9 +1315,16 @@ bool SdlContext::restoreCursor()
{
auto def = SDL_GetDefaultCursor();
if (!SDL_SetCursor(def))
{
WLog_Print(getWLog(), WLOG_ERROR, "SDL_SetCursor(default=%p) failed",
static_cast<void*>(def));
return false;
}
if (!SDL_ShowCursor())
{
WLog_Print(getWLog(), WLOG_ERROR, "SDL_ShowCursor failed");
return false;
}
setHasCursor(true);
return true;
}
@@ -1322,6 +1332,8 @@ bool SdlContext::restoreCursor()
setHasCursor(true);
return sdl_Pointer_Set_Process(this);
default:
WLog_Print(getWLog(), WLOG_ERROR, "Unknown cursorType %s",
sdl::utils::toString(_cursorType).c_str());
return false;
}
}

9
client/SDL/SDL3/sdl_freerdp.cpp
View File

@@ -73,7 +73,8 @@
class ErrorMsg : public std::exception
{
public:
ErrorMsg(int rc, Uint32 type, const std::string& msg);
ErrorMsg(int rc, Uint32 type, const std::string& msg,
const std::string& sdlError = SDL_GetError());
[[nodiscard]] int rc() const;
[[nodiscard]] const char* what() const noexcept override;
@@ -82,6 +83,7 @@ class ErrorMsg : public std::exception
int _rc;
Uint32 _type;
std::string _msg;
std::string _sdlError;
std::string _buffer;
};
const char* ErrorMsg::what() const noexcept
@@ -94,10 +96,11 @@ int ErrorMsg::rc() const
return _rc;
}
ErrorMsg::ErrorMsg(int rc, Uint32 type, const std::string& msg) : _rc(rc), _type(type), _msg(msg)
ErrorMsg::ErrorMsg(int rc, Uint32 type, const std::string& msg, const std::string& sdlError)
: _rc(rc), _type(type), _msg(msg), _sdlError(sdlError)
{
std::stringstream ss;
ss << _msg << " {" << sdl::utils::toString(_type) << "}";
ss << _msg << " {" << sdl::utils::toString(_type) << "}{SDL:" << sdlError << "}";
_buffer = ss.str();
}

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

@@ -134,10 +134,16 @@ bool sdl_Pointer_Set_Process(SdlContext* sdl)
ptr->image =
SDL_CreateSurface(static_cast<int>(pos.w), static_cast<int>(pos.h), sdl->pixelFormat());
if (!ptr->image)
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_CreateSurface failed");
return false;
}
if (!SDL_LockSurface(ptr->image))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_LockSurface failed");
return false;
}
auto pixels = static_cast<BYTE*>(ptr->image->pixels);
auto data = static_cast<const BYTE*>(ptr->data);
@@ -147,13 +153,19 @@ bool sdl_Pointer_Set_Process(SdlContext* sdl)
gdi->dstFormat, 0, 0, 0, static_cast<UINT32>(isw), static_cast<UINT32>(ish));
SDL_UnlockSurface(ptr->image);
if (!rc)
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "freerdp_image_scale failed");
return false;
}
// create a cursor image in 100% display scale to trick SDL into creating the cursor with the
// correct size
auto fw = sdl->getFirstWindow();
if (!fw)
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "sdl->getFirstWindow() NULL");
return false;
}
const auto hidpi_scale =
sdl->pixelToScreen(fw->id(), SDL_FPoint{ static_cast<float>(ptr->image->w),
@@ -163,20 +175,36 @@ bool sdl_Pointer_Set_Process(SdlContext* sdl)
assert(normal);
if (!SDL_BlitSurfaceScaled(ptr->image, nullptr, normal, nullptr,
SDL_ScaleMode::SDL_SCALEMODE_LINEAR))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_BlitSurfaceScaled failed");
return false;
}
if (!SDL_AddSurfaceAlternateImage(normal, 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));
if (!ptr->cursor)
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_CreateColorCursor(%fx%f) failed",
static_cast<double>(pos.x), static_cast<double>(pos.y));
return false;
}
SDL_DestroySurface(normal);
if (!SDL_SetCursor(ptr->cursor))
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_SetCursor failed");
return false;
}
if (!SDL_ShowCursor())
{
WLog_Print(sdl->getWLog(), WLOG_ERROR, "SDL_ShowCursor failed");
return false;
}
sdl->setHasCursor(true);
return true;
}

5
client/SDL/SDL3/sdl_utils.cpp
View File

@@ -144,7 +144,10 @@ bool sdl_push_user_event(Uint32 type, ...)
return false;
}
va_end(ap);
return SDL_PushEvent(&ev) == 1;
const auto rc = SDL_PushEvent(&ev);
if (rc != 1)
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "[%s] SDL_PushEvent returned %d", __func__, rc);
return rc == 1;
}
bool sdl_push_quit()