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

Clear relative mouse mode and restore when bringing up sdl message box.

Browse source
This commit is contained in:
Michael Sartain 2013-02-14 13:22:05 -08:00
parent edbd20ec34
commit 73eaf569f4
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/video/SDL_video.c
View file

@ -2991,40 +2991,51 @@ int
SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{ {
int dummybutton; int dummybutton;
int retval = -1;
SDL_bool relative_mode = SDL_GetRelativeMouseMode();
int show_cursor_prev = SDL_ShowCursor( 1 );
SDL_SetRelativeMouseMode( SDL_FALSE );
if (!buttonid) { if (!buttonid) {
buttonid = &dummybutton; buttonid = &dummybutton;
} }
if (_this && _this->ShowMessageBox) { if (_this && _this->ShowMessageBox) {
if (_this->ShowMessageBox(_this, messageboxdata, buttonid) == 0) { if (_this->ShowMessageBox(_this, messageboxdata, buttonid) == 0) {
return 0; retval = 0;
} }
} }
/* It's completely fine to call this function before video is initialized */ /* It's completely fine to call this function before video is initialized */
#if SDL_VIDEO_DRIVER_WINDOWS #if SDL_VIDEO_DRIVER_WINDOWS
if (WIN_ShowMessageBox(messageboxdata, buttonid) == 0) { if ((retval == -1) && (WIN_ShowMessageBox(messageboxdata, buttonid) == 0)) {
return 0; retval = 0;
} }
#endif #endif
#if SDL_VIDEO_DRIVER_COCOA #if SDL_VIDEO_DRIVER_COCOA
if (Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0) { if ((retval == -1) && (Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0)) {
return 0; retval = 0;
} }
#endif #endif
#if SDL_VIDEO_DRIVER_UIKIT #if SDL_VIDEO_DRIVER_UIKIT
if (UIKit_ShowMessageBox(messageboxdata, buttonid) == 0) { if ((retval == -1) && (UIKit_ShowMessageBox(messageboxdata, buttonid) == 0)) {
return 0; retval = 0;
} }
#endif #endif
#if SDL_VIDEO_DRIVER_X11 #if SDL_VIDEO_DRIVER_X11
if (X11_ShowMessageBox(messageboxdata, buttonid) == 0) { if ((retval == -1) && (X11_ShowMessageBox(messageboxdata, buttonid) == 0)) {
return 0; retval = 0;
} }
#endif #endif
SDL_SetError("No message system available"); SDL_ShowCursor( show_cursor_prev );
return -1; SDL_SetRelativeMouseMode( relative_mode );
if(retval == -1)
{
SDL_SetError("No message system available");
}
return retval;
} }
int int