gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename SDL_BUTTON() to SDL_BUTTON_MASK()

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/11056
This commit is contained in:
Sam Lantinga
2024-10-04 09:13:36 -07:00
parent d529407ce7
commit 6c64c62114
11 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/testautomation_mouse.c
View File

@@ -17,11 +17,11 @@
static int mouseStateCheck(Uint32 state)
{
return (state == 0) ||
(state == SDL_BUTTON(SDL_BUTTON_LEFT)) ||
(state == SDL_BUTTON(SDL_BUTTON_MIDDLE)) ||
(state == SDL_BUTTON(SDL_BUTTON_RIGHT)) ||
(state == SDL_BUTTON(SDL_BUTTON_X1)) ||
(state == SDL_BUTTON(SDL_BUTTON_X2));
(state == SDL_BUTTON_MASK(SDL_BUTTON_LEFT)) ||
(state == SDL_BUTTON_MASK(SDL_BUTTON_MIDDLE)) ||
(state == SDL_BUTTON_MASK(SDL_BUTTON_RIGHT)) ||
(state == SDL_BUTTON_MASK(SDL_BUTTON_X1)) ||
(state == SDL_BUTTON_MASK(SDL_BUTTON_X2));
}
/**

4
test/testmanymouse.c
View File

@@ -286,9 +286,9 @@ static void HandleMouseButton(SDL_MouseButtonEvent *event)
}
if (event->which == mouse_state->instance_id) {
if (event->down) {
mouse_state->button_state |= SDL_BUTTON(event->button);
mouse_state->button_state |= SDL_BUTTON_MASK(event->button);
} else {
mouse_state->button_state &= ~SDL_BUTTON(event->button);
mouse_state->button_state &= ~SDL_BUTTON_MASK(event->button);
}
}
}