Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-25 09:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emscripten: refactor cursor handling

Browse Source
This commit is contained in:
Charlie Birks 2017-02-17 10:13:12 +00:00
parent 90e302d074
commit 33bddcfda2
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,8 @@
#include "../../events/SDL_mouse_c.h" #include "../../events/SDL_mouse_c.h"
#include "SDL_assert.h" #include "SDL_assert.h"
static SDL_Cursor* static SDL_Cursor*
Emscripten_CreateDefaultCursor() Emscripten_CreateCursorFromString(const char* cursor_str)
{ {
SDL_Cursor* cursor; SDL_Cursor* cursor;
Emscripten_CursorData *curdata; Emscripten_CursorData *curdata;
@ -48,7 +47,7 @@ Emscripten_CreateDefaultCursor()
return NULL; return NULL;
} }
curdata->system_cursor = "default"; curdata->system_cursor = cursor_str;
cursor->driverdata = curdata; cursor->driverdata = curdata;
} }
else { else {
@ -58,6 +57,12 @@ Emscripten_CreateDefaultCursor()
return cursor; return cursor;
} }
static SDL_Cursor*
Emscripten_CreateDefaultCursor()
{
return Emscripten_CreateCursorFromString("default");
}
/* /*
static SDL_Cursor* static SDL_Cursor*
Emscripten_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y) Emscripten_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y)
@ -69,8 +74,6 @@ Emscripten_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y)
static SDL_Cursor* static SDL_Cursor*
Emscripten_CreateSystemCursor(SDL_SystemCursor id) Emscripten_CreateSystemCursor(SDL_SystemCursor id)
{ {
SDL_Cursor *cursor;
Emscripten_CursorData *curdata;
const char *cursor_name = NULL; const char *cursor_name = NULL;
switch(id) { switch(id) {
@ -114,22 +117,7 @@ Emscripten_CreateSystemCursor(SDL_SystemCursor id)
return NULL; return NULL;
} }
cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(*cursor)); return Emscripten_CreateCursorFromString(cursor_name);
if (!cursor) {
SDL_OutOfMemory();
return NULL;
}
curdata = (Emscripten_CursorData *) SDL_calloc(1, sizeof(*curdata));
if (!curdata) {
SDL_OutOfMemory();
SDL_free(cursor);
return NULL;
}
curdata->system_cursor = cursor_name;
cursor->driverdata = curdata;
return cursor;
} }
static void static void