Previous 199869 Revisions Next

r44666 Thursday 4th February, 2016 at 14:14:27 UTC by Miodrag Milanović
more mewui -> ui renames (nw)
[src/emu]emuopts.cpp emuopts.h
[src/emu/ui]custui.cpp dirmenu.cpp dsplmenu.cpp menu.cpp miscmenu.cpp moptions.cpp moptions.h optsmenu.cpp selector.cpp selgame.cpp selsoft.cpp utils.cpp utils.h

trunk/src/emu/emuopts.cpp
r253177r253178
201201//-------------------------------------------------
202202
203203emu_options::emu_options()
204: mewui_options()
204: ui_options()
205205, m_coin_impulse(0)
206206, m_joystick_contradictory(false)
207207, m_sleep(true)
trunk/src/emu/emuopts.h
r253177r253178
201201class software_part;
202202
203203
204class emu_options : public mewui_options
204class emu_options : public ui_options
205205{
206206   static const UINT32 OPTION_FLAG_DEVICE = 0x80000000;
207207
trunk/src/emu/ui/custui.cpp
r253177r253178
3333ui_menu_custom_ui::~ui_menu_custom_ui()
3434{
3535   std::string error_string;
36   machine().options().set_value(OPTION_HIDE_PANELS, mewui_globals::panels_status, OPTION_PRIORITY_CMDLINE, error_string);
37   mewui_globals::reset = true;
36   machine().options().set_value(OPTION_HIDE_PANELS, ui_globals::panels_status, OPTION_PRIORITY_CMDLINE, error_string);
37   ui_globals::reset = true;
3838}
3939
4040//-------------------------------------------------
r253177r253178
5353      if (m_event->iptkey == IPT_UI_LEFT || m_event->iptkey == IPT_UI_RIGHT)
5454      {
5555         changed = true;
56         (m_event->iptkey == IPT_UI_RIGHT) ? mewui_globals::panels_status++ : mewui_globals::panels_status--;
56         (m_event->iptkey == IPT_UI_RIGHT) ? ui_globals::panels_status++ : ui_globals::panels_status--;
5757      }
5858
5959
r253177r253178
7575               for (int index = 0; index < total; ++index)
7676                  s_sel[index] = hide_status[index];
7777
78               ui_menu::stack_push(global_alloc_clear<ui_menu_selector>(machine(), container, s_sel, mewui_globals::panels_status));
78               ui_menu::stack_push(global_alloc_clear<ui_menu_selector>(machine(), container, s_sel, ui_globals::panels_status));
7979            }
8080         }
8181      }
r253177r253178
9494   item_append("Fonts", nullptr, 0, (void *)(FPTR)FONT_MENU);
9595   item_append("Colors", nullptr, 0, (void *)(FPTR)COLORS_MENU);
9696
97   UINT32 arrow_flags = get_arrow_flags(0, (int)HIDE_BOTH, mewui_globals::panels_status);
98   item_append("Filters and Info/Image", hide_status[mewui_globals::panels_status], arrow_flags, (void *)(FPTR)HIDE_MENU);
97   UINT32 arrow_flags = get_arrow_flags(0, (int)HIDE_BOTH, ui_globals::panels_status);
98   item_append("Filters and Info/Image", hide_status[ui_globals::panels_status], arrow_flags, (void *)(FPTR)HIDE_MENU);
9999
100100   item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
101101   customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER;
trunk/src/emu/ui/dirmenu.cpp
r253177r253178
327327ui_menu_directory::~ui_menu_directory()
328328{
329329   save_game_options(machine());
330   mewui_globals::reset = true;
330   ui_globals::reset = true;
331331}
332332
333333//-------------------------------------------------
trunk/src/emu/ui/dsplmenu.cpp
r253177r253178
8989      machine().options().set_value(m_options[d].option, m_options[d].status, OPTION_PRIORITY_CMDLINE, error_string);
9090
9191   machine().options().set_value(m_options[1].option, m_video[m_options[1].status].option, OPTION_PRIORITY_CMDLINE, error_string);
92   mewui_globals::reset = true;
92   ui_globals::reset = true;
9393}
9494
9595//-------------------------------------------------
trunk/src/emu/ui/menu.cpp
r253177r253178
13631363   float ud_arrow_width = line_height * machine().render().ui_aspect();
13641364   float gutter_width = 0.4f * line_height * machine().render().ui_aspect() * 1.3f;
13651365   mouse_x = -1, mouse_y = -1;
1366   float right_panel_size = (mewui_globals::panels_status == HIDE_BOTH || mewui_globals::panels_status == HIDE_RIGHT_PANEL) ? 2.0f * UI_BOX_LR_BORDER : 0.3f;
1366   float right_panel_size = (ui_globals::panels_status == HIDE_BOTH || ui_globals::panels_status == HIDE_RIGHT_PANEL) ? 2.0f * UI_BOX_LR_BORDER : 0.3f;
13671367   float visible_width = 1.0f - 4.0f * UI_BOX_LR_BORDER;
13681368   float primary_left = (1.0f - visible_width) * 0.5f;
13691369   float primary_width = visible_width;
r253177r253178
13971397   visible_main_menu_height = (float)(visible_lines * line_height);
13981398
13991399   if (!is_swlist)
1400      mewui_globals::visible_main_lines = visible_lines;
1400      ui_globals::visible_main_lines = visible_lines;
14011401   else
1402      mewui_globals::visible_sw_lines = visible_lines;
1402      ui_globals::visible_sw_lines = visible_lines;
14031403
14041404   // compute top/left of inner menu area by centering
14051405   float visible_left = primary_left;
r253177r253178
16001600
16011601   // reset redraw icon stage
16021602   if (!is_swlist)
1603      mewui_globals::redraw_icon = false;
1603      ui_globals::redraw_icon = false;
16041604}
16051605
16061606//-------------------------------------------------
r253177r253178
16101610void ui_menu::get_title_search(std::string &snaptext, std::string &searchstr)
16111611{
16121612   // get arts title text
1613   snaptext.assign(arts_info[mewui_globals::curimage_view].title);
1613   snaptext.assign(arts_info[ui_globals::curimage_view].title);
16141614
16151615   // get search path
1616   path_iterator path(machine().options().value(arts_info[mewui_globals::curimage_view].path));
1616   path_iterator path(machine().options().value(arts_info[ui_globals::curimage_view].path));
16171617   std::string curpath;
1618   searchstr.assign(machine().options().value(arts_info[mewui_globals::curimage_view].path));
1618   searchstr.assign(machine().options().value(arts_info[ui_globals::curimage_view].path));
16191619
16201620   // iterate over path and add path for zipped formats
16211621   while (path.next(curpath))
16221622   {
1623      path_iterator path_iter(arts_info[mewui_globals::curimage_view].addpath);
1623      path_iterator path_iter(arts_info[ui_globals::curimage_view].addpath);
16241624      std::string c_path;
16251625      while (path_iter.next(c_path))
16261626         searchstr.append(";").append(curpath).append(PATH_SEPARATOR).append(c_path);
r253177r253178
16641664   validate_selection(1);
16651665
16661666   // swallow left/right keys if they are not appropriate
1667   bool ignoreleft = ((item[selected].flags & MENU_FLAG_LEFT_ARROW) == 0 || mewui_globals::panels_status == HIDE_BOTH || mewui_globals::panels_status == HIDE_RIGHT_PANEL);
1668   bool ignoreright = ((item[selected].flags & MENU_FLAG_RIGHT_ARROW) == 0 || mewui_globals::panels_status == HIDE_BOTH || mewui_globals::panels_status == HIDE_RIGHT_PANEL);
1669   bool ignoreup = (mewui_globals::panels_status == HIDE_BOTH || mewui_globals::panels_status == HIDE_LEFT_PANEL);
1670   bool ignoredown = (mewui_globals::panels_status == HIDE_BOTH || mewui_globals::panels_status == HIDE_LEFT_PANEL);
1667   bool ignoreleft = ((item[selected].flags & MENU_FLAG_LEFT_ARROW) == 0 || ui_globals::panels_status == HIDE_BOTH || ui_globals::panels_status == HIDE_RIGHT_PANEL);
1668   bool ignoreright = ((item[selected].flags & MENU_FLAG_RIGHT_ARROW) == 0 || ui_globals::panels_status == HIDE_BOTH || ui_globals::panels_status == HIDE_RIGHT_PANEL);
1669   bool ignoreup = (ui_globals::panels_status == HIDE_BOTH || ui_globals::panels_status == HIDE_LEFT_PANEL);
1670   bool ignoredown = (ui_globals::panels_status == HIDE_BOTH || ui_globals::panels_status == HIDE_LEFT_PANEL);
16711671
16721672   input_manager &minput = machine().input();
16731673   // accept left/right keys as-is with repeat
r253177r253178
18931893               topline_datsview -= right_visible_lines - 1;
18941894            else if (hover == HOVER_LPANEL_ARROW)
18951895            {
1896               if (mewui_globals::panels_status == HIDE_LEFT_PANEL)
1897                  mewui_globals::panels_status = SHOW_PANELS;
1898               else if (mewui_globals::panels_status == HIDE_BOTH)
1899                  mewui_globals::panels_status = HIDE_RIGHT_PANEL;
1900               else if (mewui_globals::panels_status == SHOW_PANELS)
1901                  mewui_globals::panels_status = HIDE_LEFT_PANEL;
1902               else if (mewui_globals::panels_status == HIDE_RIGHT_PANEL)
1903                  mewui_globals::panels_status = HIDE_BOTH;
1896               if (ui_globals::panels_status == HIDE_LEFT_PANEL)
1897                  ui_globals::panels_status = SHOW_PANELS;
1898               else if (ui_globals::panels_status == HIDE_BOTH)
1899                  ui_globals::panels_status = HIDE_RIGHT_PANEL;
1900               else if (ui_globals::panels_status == SHOW_PANELS)
1901                  ui_globals::panels_status = HIDE_LEFT_PANEL;
1902               else if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
1903                  ui_globals::panels_status = HIDE_BOTH;
19041904            }
19051905            else if (hover == HOVER_RPANEL_ARROW)
19061906            {
1907               if (mewui_globals::panels_status == HIDE_RIGHT_PANEL)
1908                  mewui_globals::panels_status = SHOW_PANELS;
1909               else if (mewui_globals::panels_status == HIDE_BOTH)
1910                  mewui_globals::panels_status = HIDE_LEFT_PANEL;
1911               else if (mewui_globals::panels_status == SHOW_PANELS)
1912                  mewui_globals::panels_status = HIDE_RIGHT_PANEL;
1913               else if (mewui_globals::panels_status == HIDE_LEFT_PANEL)
1914                  mewui_globals::panels_status = HIDE_BOTH;
1907               if (ui_globals::panels_status == HIDE_RIGHT_PANEL)
1908                  ui_globals::panels_status = SHOW_PANELS;
1909               else if (ui_globals::panels_status == HIDE_BOTH)
1910                  ui_globals::panels_status = HIDE_LEFT_PANEL;
1911               else if (ui_globals::panels_status == SHOW_PANELS)
1912                  ui_globals::panels_status = HIDE_RIGHT_PANEL;
1913               else if (ui_globals::panels_status == HIDE_LEFT_PANEL)
1914                  ui_globals::panels_status = HIDE_BOTH;
19151915            }
19161916            else if (hover == HOVER_B_FAV)
19171917            {
r253177r253178
19581958            }
19591959            else if (hover >= HOVER_RP_FIRST && hover <= HOVER_RP_LAST)
19601960            {
1961               mewui_globals::rpanel = (HOVER_RP_FIRST - hover) * (-1);
1961               ui_globals::rpanel = (HOVER_RP_FIRST - hover) * (-1);
19621962               stop = true;
19631963            }
19641964            else if (hover >= HOVER_SW_FILTER_FIRST && hover <= HOVER_SW_FILTER_LAST)
r253177r253178
21162116
21172117      if (mouse_hit && x1 <= mouse_x && x1 + midl > mouse_x && y1 <= mouse_y && y1 + line_height > mouse_y)
21182118      {
2119         if (mewui_globals::rpanel != cells)
2119         if (ui_globals::rpanel != cells)
21202120         {
21212121            bgcolor = UI_MOUSEOVER_BG_COLOR;
21222122            fgcolor = UI_MOUSEOVER_COLOR;
r253177r253178
21242124         }
21252125      }
21262126
2127      if (mewui_globals::rpanel != cells)
2127      if (ui_globals::rpanel != cells)
21282128      {
21292129         container->add_line(x1, y1 + line_height, x1 + midl, y1 + line_height, UI_LINE_WIDTH,
21302130            UI_BORDER_COLOR, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
r253177r253178
21682168   machine().ui().draw_text_full(container, snaptext.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE,
21692169      DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
21702170
2171   draw_common_arrow(origx1, origy1, origx2, origy2, mewui_globals::curimage_view, FIRST_VIEW, LAST_VIEW, title_size);
2171   draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::curimage_view, FIRST_VIEW, LAST_VIEW, title_size);
21722172
21732173   return searchstr;
21742174}
r253177r253178
22722272      int dest_yPixel = tmp_bitmap->height();
22732273
22742274      // force 4:3 ratio min
2275      if (machine().options().forced_4x3_snapshot() && ratioI < 0.75f && mewui_globals::curimage_view == SNAPSHOT_VIEW)
2275      if (machine().options().forced_4x3_snapshot() && ratioI < 0.75f && ui_globals::curimage_view == SNAPSHOT_VIEW)
22762276      {
22772277         // smaller ratio will ensure that the image fits in the view
22782278         dest_yPixel = tmp_bitmap->width() * 0.75f;
r253177r253178
23872387   if (driver == nullptr)
23882388      return;
23892389
2390   if (olddriver[linenum] != driver || mewui_globals::redraw_icon)
2390   if (olddriver[linenum] != driver || ui_globals::redraw_icon)
23912391   {
23922392      olddriver[linenum] = driver;
23932393
trunk/src/emu/ui/miscmenu.cpp
r253177r253178
587587   std::string error_string;
588588   for (int d = 1; d < ARRAY_LENGTH(m_options); ++d)
589589      machine().options().set_value(m_options[d].option, m_options[d].status, OPTION_PRIORITY_CMDLINE, error_string);
590   mewui_globals::reset = true;
590   ui_globals::reset = true;
591591}
592592
593593//-------------------------------------------------
r253177r253178
607607         changed = true;
608608         int value = (FPTR)m_event->itemref;
609609         if (!strcmp(m_options[value].option, OPTION_ENLARGE_SNAPS))
610            mewui_globals::switch_image = true;
610            ui_globals::switch_image = true;
611611         m_options[value].status = !m_options[value].status;
612612      }
613613   }
trunk/src/emu/ui/moptions.cpp
r253177r253178
1616//  MEWUI EXTRA OPTIONS
1717//**************************************************************************
1818
19const options_entry mewui_options::s_option_entries[] =
19const options_entry ui_options::s_option_entries[] =
2020{
2121   // seach path options
2222   { nullptr,                              nullptr,         OPTION_HEADER,  "MEWUI SEARCH PATH OPTIONS" },
r253177r253178
7979};
8080
8181//-------------------------------------------------
82//  mewui_options - constructor
82//  ui_options - constructor
8383//-------------------------------------------------
8484
85mewui_options::mewui_options()
85ui_options::ui_options()
8686: core_options()
8787{
88   add_entries(mewui_options::s_option_entries);
88   add_entries(ui_options::s_option_entries);
8989}
trunk/src/emu/ui/moptions.h
r253177r253178
7171#define OPTION_UI_DIPSW_COLOR         "ui_dipsw_color"
7272#define OPTION_UI_SLIDER_COLOR        "ui_slider_color"
7373
74class mewui_options : public core_options
74class ui_options : public core_options
7575{
7676public:
7777   // construction/destruction
78   mewui_options();
78   ui_options();
7979
8080   // Search path options
8181   const char *history_path() const { return value(OPTION_HISTORY_PATH); }
trunk/src/emu/ui/optsmenu.cpp
r253177r253178
4040{
4141   ui_menu::menu_stack->reset(UI_MENU_RESET_SELECT_FIRST);
4242   save_game_options(machine());
43   mewui_globals::switch_image = true;
43   ui_globals::switch_image = true;
4444}
4545
4646//-------------------------------------------------
trunk/src/emu/ui/selector.cpp
r253177r253178
7878               break;
7979         }
8080
81         mewui_globals::switch_image = true;
81         ui_globals::switch_image = true;
8282         ui_menu::stack_pop(machine());
8383      }
8484      else if (m_event->iptkey == IPT_SPECIAL)
trunk/src/emu/ui/selgame.cpp
r253177r253178
169169   moptions.set_value(OPTION_SNAPNAME, "%g/%i", OPTION_PRIORITY_CMDLINE, error_string);
170170   moptions.set_value(OPTION_SOFTWARENAME, "", OPTION_PRIORITY_CMDLINE, error_string);
171171
172   mewui_globals::curimage_view = FIRST_VIEW;
173   mewui_globals::curdats_view = MEWUI_FIRST_LOAD;
174   mewui_globals::switch_image = false;
175   mewui_globals::default_image = true;
172   ui_globals::curimage_view = FIRST_VIEW;
173   ui_globals::curdats_view = MEWUI_FIRST_LOAD;
174   ui_globals::switch_image = false;
175   ui_globals::default_image = true;
176176   ume_filters::actual = moptions.start_filter();
177   mewui_globals::panels_status = moptions.hide_panels();
177   ui_globals::panels_status = moptions.hide_panels();
178178}
179179
180180//-------------------------------------------------
r253177r253178
209209   mopt.set_value(OPTION_START_FILTER, ume_filters::actual, OPTION_PRIORITY_CMDLINE, error_string);
210210   mopt.set_value(OPTION_LAST_USED_FILTER, filter.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
211211   mopt.set_value(OPTION_LAST_USED_MACHINE, last_driver.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
212   mopt.set_value(OPTION_HIDE_PANELS, mewui_globals::panels_status, OPTION_PRIORITY_CMDLINE, error_string);
212   mopt.set_value(OPTION_HIDE_PANELS, ui_globals::panels_status, OPTION_PRIORITY_CMDLINE, error_string);
213213   save_game_options(machine());
214214}
215215
r253177r253178
223223   bool enabled_dats = machine().options().enabled_dats();
224224
225225   // if i have to load datfile, performe an hard reset
226   if (mewui_globals::reset)
226   if (ui_globals::reset)
227227   {
228      mewui_globals::reset = false;
228      ui_globals::reset = false;
229229      machine().schedule_hard_reset();
230230      ui_menu::stack_reset(machine());
231231      return;
r253177r253178
263263      else if (m_event->iptkey == IPT_UI_LEFT)
264264      {
265265         // Images
266         if (mewui_globals::rpanel == RP_IMAGES && mewui_globals::curimage_view > FIRST_VIEW)
266         if (ui_globals::rpanel == RP_IMAGES && ui_globals::curimage_view > FIRST_VIEW)
267267         {
268            mewui_globals::curimage_view--;
269            mewui_globals::switch_image = true;
270            mewui_globals::default_image = false;
268            ui_globals::curimage_view--;
269            ui_globals::switch_image = true;
270            ui_globals::default_image = false;
271271         }
272272
273273         // Infos
274         else if (mewui_globals::rpanel == RP_INFOS && mewui_globals::curdats_view > MEWUI_FIRST_LOAD)
274         else if (ui_globals::rpanel == RP_INFOS && ui_globals::curdats_view > MEWUI_FIRST_LOAD)
275275         {
276            mewui_globals::curdats_view--;
276            ui_globals::curdats_view--;
277277            topline_datsview = 0;
278278         }
279279      }
r253177r253178
282282      else if (m_event->iptkey == IPT_UI_RIGHT)
283283      {
284284         // Images
285         if (mewui_globals::rpanel == RP_IMAGES && mewui_globals::curimage_view < LAST_VIEW)
285         if (ui_globals::rpanel == RP_IMAGES && ui_globals::curimage_view < LAST_VIEW)
286286         {
287            mewui_globals::curimage_view++;
288            mewui_globals::switch_image = true;
289            mewui_globals::default_image = false;
287            ui_globals::curimage_view++;
288            ui_globals::switch_image = true;
289            ui_globals::default_image = false;
290290         }
291291
292292         // Infos
293         else if (mewui_globals::rpanel == RP_INFOS && mewui_globals::curdats_view < MEWUI_LAST_LOAD)
293         else if (ui_globals::rpanel == RP_INFOS && ui_globals::curdats_view < MEWUI_LAST_LOAD)
294294         {
295            mewui_globals::curdats_view++;
295            ui_globals::curdats_view++;
296296            topline_datsview = 0;
297297         }
298298      }
r253177r253178
313313
314314      // handle UI_LEFT_PANEL
315315      else if (m_event->iptkey == IPT_UI_LEFT_PANEL)
316         mewui_globals::rpanel = RP_IMAGES;
316         ui_globals::rpanel = RP_IMAGES;
317317
318318      // handle UI_RIGHT_PANEL
319319      else if (m_event->iptkey == IPT_UI_RIGHT_PANEL)
320         mewui_globals::rpanel = RP_INFOS;
320         ui_globals::rpanel = RP_INFOS;
321321
322322      // escape pressed with non-empty text clears the text
323323      else if (m_event->iptkey == IPT_UI_CANCEL && m_search[0] != 0)
r253177r253178
547547
548548void ui_menu_select_game::populate()
549549{
550   mewui_globals::redraw_icon = true;
551   mewui_globals::switch_image = true;
550   ui_globals::redraw_icon = true;
551   ui_globals::switch_image = true;
552552   int old_item_selected = -1;
553553
554554   if (main_filters::actual != FILTER_FAVORITE_GAME)
r253177r253178
668668   if (old_item_selected != -1)
669669   {
670670      selected = old_item_selected;
671      if (mewui_globals::visible_main_lines == 0)
671      if (ui_globals::visible_main_lines == 0)
672672         top_line = (selected != 0) ? selected - 1 : 0;
673673      else
674         top_line = selected - (mewui_globals::visible_main_lines / 2);
674         top_line = selected - (ui_globals::visible_main_lines / 2);
675675
676676      if (reselect_last::software.empty())
677677         reselect_last::reset();
r253177r253178
19421942   ui_manager &mui = machine().ui();
19431943   float line_height = mui.get_line_height();
19441944
1945   if (mewui_globals::panels_status == SHOW_PANELS || mewui_globals::panels_status == HIDE_RIGHT_PANEL)
1945   if (ui_globals::panels_status == SHOW_PANELS || ui_globals::panels_status == HIDE_RIGHT_PANEL)
19461946   {
19471947      float origy1 = y1;
19481948      float origy2 = y2;
r253177r253178
21312131      float oy1 = origy1 + line_height;
21322132
21332133      // MAMESCORE? Full size text
2134      if (mewui_globals::curdats_view == MEWUI_STORY_LOAD)
2134      if (ui_globals::curdats_view == MEWUI_STORY_LOAD)
21352135         text_size = 1.0f;
21362136
2137      std::string snaptext(dats_info[mewui_globals::curdats_view]);
2137      std::string snaptext(dats_info[ui_globals::curdats_view]);
21382138
21392139      // apply title to right panel
21402140      float title_size = 0.0f;
r253177r253178
21512151      mui.draw_text_full(container, snaptext.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER,
21522152         WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
21532153
2154      draw_common_arrow(origx1, origy1, origx2, origy2, mewui_globals::curdats_view, MEWUI_FIRST_LOAD, MEWUI_LAST_LOAD, title_size);
2154      draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::curdats_view, MEWUI_FIRST_LOAD, MEWUI_LAST_LOAD, title_size);
21552155
2156      if (driver != olddriver || mewui_globals::curdats_view != oldview)
2156      if (driver != olddriver || ui_globals::curdats_view != oldview)
21572157      {
21582158         buffer.clear();
21592159         olddriver = driver;
2160         oldview = mewui_globals::curdats_view;
2160         oldview = ui_globals::curdats_view;
21612161         topline_datsview = 0;
21622162         totallines = 0;
21632163         std::vector<std::string> m_item;
21642164
2165         if (mewui_globals::curdats_view == MEWUI_GENERAL_LOAD)
2165         if (ui_globals::curdats_view == MEWUI_GENERAL_LOAD)
21662166            general_info(driver, buffer);
2167         else if (mewui_globals::curdats_view != MEWUI_COMMAND_LOAD)
2168            machine().datfile().load_data_info(driver, buffer, mewui_globals::curdats_view);
2167         else if (ui_globals::curdats_view != MEWUI_COMMAND_LOAD)
2168            machine().datfile().load_data_info(driver, buffer, ui_globals::curdats_view);
21692169         else
21702170            machine().datfile().command_sub_menu(driver, m_item);
21712171
2172         if (!m_item.empty() && mewui_globals::curdats_view == MEWUI_COMMAND_LOAD)
2172         if (!m_item.empty() && ui_globals::curdats_view == MEWUI_COMMAND_LOAD)
21732173         {
21742174            for (size_t x = 0; x < m_item.size(); ++x)
21752175            {
r253177r253178
21892189            WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
21902190         return;
21912191      }
2192      else if (mewui_globals::curdats_view != MEWUI_STORY_LOAD && mewui_globals::curdats_view != MEWUI_COMMAND_LOAD)
2192      else if (ui_globals::curdats_view != MEWUI_STORY_LOAD && ui_globals::curdats_view != MEWUI_COMMAND_LOAD)
21932193         mui.wrap_text(container, buffer.c_str(), origx1, origy1, origx2 - origx1 - (2.0f * gutter_width), totallines, xstart, xend, text_size);
21942194      else
21952195         mui.wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (2.0f * gutter_width), totallines, xstart, xend, text_size);
r253177r253178
22152215         else if (r == r_visible_lines - 1 && itemline != totallines - 1)
22162216            info_arrow(1, origx1, origx2, oy1, line_height, text_size, ud_arrow_width);
22172217         // special case for mamescore
2218         else if (mewui_globals::curdats_view == MEWUI_STORY_LOAD)
2218         else if (ui_globals::curdats_view == MEWUI_STORY_LOAD)
22192219         {
22202220            // check size
22212221            float textlen = mui.get_string_width_ex(tempbuf.c_str(), text_size);
r253177r253178
22452245         }
22462246
22472247         // special case for command
2248         else if (mewui_globals::curdats_view == MEWUI_COMMAND_LOAD || mewui_globals::curdats_view == MEWUI_GENERAL_LOAD)
2248         else if (ui_globals::curdats_view == MEWUI_COMMAND_LOAD || ui_globals::curdats_view == MEWUI_GENERAL_LOAD)
22492249         {
22502250            // check size
22512251            float textlen = mui.get_string_width_ex(tempbuf.c_str(), text_size);
22522252            float tmp_size = (textlen > sc) ? text_size * (sc / textlen) : text_size;
22532253
2254            int first_dspace = (mewui_globals::curdats_view == MEWUI_COMMAND_LOAD) ? tempbuf.find("  ") : tempbuf.find(":");
2254            int first_dspace = (ui_globals::curdats_view == MEWUI_COMMAND_LOAD) ? tempbuf.find("  ") : tempbuf.find(":");
22552255            if (first_dspace > 0)
22562256            {
22572257               float effective_width = origx2 - origx1 - gutter_width;
r253177r253178
22902290      {
22912291         mui.draw_text_full(container, "History", origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE,
22922292            DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
2293         mewui_globals::cur_sw_dats_view = 0;
2293         ui_globals::cur_sw_dats_view = 0;
22942294      }
22952295      else
22962296      {
r253177r253178
23082308            title_size = MAX(txt_lenght, title_size);
23092309         }
23102310
2311         mui.draw_text_full(container, t_text[mewui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1,
2311         mui.draw_text_full(container, t_text[ui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1,
23122312            JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
23132313
2314         draw_common_arrow(origx1, origy1, origx2, origy2, mewui_globals::cur_sw_dats_view, 0, 1, title_size);
2314         draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::cur_sw_dats_view, 0, 1, title_size);
23152315      }
23162316
2317      if (oldsoft != soft || old_sw_view != mewui_globals::cur_sw_dats_view)
2317      if (oldsoft != soft || old_sw_view != ui_globals::cur_sw_dats_view)
23182318      {
23192319         buffer.clear();
2320         old_sw_view = mewui_globals::cur_sw_dats_view;
2320         old_sw_view = ui_globals::cur_sw_dats_view;
23212321         oldsoft = soft;
2322         if (mewui_globals::cur_sw_dats_view == 0)
2322         if (ui_globals::cur_sw_dats_view == 0)
23232323         {
23242324            if (soft->startempty == 1)
23252325               machine().datfile().load_data_info(soft->driver, buffer, MEWUI_HISTORY_LOAD);
r253177r253178
23752375   float line_height = mui.get_line_height();
23762376   float lr_arrow_width = 0.4f * line_height * machine().render().ui_aspect();
23772377   rgb_t fgcolor = UI_TEXT_COLOR;
2378   bool hide = (mewui_globals::panels_status == HIDE_RIGHT_PANEL || mewui_globals::panels_status == HIDE_BOTH);
2378   bool hide = (ui_globals::panels_status == HIDE_RIGHT_PANEL || ui_globals::panels_status == HIDE_BOTH);
23792379   float x2 = (hide) ? origx2 : origx1 + 2.0f * UI_BOX_LR_BORDER;
23802380
23812381   // set left-right arrows dimension
r253177r253178
24032403   origx1 = x2;
24042404   origy1 = draw_right_box_title(origx1, origy1, origx2, origy2);
24052405
2406   if (mewui_globals::rpanel == RP_IMAGES)
2406   if (ui_globals::rpanel == RP_IMAGES)
24072407      arts_render(selectedref, origx1, origy1, origx2, origy2);
24082408   else
24092409      infos_render(selectedref, origx1, origy1, origx2, origy2);
r253177r253178
24422442
24432443   if (driver)
24442444   {
2445      if (mewui_globals::default_image)
2446         ((driver->flags & MACHINE_TYPE_ARCADE) == 0) ? mewui_globals::curimage_view = CABINETS_VIEW : mewui_globals::curimage_view = SNAPSHOT_VIEW;
2445      if (ui_globals::default_image)
2446         ((driver->flags & MACHINE_TYPE_ARCADE) == 0) ? ui_globals::curimage_view = CABINETS_VIEW : ui_globals::curimage_view = SNAPSHOT_VIEW;
24472447
24482448      std::string searchstr;
24492449      searchstr = arts_render_common(origx1, origy1, origx2, origy2);
24502450
24512451      // loads the image if necessary
2452      if (driver != olddriver || !snapx_bitmap->valid() || mewui_globals::switch_image)
2452      if (driver != olddriver || !snapx_bitmap->valid() || ui_globals::switch_image)
24532453      {
24542454         emu_file snapfile(searchstr.c_str(), OPEN_FLAG_READ);
24552455         bitmap_argb32 *tmp_bitmap;
r253177r253178
25012501         }
25022502
25032503         olddriver = driver;
2504         mewui_globals::switch_image = false;
2504         ui_globals::switch_image = false;
25052505         arts_render_images(tmp_bitmap, origx1, origy1, origx2, origy2, false);
25062506         auto_free(machine(), tmp_bitmap);
25072507      }
r253177r253178
25222522   {
25232523      std::string fullname, pathname;
25242524
2525      if (mewui_globals::default_image)
2526         (soft->startempty == 0) ? mewui_globals::curimage_view = SNAPSHOT_VIEW : mewui_globals::curimage_view = CABINETS_VIEW;
2525      if (ui_globals::default_image)
2526         (soft->startempty == 0) ? ui_globals::curimage_view = SNAPSHOT_VIEW : ui_globals::curimage_view = CABINETS_VIEW;
25272527
25282528      // arts title and searchpath
25292529      std::string searchstr;
25302530      searchstr = arts_render_common(origx1, origy1, origx2, origy2);
25312531
25322532      // loads the image if necessary
2533      if (soft != oldsoft || !snapx_bitmap->valid() || mewui_globals::switch_image)
2533      if (soft != oldsoft || !snapx_bitmap->valid() || ui_globals::switch_image)
25342534      {
25352535         emu_file snapfile(searchstr.c_str(), OPEN_FLAG_READ);
25362536         bitmap_argb32 *tmp_bitmap;
r253177r253178
25482548               render_load_jpeg(*tmp_bitmap, snapfile, nullptr, fullname.c_str());
25492549            }
25502550         }
2551         else if (mewui_globals::curimage_view == TITLES_VIEW)
2551         else if (ui_globals::curimage_view == TITLES_VIEW)
25522552         {
25532553            // First attempt from name list
25542554            pathname.assign(soft->listname).append("_titles");
r253177r253178
25902590         }
25912591
25922592         oldsoft = soft;
2593         mewui_globals::switch_image = false;
2593         ui_globals::switch_image = false;
25942594         arts_render_images(tmp_bitmap, origx1, origy1, origx2, origy2, true);
25952595         auto_free(machine(), tmp_bitmap);
25962596      }
trunk/src/emu/ui/selsoft.cpp
r253177r253178
132132   build_software_list();
133133   load_sw_custom_filters();
134134
135   mewui_globals::curimage_view = SNAPSHOT_VIEW;
136   mewui_globals::switch_image = true;
137   mewui_globals::cur_sw_dats_view = MEWUI_FIRST_LOAD;
135   ui_globals::curimage_view = SNAPSHOT_VIEW;
136   ui_globals::switch_image = true;
137   ui_globals::cur_sw_dats_view = MEWUI_FIRST_LOAD;
138138
139139   std::string error_string;
140140   machine.options().set_value(OPTION_SOFTWARENAME, "", OPTION_PRIORITY_CMDLINE, error_string);
r253177r253178
146146
147147ui_menu_select_software::~ui_menu_select_software()
148148{
149   mewui_globals::curimage_view = CABINETS_VIEW;
150   mewui_globals::switch_image = true;
149   ui_globals::curimage_view = CABINETS_VIEW;
150   ui_globals::switch_image = true;
151151}
152152
153153//-------------------------------------------------
r253177r253178
178178      else if (m_event->iptkey == IPT_UI_LEFT)
179179      {
180180         // Images
181         if (mewui_globals::rpanel == RP_IMAGES && mewui_globals::curimage_view > FIRST_VIEW)
181         if (ui_globals::rpanel == RP_IMAGES && ui_globals::curimage_view > FIRST_VIEW)
182182         {
183            mewui_globals::curimage_view--;
184            mewui_globals::switch_image = true;
185            mewui_globals::default_image = false;
183            ui_globals::curimage_view--;
184            ui_globals::switch_image = true;
185            ui_globals::default_image = false;
186186         }
187187
188188         // Infos
189         else if (mewui_globals::rpanel == RP_INFOS && mewui_globals::cur_sw_dats_view > 0)
189         else if (ui_globals::rpanel == RP_INFOS && ui_globals::cur_sw_dats_view > 0)
190190         {
191            mewui_globals::cur_sw_dats_view--;
191            ui_globals::cur_sw_dats_view--;
192192            topline_datsview = 0;
193193         }
194194      }
r253177r253178
197197      else if (m_event->iptkey == IPT_UI_RIGHT)
198198      {
199199         // Images
200         if (mewui_globals::rpanel == RP_IMAGES && mewui_globals::curimage_view < LAST_VIEW)
200         if (ui_globals::rpanel == RP_IMAGES && ui_globals::curimage_view < LAST_VIEW)
201201         {
202            mewui_globals::curimage_view++;
203            mewui_globals::switch_image = true;
204            mewui_globals::default_image = false;
202            ui_globals::curimage_view++;
203            ui_globals::switch_image = true;
204            ui_globals::default_image = false;
205205         }
206206
207207         // Infos
208         else if (mewui_globals::rpanel == RP_INFOS && mewui_globals::cur_sw_dats_view < 1)
208         else if (ui_globals::rpanel == RP_INFOS && ui_globals::cur_sw_dats_view < 1)
209209         {
210            mewui_globals::cur_sw_dats_view++;
210            ui_globals::cur_sw_dats_view++;
211211            topline_datsview = 0;
212212         }
213213      }
r253177r253178
237237
238238      // handle UI_LEFT_PANEL
239239      else if (m_event->iptkey == IPT_UI_LEFT_PANEL)
240         mewui_globals::rpanel = RP_IMAGES;
240         ui_globals::rpanel = RP_IMAGES;
241241
242242      // handle UI_RIGHT_PANEL
243243      else if (m_event->iptkey == IPT_UI_RIGHT_PANEL)
244         mewui_globals::rpanel = RP_INFOS;
244         ui_globals::rpanel = RP_INFOS;
245245
246246      // escape pressed with non-empty text clears the text
247247      else if (m_event->iptkey == IPT_UI_CANCEL && m_search[0] != 0)
r253177r253178
444444   if (old_software != -1)
445445   {
446446      selected = old_software;
447      top_line = selected - (mewui_globals::visible_sw_lines / 2);
447      top_line = selected - (ui_globals::visible_sw_lines / 2);
448448   }
449449
450450   reselect_last::reset();
r253177r253178
12581258{
12591259   ui_manager &mui = machine().ui();
12601260
1261   if (mewui_globals::panels_status == SHOW_PANELS || mewui_globals::panels_status == HIDE_RIGHT_PANEL)
1261   if (ui_globals::panels_status == SHOW_PANELS || ui_globals::panels_status == HIDE_RIGHT_PANEL)
12621262   {
12631263      float origy1 = y1;
12641264      float origy2 = y2;
r253177r253178
14311431   {
14321432      mui.draw_text_full(container, "History", origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE,
14331433                                    DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr);
1434      mewui_globals::cur_sw_dats_view = 0;
1434      ui_globals::cur_sw_dats_view = 0;
14351435   }
14361436   else
14371437   {
r253177r253178
14491449         title_size = MAX(txt_lenght, title_size);
14501450      }
14511451
1452      mui.draw_text_full(container, t_text[mewui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1,
1452      mui.draw_text_full(container, t_text[ui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1,
14531453                                    JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR,
14541454                                    nullptr, nullptr);
14551455
1456      draw_common_arrow(origx1, origy1, origx2, origy2, mewui_globals::cur_sw_dats_view, 0, 1, title_size);
1456      draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::cur_sw_dats_view, 0, 1, title_size);
14571457   }
14581458
1459   if (oldsoft != soft || old_sw_view != mewui_globals::cur_sw_dats_view)
1459   if (oldsoft != soft || old_sw_view != ui_globals::cur_sw_dats_view)
14601460   {
14611461      buffer.clear();
1462      old_sw_view = mewui_globals::cur_sw_dats_view;
1462      old_sw_view = ui_globals::cur_sw_dats_view;
14631463      oldsoft = soft;
1464      if (mewui_globals::cur_sw_dats_view == 0)
1464      if (ui_globals::cur_sw_dats_view == 0)
14651465      {
14661466         if (soft->startempty == 1)
14671467            machine().datfile().load_data_info(soft->driver, buffer, MEWUI_HISTORY_LOAD);
r253177r253178
15361536
15371537   if (driver)
15381538   {
1539      if (mewui_globals::default_image)
1540         ((driver->flags & MACHINE_TYPE_ARCADE) == 0) ? mewui_globals::curimage_view = CABINETS_VIEW : mewui_globals::curimage_view = SNAPSHOT_VIEW;
1539      if (ui_globals::default_image)
1540         ((driver->flags & MACHINE_TYPE_ARCADE) == 0) ? ui_globals::curimage_view = CABINETS_VIEW : ui_globals::curimage_view = SNAPSHOT_VIEW;
15411541
15421542      std::string searchstr;
15431543      searchstr = arts_render_common(origx1, origy1, origx2, origy2);
15441544
15451545      // loads the image if necessary
1546      if (driver != olddriver || !snapx_bitmap->valid() || mewui_globals::switch_image)
1546      if (driver != olddriver || !snapx_bitmap->valid() || ui_globals::switch_image)
15471547      {
15481548         emu_file snapfile(searchstr.c_str(), OPEN_FLAG_READ);
15491549         bitmap_argb32 *tmp_bitmap;
r253177r253178
15951595         }
15961596
15971597         olddriver = driver;
1598         mewui_globals::switch_image = false;
1598         ui_globals::switch_image = false;
15991599         arts_render_images(tmp_bitmap, origx1, origy1, origx2, origy2, false);
16001600         auto_free(machine(), tmp_bitmap);
16011601      }
r253177r253178
16151615   else if (soft)
16161616   {
16171617      std::string fullname, pathname;
1618      if (mewui_globals::default_image)
1619         (soft->startempty == 0) ? mewui_globals::curimage_view = SNAPSHOT_VIEW : mewui_globals::curimage_view = CABINETS_VIEW;
1618      if (ui_globals::default_image)
1619         (soft->startempty == 0) ? ui_globals::curimage_view = SNAPSHOT_VIEW : ui_globals::curimage_view = CABINETS_VIEW;
16201620
16211621      // arts title and searchpath
16221622      std::string searchstr;
16231623      searchstr = arts_render_common(origx1, origy1, origx2, origy2);
16241624
16251625      // loads the image if necessary
1626      if (soft != oldsoft || !snapx_bitmap->valid() || mewui_globals::switch_image)
1626      if (soft != oldsoft || !snapx_bitmap->valid() || ui_globals::switch_image)
16271627      {
16281628         emu_file snapfile(searchstr.c_str(), OPEN_FLAG_READ);
16291629         bitmap_argb32 *tmp_bitmap;
r253177r253178
16411641               render_load_jpeg(*tmp_bitmap, snapfile, nullptr, fullname.c_str());
16421642            }
16431643         }
1644         else if (mewui_globals::curimage_view == TITLES_VIEW)
1644         else if (ui_globals::curimage_view == TITLES_VIEW)
16451645         {
16461646            // First attempt from name list
16471647            pathname.assign(soft->listname).append("_titles");
r253177r253178
16831683         }
16841684
16851685         oldsoft = soft;
1686         mewui_globals::switch_image = false;
1686         ui_globals::switch_image = false;
16871687         arts_render_images(tmp_bitmap, origx1, origy1, origx2, origy2, true);
16881688         auto_free(machine(), tmp_bitmap);
16891689      }
r253177r253178
17081708   float line_height = mui.get_line_height();
17091709   float lr_arrow_width = 0.4f * line_height * machine().render().ui_aspect();
17101710   rgb_t fgcolor = UI_TEXT_COLOR;
1711   bool hide = (mewui_globals::panels_status == HIDE_RIGHT_PANEL || mewui_globals::panels_status == HIDE_BOTH);
1711   bool hide = (ui_globals::panels_status == HIDE_RIGHT_PANEL || ui_globals::panels_status == HIDE_BOTH);
17121712   float x2 = (hide) ? origx2 : origx1 + 2.0f * UI_BOX_LR_BORDER;
17131713
17141714   // set left-right arrows dimension
r253177r253178
17361736   origx1 = x2;
17371737   origy1 = draw_right_box_title(origx1, origy1, origx2, origy2);
17381738
1739   if (mewui_globals::rpanel == RP_IMAGES)
1739   if (ui_globals::rpanel == RP_IMAGES)
17401740      arts_render(selectedref, origx1, origy1, origx2, origy2);
17411741   else
17421742      infos_render(selectedref, origx1, origy1, origx2, origy2);
trunk/src/emu/ui/utils.cpp
r253177r253178
1313#include <algorithm>
1414
1515extern const char MEWUI_VERSION_TAG[];
16const char MEWUI_VERSION_TAG[] = "# MEWUI INFO ";
16const char MEWUI_VERSION_TAG[] = "# UI INFO ";
1717
1818// Years index
1919UINT16 c_year::actual = 0;
r253177r253178
4848size_t ume_filters::length = ARRAY_LENGTH(ume_filters::text);
4949
5050// Globals
51UINT8 mewui_globals::rpanel = 0;
52UINT8 mewui_globals::curimage_view = 0;
53UINT8 mewui_globals::curdats_view = 0;
54UINT8 mewui_globals::cur_sw_dats_view = 0;
55bool mewui_globals::switch_image = false;
56bool mewui_globals::default_image = true;
57bool mewui_globals::reset = false;
58bool mewui_globals::redraw_icon = false;
59int mewui_globals::visible_main_lines = 0;
60int mewui_globals::visible_sw_lines = 0;
61UINT16 mewui_globals::panels_status = 0;
51UINT8 ui_globals::rpanel = 0;
52UINT8 ui_globals::curimage_view = 0;
53UINT8 ui_globals::curdats_view = 0;
54UINT8 ui_globals::cur_sw_dats_view = 0;
55bool ui_globals::switch_image = false;
56bool ui_globals::default_image = true;
57bool ui_globals::reset = false;
58bool ui_globals::redraw_icon = false;
59int ui_globals::visible_main_lines = 0;
60int ui_globals::visible_sw_lines = 0;
61UINT16 ui_globals::panels_status = 0;
6262
6363// Custom filter
6464UINT16 custfltr::main = 0;
trunk/src/emu/ui/utils.h
r253177r253178
223223};
224224
225225// GLOBAL CLASS
226struct mewui_globals
226struct ui_globals
227227{
228228   static UINT8        curimage_view, curdats_view, cur_sw_dats_view, rpanel;
229229   static bool         switch_image, redraw_icon, default_image, reset;


Previous 199869 Revisions Next


© 1997-2024 The MAME Team