Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-27 06:39:03 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix mouse behavior on OSX

Browse Source
This commit is contained in:
Brad Hughes 2016-06-25 16:23:41 -04:00
parent f75a33f7d1
commit eb97703a4c
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/osd/sdl/window.cpp
View File

@ -212,27 +212,40 @@ void sdl_osd_interface::window_exit()
void sdl_window_info::capture_pointer() void sdl_window_info::capture_pointer()
{ {
if (!SDL_GetWindowGrab(platform_window<SDL_Window*>())) if (!m_mouse_captured)
{
SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_TRUE); SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_TRUE);
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);
m_mouse_captured = true;
}
} }
void sdl_window_info::release_pointer() void sdl_window_info::release_pointer()
{ {
if (SDL_GetWindowGrab(platform_window<SDL_Window*>())) if (m_mouse_captured)
{
SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_FALSE); SDL_SetWindowGrab(platform_window<SDL_Window*>(), SDL_FALSE);
SDL_SetRelativeMouseMode(SDL_FALSE); SDL_SetRelativeMouseMode(SDL_FALSE);
m_mouse_captured = false;
}
} }
void sdl_window_info::hide_pointer() void sdl_window_info::hide_pointer()
{ {
SDL_ShowCursor(SDL_DISABLE); if (!m_mouse_hidden)
{
SDL_ShowCursor(SDL_DISABLE);
m_mouse_hidden = true;
}
} }
void sdl_window_info::show_pointer() void sdl_window_info::show_pointer()
{ {
SDL_ShowCursor(SDL_ENABLE); if (m_mouse_hidden)
{
SDL_ShowCursor(SDL_ENABLE);
m_mouse_hidden = false;
}
} }
@ -429,12 +442,17 @@ error:
void sdl_window_info::complete_destroy() void sdl_window_info::complete_destroy()
{ {
// Release pointer grab and hide if needed
show_pointer();
release_pointer();
if (fullscreen() && video_config.switchres) if (fullscreen() && video_config.switchres)
{ {
SDL_SetWindowFullscreen(platform_window<SDL_Window*>(), 0); // Try to set mode SDL_SetWindowFullscreen(platform_window<SDL_Window*>(), 0); // Try to set mode
SDL_SetWindowDisplayMode(platform_window<SDL_Window*>(), &m_original_mode->mode); // Try to set mode SDL_SetWindowDisplayMode(platform_window<SDL_Window*>(), &m_original_mode->mode); // Try to set mode
SDL_SetWindowFullscreen(platform_window<SDL_Window*>(), SDL_WINDOW_FULLSCREEN); // Try to set mode SDL_SetWindowFullscreen(platform_window<SDL_Window*>(), SDL_WINDOW_FULLSCREEN); // Try to set mode
} }
SDL_DestroyWindow(platform_window<SDL_Window*>()); SDL_DestroyWindow(platform_window<SDL_Window*>());
// release all keys ... // release all keys ...
downcast<sdl_osd_interface &>(machine().osd()).release_keys(); downcast<sdl_osd_interface &>(machine().osd()).release_keys();

2
src/osd/sdl/window.h
View File

@ -111,6 +111,8 @@ private:
// monitor info // monitor info
osd_monitor_info * m_monitor; osd_monitor_info * m_monitor;
int m_fullscreen; int m_fullscreen;
bool m_mouse_captured;
bool m_mouse_hidden;
void measure_fps(int update); void measure_fps(int update);