From 3519a59d8f85a92661995aae8496c044e969fa40 Mon Sep 17 00:00:00 2001 From: Maia <66437537+maia-s@users.noreply.github.com> Date: Mon, 21 Apr 2025 23:01:05 +0200 Subject: [PATCH] The SDL_BUTTON_*MASK defines must come immediately after the SDL_MouseButtonFlags typedef to be associated --- include/SDL3/SDL_mouse.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/include/SDL3/SDL_mouse.h b/include/SDL3/SDL_mouse.h index 354771faff..4e522251a6 100644 --- a/include/SDL3/SDL_mouse.h +++ b/include/SDL3/SDL_mouse.h @@ -147,6 +147,19 @@ typedef enum SDL_MouseWheelDirection */ typedef Uint32 SDL_MouseButtonFlags; +#define SDL_BUTTON_LEFT 1 +#define SDL_BUTTON_MIDDLE 2 +#define SDL_BUTTON_RIGHT 3 +#define SDL_BUTTON_X1 4 +#define SDL_BUTTON_X2 5 + +#define SDL_BUTTON_MASK(X) (1u << ((X)-1)) +#define SDL_BUTTON_LMASK SDL_BUTTON_MASK(SDL_BUTTON_LEFT) +#define SDL_BUTTON_MMASK SDL_BUTTON_MASK(SDL_BUTTON_MIDDLE) +#define SDL_BUTTON_RMASK SDL_BUTTON_MASK(SDL_BUTTON_RIGHT) +#define SDL_BUTTON_X1MASK SDL_BUTTON_MASK(SDL_BUTTON_X1) +#define SDL_BUTTON_X2MASK SDL_BUTTON_MASK(SDL_BUTTON_X2) + /** * A callback used to transform mouse motion delta from raw values. * @@ -186,20 +199,6 @@ typedef void (SDLCALL *SDL_MouseMotionTransformCallback)( float *x, float *y ); -#define SDL_BUTTON_LEFT 1 -#define SDL_BUTTON_MIDDLE 2 -#define SDL_BUTTON_RIGHT 3 -#define SDL_BUTTON_X1 4 -#define SDL_BUTTON_X2 5 - -#define SDL_BUTTON_MASK(X) (1u << ((X)-1)) -#define SDL_BUTTON_LMASK SDL_BUTTON_MASK(SDL_BUTTON_LEFT) -#define SDL_BUTTON_MMASK SDL_BUTTON_MASK(SDL_BUTTON_MIDDLE) -#define SDL_BUTTON_RMASK SDL_BUTTON_MASK(SDL_BUTTON_RIGHT) -#define SDL_BUTTON_X1MASK SDL_BUTTON_MASK(SDL_BUTTON_X1) -#define SDL_BUTTON_X2MASK SDL_BUTTON_MASK(SDL_BUTTON_X2) - - /* Function prototypes */ /**