diff options
-rw-r--r-- | src/emu/inptport.c | 6 | ||||
-rw-r--r-- | src/emu/mame.c | 3 | ||||
-rw-r--r-- | src/emu/mame.h | 2 | ||||
-rw-r--r-- | src/emu/ui.c | 13 | ||||
-rw-r--r-- | src/osd/windows/input.c | 2 |
5 files changed, 10 insertions, 16 deletions
diff --git a/src/emu/inptport.c b/src/emu/inptport.c index 5b8985280a0..00d78d329ef 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -103,8 +103,8 @@ #include <stdarg.h> #ifdef MESS -#include "inputx.h" -#endif +#include "uimess.h" +#endif /* MESS */ /*************************************************************************** @@ -2300,7 +2300,7 @@ static int frame_get_digital_field_state(const input_field_config *field) #ifdef MESS /* (MESS-specific) check for disabled keyboard */ - if (field->type == IPT_KEYBOARD && osd_keyboard_disabled()) + if (field->type == IPT_KEYBOARD && ui_mess_keyboard_disabled(field->port->machine)) return FALSE; #endif /* MESS */ diff --git a/src/emu/mame.c b/src/emu/mame.c index 18f10cb04a2..8700b0ac461 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -1536,6 +1536,9 @@ static void init_machine(running_machine *machine) palette_init(machine); render_init(machine); ui_init(machine); +#ifdef MESS + ui_mess_init(machine); +#endif /* MESS */ generic_machine_init(machine); generic_video_init(machine); generic_sound_init(); diff --git a/src/emu/mame.h b/src/emu/mame.h index 52cbf46d1d0..79e74002aa6 100644 --- a/src/emu/mame.h +++ b/src/emu/mame.h @@ -22,6 +22,7 @@ #ifdef MESS #include "image.h" +#include "uimess.h" #endif /* MESS */ @@ -225,6 +226,7 @@ struct _running_machine ui_input_private * ui_input_data; /* internal data from uiinput.c */ #ifdef MESS images_private * images_data; /* internal data from image.c */ + ui_mess_private * ui_mess_data; /* internal data from uimess.c */ #endif /* MESS */ /* driver-specific information */ diff --git a/src/emu/ui.c b/src/emu/ui.c index 4ad4b26d4a2..1c648a8c5c5 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -450,11 +450,6 @@ void ui_update_and_render(running_machine *machine) /* decrement the frame counter if it is non-zero */ else if (allow_rescale != 0) allow_rescale--; - -#ifdef MESS - /* let MESS display its stuff */ - mess_ui_update(machine); -#endif /* MESS */ } @@ -1259,7 +1254,7 @@ static UINT32 handler_ingame(running_machine *machine, UINT32 state) } #ifdef MESS - if (mess_disable_builtin_ui(machine)) + if (ui_mess_handler_ingame(machine)) return 0; #endif /* MESS */ @@ -1386,12 +1381,6 @@ static UINT32 handler_ingame(running_machine *machine, UINT32 state) else video_set_fastforward(FALSE); -#ifdef MESS - /* paste? */ - if (ui_input_pressed(machine, IPT_UI_PASTE)) - ui_paste(machine); -#endif /* MESS */ - return 0; } diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index fbf3857b77e..55b0e23876b 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -742,7 +742,7 @@ void osd_customize_input_type_list(input_type_desc *typelist) #ifdef MESS case IPT_OSD_2: - if (mess_use_new_ui()) + if (ui_mess_use_new_ui(Machine)) { typedesc->token = "TOGGLE_MENUBAR"; typedesc->name = "Toggle Menubar"; |