Refactorings/decouple backend #26
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,6 +100,10 @@ | |
| } | ||
| }; | ||
|
|
||
| inline SDLContext *getBackendContext(Context &ctx) { | ||
| SDLContext *sdlCtx = (SDLContext*) ctx.mBackendCtx->mHandle; | ||
|
Check warning on line 104 in src/backends/sdl2_renderer.h
|
||
| return sdlCtx; | ||
| } | ||
|
Comment on lines
+103
to
+106
There was a problem hiding this comment.
This helper dereferences Additionally, prefer 🛡️ Proposed fix with null checks and proper cast inline SDLContext *getBackendContext(Context &ctx) {
- SDLContext *sdlCtx = (SDLContext*) ctx.mBackendCtx->mHandle;
- return sdlCtx;
+ if (ctx.mBackendCtx == nullptr) {
+ return nullptr;
+ }
+ return static_cast<SDLContext*>(ctx.mBackendCtx->mHandle);
}Note: All callers of 🧰 Tools🪛 GitHub Check: SonarCloud Code Analysis[warning] 104-104: Replace the redundant type with "auto". 🤖 Prompt for AI Agents |
||
|
|
||
| /// @brief The renderer implementation using the SDL2 library. | ||
| struct Renderer { | ||
|
|
@@ -118,6 +122,7 @@ | |
| static bool update(Context &ctx); | ||
| static SurfaceImpl *createSurfaceImpl(unsigned char *data, int w, int h, int bytesPerPixel, int pitch); | ||
| static void releaseSurfaceImpl(SurfaceImpl *surfaceImpl); | ||
| static ret_code getSurfaceInfo(Context &ctx, int32_t &w, int32_t &h); | ||
| }; | ||
|
|
||
| } // namespace tinyui | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,6 @@ SOFTWARE. | |
| #include "backends/sdl2_iodevice.h" | ||
|
|
||
| #include <iostream> | ||
|
|
||
| namespace tinyui { | ||
|
|
||
|
|
@@ -37,7 +36,7 @@ static Style DefaultStyle { | |
| Color4{ 20, 20, 20, 0 }, | ||
| Color4{ 100, 100, 100, 0 }, | ||
| Color4{ 200, 200, 200, 0 }, | ||
| 2, | ||
| { "Arial.ttf", 12, nullptr } | ||
| }; | ||
|
|
||
|
|
@@ -98,7 +97,7 @@ Context &TinyUi::getContext() { | |
| } | ||
|
|
||
| ret_code TinyUi::initScreen(int32_t x, int32_t y, int32_t w, int32_t h) { | ||
| auto &ctx = getContext(); | ||
| if (Renderer::initRenderer(ctx) == ErrorCode) { | ||
| printf("Error: Cannot init renderer\n"); | ||
| return ErrorCode; | ||
|
|
@@ -114,14 +113,7 @@ ret_code TinyUi::getSurfaceInfo(int32_t &w, int32_t &h) { | |
| return ErrorCode; | ||
| } | ||
|
|
||
| return Renderer::getSurfaceInfo(ctx, w, h); | ||
| } | ||
|
|
||
| ret_code TinyUi::getSurfaceCenter(int32_t &x, int32_t &y) { | ||
|
|
@@ -138,7 +130,7 @@ ret_code TinyUi::getSurfaceCenter(int32_t &x, int32_t &y) { | |
| } | ||
|
|
||
| bool TinyUi::run() { | ||
| auto &ctx = getContext(); | ||
| if (!ctx.mUpdateCallbackList.empty()) { | ||
| for (auto it = ctx.mUpdateCallbackList.begin(); it != ctx.mUpdateCallbackList.end(); ++it) { | ||
| (*it)->mfuncCallback[Events::UpdateEvent](1, (*it)->mInstance); | ||
|
|
@@ -148,31 +140,29 @@ bool TinyUi::run() { | |
| } | ||
|
|
||
| ret_code TinyUi::beginRender(Color4 bg) { | ||
| auto &ctx = getContext(); | ||
| return Renderer::beginRender(ctx, bg); | ||
| } | ||
|
|
||
| ret_code TinyUi::endRender() { | ||
| auto &ctx = getContext(); | ||
| return Renderer::endRender(ctx); | ||
| } | ||
|
|
||
| void TinyUi::render() { | ||
| auto &ctx = getContext(); | ||
| beginRender(ctx.mStyle.mClearColor); | ||
| Widgets::renderWidgets(); | ||
| endRender(); | ||
| } | ||
|
|
||
| ret_code TinyUi::release() { | ||
| auto &ctx = getContext(); | ||
| if (!ctx.mCreated) { | ||
| return ErrorCode; | ||
| } | ||
| Renderer::releaseRenderer(ctx); | ||
| Renderer::releaseScreen(ctx); | ||
| ctx.mRoot = nullptr; | ||
|
|
||
| ctx.mCreated = false; | ||
|
|
@@ -193,12 +183,12 @@ void TinyUi::setDefaultStyle(const Style &style) { | |
| } | ||
|
|
||
| void TinyUi::setDefaultFont(const char *defaultFont) { | ||
| auto &ctx = getContext(); | ||
| if (defaultFont == nullptr) { | ||
| return; | ||
| } | ||
|
|
||
| if (strncmp( ctx.mStyle.mFont.mName, defaultFont, strlen(defaultFont)) == 0) { | ||
| return; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing null check on
sdlCtxbefore dereferencing.If
getBackendContext(ctx)returnsnullptr(e.g., backend not initialized), line 227 and 257 will dereference a null pointer.🛡️ Proposed fix
🤖 Prompt for AI Agents