frontend/mame/luaengine.cpp, ui: Patched up some rather disturbing code.

Author: cuavas

src/frontend/mame/luaengine.cpp

@@ -943,11 +943,10 @@ void lua_engine::initialize()
 			m_menu.push_back(name);
 		};
 	emu["show_menu"] =
-		[this](const char *name)
+		[] (const char *name)
 		{
 			mame_ui_manager &mui = mame_machine_manager::instance()->ui();
-			render_target &target = machine().render().ui_target(); // FIXME: it should really ask the UI manager where to show this
-			ui::menu_plugin::show_menu(mui, target, name);
+			ui::menu_plugin::show_menu(mui, name);
 		};
 	emu["register_callback"] =
 		[this] (sol::function cb, const std::string &name)
@@ -2243,7 +2242,7 @@ void lua_engine::initialize()
 	ui_type["image_display_enabled"] = sol::property(&mame_ui_manager::image_display_enabled, &mame_ui_manager::set_image_display_enabled);
 
 	// undocumented/unsupported
-	ui_type["show_menu"] = &mame_ui_manager::show_menu; // FIXME: this is dangerous - it doesn't give a proper chance for the current UI handler to clean up
+	ui_type["show_menu"] = static_cast<bool (mame_ui_manager::*)()>(&mame_ui_manager::show_menu);
 
 
 /* rom_entry library

src/frontend/mame/ui/filemngr.cpp

@@ -279,7 +279,7 @@ void menu_file_manager::force_file_manager(mame_ui_manager &mui, render_target &
 	// drop any existing menus and start the file manager
 	menu::stack_reset(mui);
 	menu::stack_push_special_main<menu_file_manager>(mui, target, std::move(warnings));
-	mui.show_menu();
+	mui.show_menu(target);
 
 	// make sure MAME is paused
 	mui.machine().pause();

src/frontend/mame/ui/menu.cpp

@@ -1913,6 +1913,7 @@ void menu::activate_menu(render_target &target)
 {
 	if (&target != m_target)
 	{
+		assert(target.ui_container());
 		m_target = ⌖
 		m_last_aspect = 0.0F;
 	}

src/frontend/mame/ui/pluginopt.cpp

@@ -43,10 +43,10 @@ void menu_plugin::populate()
 	item_append(menu_item_type::SEPARATOR);
 }
 
-void menu_plugin::show_menu(mame_ui_manager &mui, render_target &target, std::string_view menu)
+void menu_plugin::show_menu(mame_ui_manager &mui, std::string_view menu)
 {
 	// add the plugin menu entry
-	menu::stack_push<menu_plugin_opt>(mui, target, menu, true);
+	menu::stack_push<menu_plugin_opt>(mui, mui.machine().render().ui_target(), menu, true);
 
 	// force the menus on
 	mui.show_menu();

src/frontend/mame/ui/pluginopt.h

@@ -27,7 +27,7 @@ class menu_plugin : public menu
 public:
 	menu_plugin(mame_ui_manager &mui, render_target &target);
 
-	static void show_menu(mame_ui_manager &mui, render_target &target, std::string_view menu);
+	static void show_menu(mame_ui_manager &mui, std::string_view menu);
 
 	virtual ~menu_plugin();
 

src/frontend/mame/ui/selgame.cpp

@@ -538,7 +538,7 @@ void menu_select_game::force_game_select(mame_ui_manager &mui, render_target &ta
 	// drop any existing menus and start the system selection menu
 	menu::stack_reset(mui);
 	menu::stack_push_special_main<menu_select_game>(mui, target, nullptr);
-	mui.show_menu();
+	mui.show_menu(target);
 
 	// make sure MAME is paused
 	mui.machine().pause();

src/frontend/mame/ui/simpleselgame.cpp

@@ -463,7 +463,7 @@ void simple_menu_select_game::force_game_select(mame_ui_manager &mui, render_tar
 	// drop any existing menus and start the system selection menu
 	menu::stack_reset(mui);
 	menu::stack_push_special_main<simple_menu_select_game>(mui, target, gamename);
-	mui.show_menu();
+	mui.show_menu(target);
 
 	// make sure MAME is paused
 	mui.machine().pause();

src/frontend/mame/ui/ui.cpp

@@ -880,12 +880,14 @@ void mame_ui_manager::display_startup_screens(bool first_time)
 	// if we're the empty driver, force the menus on
 	if (ui::menu::stack_has_special_main_menu(*this))
 	{
-		show_menu();
+		m_ui_target = &machine().render().ui_target();
+		activate_menu();
 	}
 	else if (config_menu)
 	{
-		ui::menu::stack_push<ui::menu_main>(*this, machine().render().ui_target());
-		show_menu();
+		m_ui_target = &machine().render().ui_target();
+		ui::menu::stack_push<ui::menu_main>(*this, *m_ui_target);
+		activate_menu();
 
 		// loop while we have a handler
 		while (m_handler_callback_type != ui_callback_type::GENERAL && !machine().scheduled_event_pending())
@@ -1356,7 +1358,29 @@ bool mame_ui_manager::show_profiler() const
 //  show_menu - show the menus
 //-------------------------------------------------
 
-void mame_ui_manager::show_menu()
+bool mame_ui_manager::show_menu()
+{
+	return show_menu(current_ui_target());
+}
+
+bool mame_ui_manager::show_menu(render_target &target)
+{
+	if (ui_callback_type::GENERAL != m_handler_callback_type)
+		return false;
+
+	m_ui_target = &target;
+	if (ui::menu::stack_empty(*this))
+		ui::menu::stack_push<ui::menu_main>(*this, *m_ui_target);
+	activate_menu();
+	return true;
+}
+
+
+//-------------------------------------------------
+//  activate_menu - show the menus
+//-------------------------------------------------
+
+void mame_ui_manager::activate_menu()
 {
 	assert(m_ui_target);
 
@@ -1710,7 +1734,7 @@ uint32_t mame_ui_manager::handler_ingame()
 		}
 		if (ui::menu::stack_empty(*this))
 			ui::menu::stack_push<ui::menu_main>(*this, *m_ui_target);
-		show_menu();
+		activate_menu();
 		return 0;
 	}
 
@@ -1719,7 +1743,7 @@ uint32_t mame_ui_manager::handler_ingame()
 	{
 		m_ui_target = &current_ui_target();
 		ui::menu::stack_push<ui::menu_sliders>(*this, *m_ui_target, true);
-		show_menu();
+		activate_menu();
 		return 0;
 	}
 
@@ -1774,7 +1798,7 @@ uint32_t mame_ui_manager::handler_ingame()
 	{
 		m_ui_target = &current_ui_target();
 		ui::menu::stack_push<ui::menu_save_state>(*this, *m_ui_target, true);
-		show_menu();
+		activate_menu();
 		return 0;
 	}
 
@@ -1783,7 +1807,7 @@ uint32_t mame_ui_manager::handler_ingame()
 	{
 		m_ui_target = &current_ui_target();
 		ui::menu::stack_push<ui::menu_load_state>(*this, *m_ui_target, true);
-		show_menu();
+		activate_menu();
 		return 0;
 	}
 
@@ -1889,7 +1913,7 @@ void mame_ui_manager::request_quit()
 			m_paused_for_menu = true;
 		}
 		ui::menu::stack_push<ui::menu_confirm_quit>(*this, *m_ui_target);
-		show_menu();
+		activate_menu();
 	}
 }
 

src/frontend/mame/ui/ui.h

@@ -202,7 +202,8 @@ class mame_ui_manager : public ui_manager
 	bool show_fps_counter();
 	void set_show_profiler(bool show);
 	bool show_profiler() const;
-	void show_menu();
+	bool show_menu();
+	bool show_menu(render_target &target);
 	virtual bool is_menu_active() override;
 	bool can_paste();
 	void image_handler_ingame();
@@ -340,6 +341,7 @@ class mame_ui_manager : public ui_manager
 
 	// private methods
 	void set_handler(ui_callback_type callback_type, handler_callback_func &&callback);
+	void activate_menu();
 	void frame_update();
 	void exit();
 	void increase_frameskip();