From b835edfa8b07b0ef2a8bf9a70edb3c218cdece6e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 29 Dec 2007 06:09:25 +0000 Subject: [PATCH] Fixed bug #464 Added X1/X2 button constants --- include/SDL_mouse.h | 4 ++++ src/video/win32/SDL_win32events.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/SDL_mouse.h b/include/SDL_mouse.h index 934a3e5fc..567abccda 100644 --- a/include/SDL_mouse.h +++ b/include/SDL_mouse.h @@ -207,9 +207,13 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #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_LMASK SDL_BUTTON(SDL_BUTTON_LEFT) #define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE) #define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT) +#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) +#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) /* Ends C function definitions when using C++ */ diff --git a/src/video/win32/SDL_win32events.c b/src/video/win32/SDL_win32events.c index 948dd1a65..266b714aa 100644 --- a/src/video/win32/SDL_win32events.c +++ b/src/video/win32/SDL_win32events.c @@ -590,12 +590,12 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_XBUTTONDOWN: xbuttonval = GET_XBUTTON_WPARAM(wParam); - button = SDL_BUTTON_RIGHT + xbuttonval; + button = SDL_BUTTON_X1 + xbuttonval - 1; state = SDL_PRESSED; break; case WM_XBUTTONUP: xbuttonval = GET_XBUTTON_WPARAM(wParam); - button = SDL_BUTTON_RIGHT + xbuttonval; + button = SDL_BUTTON_X1 + xbuttonval - 1; state = SDL_RELEASED; break; default: