Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 10:29:38 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

use aggregate flags for -ui simple as well (nw)

Browse Source
This commit is contained in:
Vas Crabb 2017-07-27 18:36:36 +10:00
parent 0ce3a4da39
commit 53f566e457
6 changed files with 93 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/mame/ui/info.cpp
View File

@ -72,6 +72,22 @@ machine_static_info::machine_static_info(machine_config const &config)
}
//-------------------------------------------------
// status_color - returns suitable colour for
// driver status box
//-------------------------------------------------
rgb_t machine_static_info::status_color() const
{
if ((machine_flags() & MACHINE_ERRORS) || ((unemulated_features() | imperfect_features()) & device_t::feature::PROTECTION))
return UI_RED_COLOR;
else if ((machine_flags() & MACHINE_WARNINGS) || unemulated_features() || imperfect_features())
return UI_YELLOW_COLOR;
else
return UI_GREEN_COLOR;
}
//-------------------------------------------------
// warnings_color - returns suitable colour for
// warning message based on severity

1
src/frontend/mame/ui/info.h
View File

@ -32,6 +32,7 @@ public:
bool has_bioses() const { return m_has_bioses; }
// message colour
rgb_t status_color() const;
rgb_t warnings_color() const;
private:

6
src/frontend/mame/ui/selmenu.cpp
View File

@ -128,7 +128,7 @@ menu_select_launch::system_flags::system_flags(machine_static_info const &info)
: m_machine_flags(info.machine_flags())
, m_unemulated_features(info.unemulated_features())
, m_imperfect_features(info.imperfect_features())
, m_warnings_color(info.warnings_color())
, m_status_color(info.status_color())
{
}
@ -699,9 +699,7 @@ void menu_select_launch::custom_render(void *selectedref, float top, float botto
else
tempbuf[4].append(_("Sound: OK"));
color = flags.warnings_color();
if (UI_BACKGROUND_COLOR == color)
color = UI_GREEN_COLOR;
color = flags.status_color();
}
else
{

4
src/frontend/mame/ui/selmenu.h
View File

@ -56,13 +56,13 @@ protected:
::machine_flags::type machine_flags() const { return m_machine_flags; }
device_t::feature_type unemulated_features() const { return m_unemulated_features; }
device_t::feature_type imperfect_features() const { return m_imperfect_features; }
rgb_t warnings_color() const { return m_warnings_color; }
rgb_t status_color() const { return m_status_color; }
private:
::machine_flags::type m_machine_flags;
device_t::feature_type m_unemulated_features;
device_t::feature_type m_imperfect_features;
rgb_t m_warnings_color;
rgb_t m_status_color;
};
class reselect_last

92
src/frontend/mame/ui/simpleselgame.cpp
View File

