pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial band-aids on SDL_GetMouseState() API breakage. More work to come.

Browse source 
Fixes Bugzilla #758.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404334
This commit is contained in:
Ryan C. Gordon 2009-12-16 19:50:51 +00:00
parent 691ee6f7c0
commit 8b304825b5
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_mouse.h
View file

@ -111,7 +111,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(int index);
* mouse cursor position relative to the focus window for the currently * mouse cursor position relative to the focus window for the currently
* selected mouse. You can pass NULL for either x or y. * selected mouse. You can pass NULL for either x or y.
*/ */
extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int index, int *x, int *y); extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);
/** /**
* \brief Retrieve the state of the specified mouse. * \brief Retrieve the state of the specified mouse.

2
src/SDL_compat.c
View file

@ -285,7 +285,7 @@ SDL_CompatEventFilter(void *userdata, SDL_Event * event)
} }
selected = SDL_SelectMouse(event->wheel.which); selected = SDL_SelectMouse(event->wheel.which);
SDL_GetMouseState(selected, &x, &y); SDL_GetMouseState(&x, &y);
SDL_SelectMouse(selected); SDL_SelectMouse(selected);
if (event->wheel.y > 0) { if (event->wheel.y > 0) {

4
src/events/SDL_mouse.c
View file

@ -252,9 +252,9 @@ SDL_GetRelativeMouseMode(int index)
} }
Uint8 Uint8
SDL_GetMouseState(int index, int *x, int *y) SDL_GetMouseState(int *x, int *y)
{ {
SDL_Mouse *mouse = SDL_GetMouse(index); SDL_Mouse *mouse = SDL_GetMouse(SDL_current_mouse);
if (!mouse) { if (!mouse) {
if (x) { if (x) {

2
test/testalpha.c
View file

@ -291,7 +291,7 @@ MoveSprite(SDL_Surface * screen, SDL_Surface * light)
if (light != NULL) { if (light != NULL) {
int x, y; int x, y;
SDL_GetMouseState(0, &x, &y); SDL_GetMouseState(&x, &y);
FlashLight(screen, light, x, y); FlashLight(screen, light, x, y);
} }

2
test/testgl.c
View file

@ -270,7 +270,7 @@ DrawLogoCursor(void)
} }
/* Move the image around */ /* Move the image around */
SDL_GetMouseState(0, &x, &y); SDL_GetMouseState(&x, &y);
x -= w / 2; x -= w / 2;
y -= h / 2; y -= h / 2;