Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-24 10:32:32 +00:00
Code Issues Projects Releases Wiki Activity

fixed issue #27: on OS X host, mouse can get locked to portion of fullscreen display

Browse Source
This commit is contained in:
David Ludwig 2017-09-02 15:54:33 -04:00
parent 0f8f30f639
commit 7a36983f11
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BasiliskII/src/SDL/video_sdl.cpp
View File

@ -169,6 +169,7 @@ static int redraw_func(void *arg);
static int update_sdl_video(); static int update_sdl_video();
static int present_sdl_video(); static int present_sdl_video();
static int SDLCALL on_sdl_event_generated(void *userdata, SDL_Event * event); static int SDLCALL on_sdl_event_generated(void *userdata, SDL_Event * event);
static bool is_fullscreen(SDL_Window *);
// From sys_unix.cpp // From sys_unix.cpp
extern void SysMountFirstFloppy(void); extern void SysMountFirstFloppy(void);
@ -1059,14 +1060,24 @@ void driver_base::toggle_mouse_grab(void)
grab_mouse(); grab_mouse();
} }
static void update_mouse_grab()
{
if (mouse_grabbed || is_fullscreen(sdl_window)) {
SDL_SetRelativeMouseMode(SDL_TRUE);
} else {
SDL_SetRelativeMouseMode(SDL_FALSE);
}
}
// Grab mouse, switch to relative mouse mode // Grab mouse, switch to relative mouse mode
void driver_base::grab_mouse(void) void driver_base::grab_mouse(void)
{ {
if (!mouse_grabbed) { if (!mouse_grabbed) {
set_grab_mode(true); mouse_grabbed = true;
update_mouse_grab();
set_window_name(STR_WINDOW_TITLE_GRABBED); set_window_name(STR_WINDOW_TITLE_GRABBED);
disable_mouse_accel(); disable_mouse_accel();
ADBSetRelMouseMode(mouse_grabbed = true); ADBSetRelMouseMode(true);
} }
} }
@ -1074,10 +1085,11 @@ void driver_base::grab_mouse(void)
void driver_base::ungrab_mouse(void) void driver_base::ungrab_mouse(void)
{ {
if (mouse_grabbed) { if (mouse_grabbed) {
set_grab_mode(false); mouse_grabbed = false;
update_mouse_grab();
set_window_name(STR_WINDOW_TITLE); set_window_name(STR_WINDOW_TITLE);
restore_mouse_accel(); restore_mouse_accel();
ADBSetRelMouseMode(mouse_grabbed = false); ADBSetRelMouseMode(false);
} }
} }
@ -1518,7 +1530,7 @@ static void do_toggle_fullscreen(void)
/* /*
* Execute video VBL routine * Execute video VBL routine
*/ */
static bool is_fullscreen(SDL_Window * window) static bool is_fullscreen(SDL_Window * window)
{ {
#ifdef __MACOSX__ #ifdef __MACOSX__
@ -1758,6 +1770,7 @@ void video_set_cursor(void)
if (visible) { if (visible) {
int x, y; int x, y;
SDL_GetMouseState(&x, &y); SDL_GetMouseState(&x, &y);
printf("WarpMouse to {%d,%d} via video_set_cursor\n", x, y);
SDL_WarpMouseGlobal(x, y); SDL_WarpMouseGlobal(x, y);
} }
} }
@ -2006,11 +2019,10 @@ static int SDLCALL on_sdl_event_generated(void *userdata, SDL_Event * event)
// fixes an issue on OSX hosts whereby a fullscreen window // fixes an issue on OSX hosts whereby a fullscreen window
// can, in some cases, be dragged around. // can, in some cases, be dragged around.
// ( https://github.com/DavidLudwig/macemu/issues/19 ) // ( https://github.com/DavidLudwig/macemu/issues/19 )
if (is_fullscreen(sdl_window)) { //
SDL_SetRelativeMouseMode(SDL_TRUE); // Calling update_mouse_grab() will lead to SDL_SetRelativeMouseMode()
} else { // being called, as appropriate.
SDL_SetRelativeMouseMode(SDL_FALSE); update_mouse_grab();
}
} }
} break; } break;
} }