@ -12,9 +12,10 @@
#include "ui/simpleselgame.h"
#include "ui/ui.h"
#include "ui/info.h"
#include "ui/miscmenu.h"
#include "ui/optsmenu.h"
#include "ui/ui.h"
#include "ui/utils.h"
#include "audit.h"
@ -27,11 +28,21 @@
namespace ui {
//-------------------------------------------------
// ctor
//-------------------------------------------------
simple_menu_select_game::simple_menu_select_game(mame_ui_manager &mui, render_container &container, const char *gamename) : menu(mui, container), m_driverlist(driver_list::total() + 1)
simple_menu_select_game::simple_menu_select_game(mame_ui_manager &mui, render_container &container, const char *gamename)
: menu(mui, container)
, m_error(false), m_rerandomize(false)
, m_search()
, m_driverlist(driver_list::total() + 1)
, m_drivlist()
, m_cached_driver(nullptr)
, m_cached_flags(machine_flags::NOT_WORKING)
, m_cached_unemulated(device_t::feature::NONE), m_cached_imperfect(device_t::feature::NONE)
, m_cached_color(UI_BACKGROUND_COLOR)
{
build_driver_list();
if (gamename)
@ -63,10 +74,9 @@ void simple_menu_select_game::build_driver_list()
// open a path to the ROMs and find them in the array
file_enumerator path(machine().options().media_path());
const osd::directory::entry *dir;
// iterate while we get new objects
while ((dir = path.next()) != nullptr)
for (const osd::directory::entry *dir = path.next(); dir; dir = path.next())
{
char drivername[50];
char *dst = drivername;
@ -133,10 +143,13 @@ void simple_menu_select_game::handle()
// if we're in an error state, overlay an error message
if (m_error)
ui().draw_text_box(container(),
"The selected game is missing one or more required ROM or CHD images. "
"Please select a different game.\n\nPress any key to continue.",
ui::text_layout::CENTER, 0.5f, 0.5f, UI_RED_COLOR);
{
ui().draw_text_box(
container(),
_("The selected game is missing one or more required ROM or CHD images. "
"Please select a different game.\n\nPress any key to continue."),
ui::text_layout::CENTER, 0.5f, 0.5f, UI_RED_COLOR);
}
}
@ -160,17 +173,16 @@ void simple_menu_select_game::inkey_select(const event *menu_event)
media_auditor auditor(enumerator);
media_auditor::summary summary = auditor.audit_media(AUDIT_VALIDATE_FAST);
// if everything looks good, schedule the new driver
if (summary == media_auditor::CORRECT || summary == media_auditor::BEST_AVAILABLE || summary == media_auditor::NONE_NEEDED)
{
// if everything looks good, schedule the new driver
mame_machine_manager::instance()->schedule_new_driver(*driver);
machine().schedule_hard_reset();
stack_reset();
}
// otherwise, display an error
else
{
// otherwise, display an error
reset(reset_options::REMEMBER_REF);
m_error = true;
}
@ -277,7 +289,6 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
float width, maxwidth;
float x1, y1, x2, y2;
std::string tempbuf[5];
rgb_t color;
int line;
// display the current typeahead
@ -287,8 +298,12 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
tempbuf[0] = _("Type name or select: (random)");
// get the size of the text
ui().draw_text_full(container(), tempbuf[0].c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
ui().draw_text_full(
container(), tempbuf[0].c_str(),
0.0f, 0.0f, 1.0f,
ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(),
&width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(width, origx2 - origx1);
@ -307,15 +322,17 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
y1 += UI_BOX_TB_BORDER;
// draw the text within it
ui().draw_text_full(container(), tempbuf[0].c_str(), x1, y1, x2 - x1, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
ui().draw_text_full(
container(), tempbuf[0].c_str(),
x1, y1, x2 - x1,
ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR,
nullptr, nullptr);
// determine the text to render below
driver = ((uintptr_t)selectedref > skip_main_items) ? (const game_driver *)selectedref : nullptr;
if (driver != nullptr)
if (driver)
{
const char *gfxstat, *soundstat;
// first line is game name
tempbuf[0] = string_format(_("%1$-.100s"), driver->type.fullname());
@ -325,27 +342,41 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
// next line source path
tempbuf[2] = string_format(_("Driver: %1$-.100s"), core_filename_extract_base(driver->type.source()));
// update cached values if selection changed
if (driver != m_cached_driver)
{
emu_options clean_options;
machine_static_info const info(machine_config(*driver, clean_options));
m_cached_driver = driver;
m_cached_flags = info.machine_flags();
m_cached_unemulated = info.unemulated_features();
m_cached_imperfect = info.imperfect_features();
m_cached_color = info.status_color();
}
// next line is overall driver status
if (driver->flags & machine_flags::NOT_WORKING)
if (m_cached_flags & machine_flags::NOT_WORKING)
tempbuf[3] = _("Overall: NOT WORKING");
else if ((driver->type.unemulated_features() | driver->type.imperfect_features()) & device_t::feature::PROTECTION)
else if ((m_cached_unemulated | m_cached_imperfect) & device_t::feature::PROTECTION)
tempbuf[3] = _("Overall: Unemulated Protection");
else
tempbuf[3] = _("Overall: Working");
// next line is graphics, sound status
if (driver->type.unemulated_features() & device_t::feature::GRAPHICS)
const char *gfxstat;
if (m_cached_unemulated & device_t::feature::GRAPHICS)
gfxstat = _("Unimplemented");
else if ((driver->type.unemulated_features() | driver->type.imperfect_features()) & (device_t::feature::GRAPHICS | device_t::feature::PALETTE))
else if ((m_cached_unemulated | m_cached_imperfect) & (device_t::feature::GRAPHICS | device_t::feature::PALETTE))
gfxstat = _("Imperfect");
else
gfxstat = _("OK");
if (driver->flags & machine_flags::NO_SOUND_HW)
const char *soundstat;
if (m_cached_flags & machine_flags::NO_SOUND_HW)
soundstat = _("None");
else if (driver->type.unemulated_features() & device_t::feature::SOUND)
else if (m_cached_unemulated & device_t::feature::SOUND)
soundstat = _("Unimplemented");
else if (driver->type.imperfect_features() & device_t::feature::SOUND)
else if (m_cached_imperfect & device_t::feature::SOUND)
soundstat = _("Imperfect");
else
soundstat = _("OK");
@ -394,14 +425,7 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
y2 = origy2 + bottom;
// draw a box
if (!driver)
color = UI_BACKGROUND_COLOR;
else if ((driver->flags & machine_flags::NOT_WORKING) || ((driver->type.unemulated_features() | driver->type.imperfect_features()) & device_t::feature::PROTECTION))
color = UI_RED_COLOR;
else if (driver->type.unemulated_features() || driver->type.imperfect_features())
color = UI_YELLOW_COLOR;
else
color = UI_GREEN_COLOR;
rgb_t const color = driver ? m_cached_color : UI_BACKGROUND_COLOR;
ui().draw_outlined_box(container(), x1, y1, x2, y2, color);
// take off the borders

19
src/frontend/mame/ui/simpleselgame.h
View File

@ -18,7 +18,9 @@
class driver_enumerator;
namespace ui {
class simple_menu_select_game : public menu {
class simple_menu_select_game : public menu
{
public:
simple_menu_select_game(mame_ui_manager &mui, render_container &container, const char *gamename);
virtual ~simple_menu_select_game();
@ -43,14 +45,21 @@ private:
void inkey_special(const event *menu_event);
// internal state
uint8_t m_error;
bool m_error;
bool m_rerandomize;
std::string m_search;
int m_matchlist[VISIBLE_GAMES_IN_LIST];
std::vector<const game_driver *> m_driverlist;
std::unique_ptr<driver_enumerator> m_drivlist;
std::vector<const game_driver *> m_driverlist;
std::unique_ptr<driver_enumerator> m_drivlist;
// cached driver flags
const game_driver * m_cached_driver;
machine_flags::type m_cached_flags;
device_t::feature_type m_cached_unemulated;
device_t::feature_type m_cached_imperfect;
rgb_t m_cached_color;
};
} // namespace ui
#endif /* MAME_FRONTEND_UI_SIMPLESELGAME_H */
#endif // MAME_FRONTEND_UI_SIMPLESELGAME_H