[Proyecto] advmenuPLUS, Modificando el codigo fuente del AdvanceMenu (II)

diff -Nru advmenuplus-git1/advance/menu/favlist.h advmenuplus-git2/advance/menu/favlist.h
--- advmenuplus-git1/advance/menu/favlist.h        2015-04-09 13:41:00.000000000 +0200
+++ advmenuplus-git2/advance/menu/favlist.h        2015-04-09 22:42:52.886921761 +0200
@@ -26,6 +26,9 @@
#include <list>
#include <string>

+#include "game.h"
+
+
typedef std::list<std::string> favorites_container;

class favorite {
diff -Nru advmenuplus-git1/advance/menu/mm.cc advmenuplus-git2/advance/menu/mm.cc
--- advmenuplus-git1/advance/menu/mm.cc        2015-04-09 13:41:00.000000000 +0200
+++ advmenuplus-git2/advance/menu/mm.cc        2015-04-09 22:43:24.434664356 +0200
@@ -430,12 +430,12 @@
        target_out("\n");

        target_out("Configuration (in priority order):\n");
-        if (file_config_file_host("advmenu.rc") != 0)
-                target_out("  Host configuration file (R): %­s\n", file_config_file_host("advmenu.rc"));
+        if (file_config_file_host("advmenup.rc") != 0)
+                target_out("  Host configuration file (R): %­s\n", file_config_file_host("advmenup.rc"));
        target_out("  Command line (R)\n");
-        target_out("  Home configuration file (RW): %­s\n", file_config_file_home("advmenu.rc"));
-        if (file_config_file_data("advmenu.rc") != 0)
-                target_out("  Data configuration file (R): %­s\n", file_config_file_data("advmenu.rc"));
+        target_out("  Home configuration file (RW): %­s\n", file_config_file_home("advmenup.rc"));
+        if (file_config_file_data("advmenup.rc") != 0)
+                target_out("  Data configuration file (R): %­s\n", file_config_file_data("advmenup.rc"));
}

static void help(void)
@@ -743,7 +743,7 @@
        if (opt_cfg) {
                sncpy(cfg_buffer, sizeof(cfg_buffer), file_config_file_home(opt_cfg));
        } else {
-                sncpy(cfg_buffer, sizeof(cfg_buffer), file_config_file_home("advmenu.rc"));
+                sncpy(cfg_buffer, sizeof(cfg_buffer), file_config_file_home("advmenup.rc"));
        }

        if (opt_version) {
@@ -766,14 +766,14 @@

        log_std(("menu: %­s %­s\n", __DATE__, __TIME__));

-        if (file_config_file_host("advmenu.rc") != 0) {
-                if (conf_input_file_load_adv(config_context, 4, file_config_file_host("advmenu.rc"), 0, 0, 1, STANDARD, sizeof(STANDARD)/sizeof(STANDARD[0]), error_callback, 0) != 0) {
+        if (file_config_file_host("advmenup.rc") != 0) {
+                if (conf_input_file_load_adv(config_context, 4, file_config_file_host("advmenup.rc"), 0, 0, 1, STANDARD, sizeof(STANDARD)/sizeof(STANDARD[0]), error_callback, 0) != 0) {
                        goto err_init;
                }
        }

-        if (file_config_file_data("advmenu.rc") != 0) {
-                if (conf_input_file_load_adv(config_context, 0, file_config_file_data("advmenu.rc"), 0, 0, 1, STANDARD, sizeof(STANDARD)/sizeof(STANDARD[0]), error_callback, 0) != 0) {
+        if (file_config_file_data("advmenup.rc") != 0) {
+                if (conf_input_file_load_adv(config_context, 0, file_config_file_data("advmenup.rc"), 0, 0, 1, STANDARD, sizeof(STANDARD)/sizeof(STANDARD[0]), error_callback, 0) != 0) {
                        goto err_init;
                }
        }
diff -Nru advmenuplus-git1/advance/menu/submenu.cc advmenuplus-git2/advance/menu/submenu.cc
--- advmenuplus-git1/advance/menu/submenu.cc        2015-04-09 13:41:00.000000000 +0200
+++ advmenuplus-git2/advance/menu/submenu.cc        2015-04-09 22:44:34.063687819 +0200
@@ -30,6 +30,9 @@
#include <iomanip>
#include <algorithm>

+#include <string>
+//#include <sstream>
+
using namespace std;

#define MSG_CHOICE_DX 30*int_font_dx_get()
@@ -48,6 +51,29 @@
        return s + "^" + name;
}

+void where_are_you(string where_msg)
+{
+
+        int ctd = 0;
+
+                while (ctd <= 50) {                
+                        unsigned dx, dy;
+                        int x = int_dx_get() / 2;
+                        int y = int_dy_get() / 2;
+                        int border = int_font_dx_get()/2;
+                
+                        // force an update to draw the first time the backdrop images
+                        int_update(false);
+
+                        dx = int_font_dx_get(where_msg);
+                        dy = int_font_dy_get();
+
+                        int_box(x-2*border-dx/2, (y -100) -border, dx+4*border, dy+border*2, 1, COLOR_CHOICE_NORMAL.foreground);
+                        int_clear(x-2*border-dx/2+1, (y - 100)-border+1, dx+4*border-2, dy+border*2-2, COLOR_CHOICE_NORMAL.background);
+                        int_put(x-dx/2, (y - 100), dx, where_msg, COLOR_CHOICE_TITLE);
+                        ctd = ctd + 1;
+                }
+        }
// ------------------------------------------------------------------------
// Sort menu

@@ -361,6 +387,8 @@
                f = next_select;

        rs.include_favorites_set(f);
+        where_are_you(next_select);
+                
}

int run_favorites_move(config_state& rs)
@@ -502,6 +530,8 @@
                c.insert(c.end(), next_select);

        rs.include_emu_set(c);        
+        
+        where_are_you (next_select);
}

void run_emu_pre(config_state& rs)
@@ -540,6 +570,8 @@
                c.insert(c.end(), pre_select);

        rs.include_emu_set(c);
+        
+        where_are_you (pre_select);
}

// ------------------------------------------------------------------------
@@ -575,6 +607,7 @@
void run_type_next(config_state& rs)
{
        category* next_select = 0;
+        string where_msg = "";
        bool all_select = true;

        bool pred_in = false;
@@ -601,12 +634,18 @@
        } else {
                if ((all_select || next_select == 0) && rs.type.begin() != rs.type.end())
                        next_select = *rs.type.begin();
+                        where_msg = next_select->name_get();
                if (next_select != 0) {
                        // insert the next
                        c.insert(next_select->name_get());
                }
        }
        rs.include_type_set(c);
+        
+        if (where_msg == "")
+                where_msg = "All Games";
+                
+        where_are_you (where_msg);
}