Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-26 18:55:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check video driver mouse cursor pointers before using them

Browse Source 
--HG--
branch : SDL-1.2
This commit is contained in:
Patrice Mandin
2006-11-19 14:07:32 +00:00
parent 889885e2d2
commit fabcb1b068
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/SDL_cursor.c
View File

@@ -188,7 +188,7 @@ void SDL_SetCursor (SDL_Cursor *cursor)
it needs to hide the old cursor before (possibly)
showing the new one. (But don't erase NULL cursor)
*/
if ( SDL_cursor ) {
if ( SDL_cursor && video->ShowWMCursor ) {
video->ShowWMCursor(this, NULL);
}
}
@@ -198,8 +198,11 @@ void SDL_SetCursor (SDL_Cursor *cursor)
/* Draw the new mouse cursor */
if ( SDL_cursor && (SDL_cursorstate&CURSOR_VISIBLE) ) {
/* Use window manager cursor if possible */
if ( SDL_cursor->wm_cursor &&
video->ShowWMCursor(this, SDL_cursor->wm_cursor) ) {
int show_wm_cursor = 0;
if ( SDL_cursor->wm_cursor && video->ShowWMCursor ) {
show_wm_cursor = video->ShowWMCursor(this, SDL_cursor->wm_cursor);
}
if ( show_wm_cursor ) {
SDL_cursorstate &= ~CURSOR_USINGSW;
} else {
SDL_cursorstate |= CURSOR_USINGSW;
@@ -219,7 +222,9 @@ void SDL_SetCursor (SDL_Cursor *cursor)
SDL_EraseCursor(SDL_VideoSurface);
} else {
if ( video ) {
video->ShowWMCursor(this, NULL);
if ( video->ShowWMCursor ) {
video->ShowWMCursor(this, NULL);
}
}
}
}
@@ -248,7 +253,9 @@ void SDL_FreeCursor (SDL_Cursor *cursor)
SDL_free(cursor->save[0]);
}
if ( video && cursor->wm_cursor ) {
video->FreeWMCursor(this, cursor->wm_cursor);
if ( video->FreeWMCursor ) {
video->FreeWMCursor(this, cursor->wm_cursor);
}
}
SDL_free(cursor);
}