mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-13 23:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename cursor_shown to cursor_visible

Browse Source
This commit is contained in:
expikr
2025-04-27 13:48:26 +08:00
committed by Sam Lantinga
parent 016ba86f93
commit d553372682
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/events/SDL_mouse.c
View File

@@ -304,7 +304,7 @@ bool SDL_PreInitMouse(void)
mouse->was_touch_mouse_events = false; // no touch to mouse movement event pending
mouse->cursor_shown = true;
mouse->cursor_visible = true;
return true;
}
@@ -812,7 +812,7 @@ static void SDL_PrivateSendMouseMotion(Uint64 timestamp, SDL_Window *window, SDL
}
// Move the mouse cursor, if needed
if (mouse->cursor_shown && !mouse->relative_mode &&
if (mouse->cursor_visible && !mouse->relative_mode &&
mouse->MoveCursor && mouse->cur_cursor) {
mouse->MoveCursor(mouse->cur_cursor);
}
@@ -1289,7 +1289,7 @@ static void SDL_MaybeEnableWarpEmulation(SDL_Window *window, float x, float y)
{
SDL_Mouse *mouse = SDL_GetMouse();
if (!mouse->warp_emulation_prohibited && mouse->warp_emulation_hint && !mouse->cursor_shown && !mouse->warp_emulation_active) {
if (!mouse->warp_emulation_prohibited && mouse->warp_emulation_hint && !mouse->cursor_visible && !mouse->warp_emulation_active) {
if (!window) {
window = mouse->focus;
}
@@ -1635,7 +1635,7 @@ bool SDL_SetCursor(SDL_Cursor *cursor)
}
}
if (cursor && (!mouse->focus || (mouse->cursor_shown && (!mouse->relative_mode || mouse->relative_mode_cursor_visible)))) {
if (cursor && (!mouse->focus || (mouse->cursor_visible && (!mouse->relative_mode || mouse->relative_mode_cursor_visible)))) {
if (mouse->ShowCursor) {
mouse->ShowCursor(cursor);
}
@@ -1711,8 +1711,8 @@ bool SDL_ShowCursor(void)
mouse->warp_emulation_active = false;
}
if (!mouse->cursor_shown) {
mouse->cursor_shown = true;
if (!mouse->cursor_visible) {
mouse->cursor_visible = true;
SDL_SetCursor(NULL);
}
return true;
@@ -1722,8 +1722,8 @@ bool SDL_HideCursor(void)
{
SDL_Mouse *mouse = SDL_GetMouse();
if (mouse->cursor_shown) {
mouse->cursor_shown = false;
if (mouse->cursor_visible) {
mouse->cursor_visible = false;
SDL_SetCursor(NULL);
}
return true;
@@ -1733,5 +1733,5 @@ bool SDL_CursorVisible(void)
{
SDL_Mouse *mouse = SDL_GetMouse();
return mouse->cursor_shown;
return mouse->cursor_visible;
}

2
src/events/SDL_mouse_c.h
View File

@@ -148,7 +148,7 @@ typedef struct
SDL_Cursor *cursors;
SDL_Cursor *def_cursor;
SDL_Cursor *cur_cursor;
bool cursor_shown;
bool cursor_visible;
// Driver-dependent data.
void *internal;

2
src/video/cocoa/SDL_cocoawindow.m
View File

@@ -743,7 +743,7 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
{
SDL_Mouse *mouse = SDL_GetMouse();
if (mouse->cursor_shown && mouse->cur_cursor && !mouse->relative_mode) {
if (mouse->cursor_visible && mouse->cur_cursor && !mouse->relative_mode) {
return (__bridge NSCursor *)mouse->cur_cursor->internal;
}

2
src/video/kmsdrm/SDL_kmsdrmmouse.c
View File

@@ -50,7 +50,7 @@ static void KMSDRM_FreeCursor(SDL_Cursor *cursor);
// KMSDRM_ShowCursor() simply shows or hides the cursor it receives: it does NOT
// mind if it's mouse->cur_cursor, etc.
// -If KMSDRM_ShowCursor() returns successfully, that cursor becomes
// mouse->cur_cursor and mouse->cursor_shown is 1.
// mouse->cur_cursor and mouse->cursor_visible is 1.
/**************************************************************************************/
static SDL_Cursor *KMSDRM_CreateDefaultCursor(void)

2
src/video/wayland/SDL_waylandmouse.c
View File

@@ -1025,7 +1025,7 @@ void Wayland_RecreateCursors(void)
}
if (mouse->cur_cursor) {
Wayland_RecreateCursor(mouse->cur_cursor, vdata);
if (mouse->cursor_shown) {
if (mouse->cursor_visible) {
Wayland_ShowCursor(mouse->cur_cursor);
}
}