mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-08-29 18:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SDL_CursorData for internal cursor data

Browse Source
This commit is contained in:
Sam Lantinga
2024-08-01 08:17:44 -07:00
parent 22ffb487d0
commit b8f3cd0a10
16 changed files with 152 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/emscripten/SDL_emscriptenmouse.c
View File

@@ -43,10 +43,10 @@
static SDL_Cursor *Emscripten_CreateCursorFromString(const char *cursor_str, SDL_bool is_custom)
{
Emscripten_CursorData *curdata;
SDL_CursorData *curdata;
SDL_Cursor *cursor = SDL_calloc(1, sizeof(SDL_Cursor));
if (cursor) {
curdata = (Emscripten_CursorData *)SDL_calloc(1, sizeof(*curdata));
curdata = (SDL_CursorData *)SDL_calloc(1, sizeof(*curdata));
if (!curdata) {
SDL_free(cursor);
return NULL;
@@ -125,9 +125,9 @@ static SDL_Cursor *Emscripten_CreateSystemCursor(SDL_SystemCursor id)
static void Emscripten_FreeCursor(SDL_Cursor *cursor)
{
Emscripten_CursorData *curdata;
SDL_CursorData *curdata;
if (cursor) {
curdata = (Emscripten_CursorData *)cursor->internal;
curdata = cursor->internal;
if (curdata) {
if (curdata->is_custom) {
@@ -142,10 +142,10 @@ static void Emscripten_FreeCursor(SDL_Cursor *cursor)
static int Emscripten_ShowCursor(SDL_Cursor *cursor)
{
Emscripten_CursorData *curdata;
SDL_CursorData *curdata;
if (SDL_GetMouseFocus() != NULL) {
if (cursor && cursor->internal) {
curdata = (Emscripten_CursorData *)cursor->internal;
curdata = cursor->internal;
if (curdata->system_cursor) {
/* *INDENT-OFF* */ /* clang-format off */
@@ -207,7 +207,7 @@ void Emscripten_InitMouse(void)
SDL_SetDefaultCursor(Emscripten_CreateDefaultCursor());
}
void Emscripten_FiniMouse(void)
void Emscripten_QuitMouse(void)
{
}

11
src/video/emscripten/SDL_emscriptenmouse.h
View File

@@ -22,16 +22,13 @@
#ifndef SDL_emscriptenmouse_h_
#define SDL_emscriptenmouse_h_
typedef struct _Emscripten_CursorData
struct SDL_CursorData
{
const char *system_cursor;
SDL_bool is_custom;
} Emscripten_CursorData;
};
extern void
Emscripten_InitMouse();
extern void
Emscripten_FiniMouse();
extern void Emscripten_InitMouse(void);
extern void Emscripten_QuitMouse(void);
#endif /* SDL_emscriptenmouse_h_ */

2
src/video/emscripten/SDL_emscriptenvideo.c
View File

@@ -152,7 +152,7 @@ static int Emscripten_SetDisplayMode(SDL_VideoDevice *_this, SDL_VideoDisplay *d
static void Emscripten_VideoQuit(SDL_VideoDevice *_this)
{
Emscripten_FiniMouse();
Emscripten_QuitMouse();
}
static int Emscripten_GetDisplayUsableBounds(SDL_VideoDevice *_this, SDL_VideoDisplay *display, SDL_Rect *rect)