Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few minor input fixes and cleanups

Browse Source 
- input modules exit() is called twice. Remove the unnecessary input_exit() method
- removed unnecessary pointer init in handle_input_event and should_hide_mouse
- When registering event callbacks in SDL, don't assume the SDL enum values are int-sized
This commit is contained in:
Brad Hughes 2016-06-25 11:43:15 -04:00
parent 0f3ac71cc4
commit def1777e74
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/osd/modules/input/input_sdl.cpp
View File

@ -512,8 +512,13 @@ public:
{ {
sdl_input_module::input_init(machine); sdl_input_module::input_init(machine);
SDL_EventType event_types[] = { SDL_KEYDOWN, SDL_KEYUP, SDL_TEXTINPUT }; static int event_types[] = {
sdl_event_manager::instance().subscribe(reinterpret_cast<int*>(event_types), ARRAY_LENGTH(event_types), this); static_cast<int>(SDL_KEYDOWN),
static_cast<int>(SDL_KEYUP),
static_cast<int>(SDL_TEXTINPUT)
};
sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this);
sdl_keyboard_device *devinfo; sdl_keyboard_device *devinfo;
@ -645,8 +650,14 @@ public:
{ {
sdl_input_module::input_init(machine); sdl_input_module::input_init(machine);
SDL_EventType event_types[] = { SDL_MOUSEMOTION, SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL }; static int event_types[] = {
sdl_event_manager::instance().subscribe(reinterpret_cast<int*>(event_types), ARRAY_LENGTH(event_types), this); static_cast<int>(SDL_MOUSEMOTION),
static_cast<int>(SDL_MOUSEBUTTONDOWN),
static_cast<int>(SDL_MOUSEBUTTONUP),
static_cast<int>(SDL_MOUSEWHEEL)
};
sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this);
sdl_mouse_device *devinfo; sdl_mouse_device *devinfo;
char defname[20]; char defname[20];
@ -834,8 +845,15 @@ public:
} }
} }
SDL_EventType event_types[] = { SDL_JOYAXISMOTION, SDL_JOYBALLMOTION, SDL_JOYHATMOTION, SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP }; static int event_types[] = {
sdl_event_manager::instance().subscribe(reinterpret_cast<int*>(event_types), ARRAY_LENGTH(event_types), this); static_cast<int>(SDL_JOYAXISMOTION),
static_cast<int>(SDL_JOYBALLMOTION),
static_cast<int>(SDL_JOYHATMOTION),
static_cast<int>(SDL_JOYBUTTONDOWN),
static_cast<int>(SDL_JOYBUTTONUP)
};
sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this);
osd_printf_verbose("Joystick: End initialization\n"); osd_printf_verbose("Joystick: End initialization\n");
} }

4
src/osd/modules/input/input_windows.cpp
View File

@ -23,7 +23,7 @@
bool windows_osd_interface::should_hide_mouse() const bool windows_osd_interface::should_hide_mouse() const
{ {
bool hidemouse = false; bool hidemouse = false;
wininput_module* mod = nullptr; wininput_module* mod;
mod = dynamic_cast<wininput_module*>(m_keyboard_input); mod = dynamic_cast<wininput_module*>(m_keyboard_input);
if (mod) hidemouse |= mod->should_hide_mouse(); if (mod) hidemouse |= mod->should_hide_mouse();
@ -44,7 +44,7 @@ bool windows_osd_interface::handle_input_event(input_event eventid, void* eventd
{ {
bool handled = false; bool handled = false;
wininput_module* mod = nullptr; wininput_module* mod;
mod = dynamic_cast<wininput_module*>(m_keyboard_input); mod = dynamic_cast<wininput_module*>(m_keyboard_input);
if (mod) handled |= mod->handle_input_event(eventid, eventdata); if (mod) handled |= mod->handle_input_event(eventid, eventdata);

13
src/osd/modules/lib/osdobj_common.cpp
View File

@ -701,7 +701,6 @@ void osd_common_t::input_resume()
void osd_common_t::exit_subsystems() void osd_common_t::exit_subsystems()
{ {
video_exit(); video_exit();
input_exit();
} }
void osd_common_t::video_exit() void osd_common_t::video_exit()
@ -712,18 +711,6 @@ void osd_common_t::window_exit()
{ {
} }
void osd_common_t::input_exit()
{
if (m_keyboard_input)
m_keyboard_input->exit();
if (m_mouse_input)
m_mouse_input->exit();
if (m_lightgun_input)
m_lightgun_input->exit();
if (m_joystick_input)
m_joystick_input->exit();
}
void osd_common_t::osd_exit() void osd_common_t::osd_exit()
{ {
m_mod_man.exit(); m_mod_man.exit();

1
src/osd/modules/lib/osdobj_common.h
View File

@ -224,7 +224,6 @@ public:
virtual void exit_subsystems(); virtual void exit_subsystems();
virtual void video_exit(); virtual void video_exit();
virtual void window_exit(); virtual void window_exit();
virtual void input_exit();
virtual void osd_exit(); virtual void osd_exit();