Fixed bug #464

Added X1/X2 button constants
libsdl-org · Dec 29, 2007 · b835edf · b835edf
1 parent 8c91d65
commit b835edf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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: