(Android) Update overlays - now adds an RGUI toggle button

(RMenu PS3) Clean up some unneeded function callbacks

frontend/menu/rmenu.c

@@ -850,7 +850,7 @@ static void browser_update(void *data, uint64_t input, const char *extensions)
       msg_queue_push(g_extern.msg_queue, "ERROR - Failed to open directory.", 1, 180);
 }
 
-void browser_render(void *data)
+static void browser_render(void *data)
 {
    filebrowser_t *b = (filebrowser_t*)data;
    DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
@@ -1063,8 +1063,7 @@ int select_file(void *data, void *state)
    if (driver.video_poke->set_osd_msg)
       driver.video_poke->set_osd_msg(driver.video_data, comment, &font_parms);
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
+   browser_render(filebrowser);
 
    return 0;
 }
@@ -1202,8 +1201,7 @@ int select_directory(void *data, void *state)
    if (driver.video_poke->set_osd_msg)
       driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms);
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
+   browser_render(filebrowser);
 
    return 0;
 }
@@ -2346,13 +2344,9 @@ static int select_setting(void *data, void *state)
    if (driver.video_poke->set_osd_msg)
       driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms);
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
-
    return 0;
 }
 
-
 int select_rom(void *data, void *state)
 {
    menu *current_menu = (menu*)data;
@@ -2457,8 +2451,7 @@ int select_rom(void *data, void *state)
    if (driver.video_poke->set_osd_msg)
       driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms);
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
+   browser_render(filebrowser);
 
    return 0;
 }
@@ -2813,9 +2806,6 @@ int ingame_menu_resize(void *data, void *state)
          driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms);
    }
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
-
    return 0;
 }
 
@@ -2844,9 +2834,6 @@ int ingame_menu_screenshot(void *data, void *state)
             device_ptr->ctx_driver->rmenu_screenshot_dump(NULL);
    }
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
-
    return 0;
 }
 
@@ -3186,9 +3173,6 @@ int ingame_menu(void *data, void *state)
    position.y = (default_pos.y_position+(default_pos.y_position_increment * menu_idx));
    device_ptr->ctx_driver->rmenu_draw_panel(&position);
 
-   if(current_menu->browser_draw)
-      current_menu->browser_draw(filebrowser);
-
    return 0;
 }
 
@@ -3340,21 +3324,17 @@ void menu_init(void)
 {
    DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
 
-   rmenu_state.init_resources = init_filebrowser;
-   rmenu_state.free_resources = free_filebrowser;
    rmenu_state.input          = 0;
    rmenu_state.old_state      = 0;
 
-   if(rmenu_state.init_resources)
-      rmenu_state.init_resources(&rmenu_state);
+   init_filebrowser(&rmenu_state);
 
    device_ptr->ctx_driver->rmenu_init();
 }
 
 void menu_free(void)
 {
-   if(rmenu_state.free_resources)
-      rmenu_state.free_resources(&rmenu_state);
+   free_filebrowser(&rmenu_state);
 }
 
 bool menu_iterate(void)
@@ -3407,7 +3387,6 @@ bool menu_iterate(void)
       rarch_render_cached_frame();
    }
 
-   if(current_menu.input_poll)
    menu_input_poll(&current_menu, &rmenu_state);
 
 #ifdef HAVE_OSKUTIL
@@ -3430,8 +3409,7 @@ bool menu_iterate(void)
    if(current_menu.entry)
       input_entry_ret = current_menu.entry(&current_menu, &rmenu_state);
 
-   if(current_menu.input_process)
-      input_process_ret = current_menu.input_process(&current_menu, &rmenu_state);
+   input_process_ret = menu_input_process(&current_menu, &rmenu_state);
 
    msg = msg_queue_pull(g_extern.msg_queue);
 

frontend/menu/utils/menu_stack.c

@@ -218,8 +218,5 @@ static void menu_stack_get_current_ptr(menu *current_menu)
          break;
    }
 
-   if(current_menu->category_id == CATEGORY_FILEBROWSER)
-      current_menu->browser_draw = browser_render;
-
    need_refresh = false;
 }

frontend/menu/utils/menu_stack.h

@@ -27,9 +27,6 @@ typedef struct
    unsigned char max_settings;
    unsigned char category_id;
    int (*entry)(void *data, void *state);
-   int (*input_process)(void *data, void *state);
-   void (*input_poll)(void *data, void *state);
-   void (*browser_draw)(void *data);
 } menu;
 
 typedef struct
@@ -41,8 +38,6 @@ typedef struct
    bool (*osk_init)(void *data);
    bool (*osk_callback)(void *data);
 #endif
-   void (*init_resources)(void *data);
-   void (*free_resources)(void *data);
 } rmenu_state_t;
 
 // iterate forward declarations
@@ -54,16 +49,4 @@ int ingame_menu_resize(void *data, void *state);
 int ingame_menu_screenshot(void *data, void *state);
 int ingame_menu(void *data, void *state);
 
-void menu_input_poll(void *data, void *state);
-int menu_input_process(void *data, void *state);
-
-// browser_draw forward declarations
-void browser_render(void *data);
-
-// init resources forward declarations
-void init_filebrowser(void *data);
-
-// free resources forward declarations
-void free_filebrowser(void *data);
-
 #endif

media/overlays/gameboy-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = nintendo_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0  = "left,32,393,rect,25,25"
 overlay0_desc1  = "right,113,393,rect,25,25"
 overlay0_desc2  = "up,73,349,rect,25,25"
@@ -21,6 +21,7 @@ overlay0_desc9 = "left|up,28,348,radial,20,20"
 overlay0_desc10 = "left|down,28,435,radial,20,20"
 overlay0_desc11 = "right|up,117,348,radial,20,20"
 overlay0_desc12 = "right|down,117,435,radial,20,20"
+overlay0_desc13 = "menu_toggle,73,49,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,292,53,rect,50,38"

media/overlays/gameboy-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0  = "left,44,702,rect,25,25"
 overlay0_desc1  = "right,162,702,rect,25,25"
 overlay0_desc2  = "up,102,643,rect,25,25"
@@ -22,6 +22,7 @@ overlay0_desc9 = "left|up,44,643,radial,20,20"
 overlay0_desc10 = "left|down,44,761,radial,20,20"
 overlay0_desc11 = "right|up,162,643,radial,20,20"
 overlay0_desc12 = "right|down,162,761,radial,20,20"
+overlay0_desc13 = "menu_toggle,240,595,rect,40,28"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"

media/overlays/genesis3-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = genesis_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0 = "left,34,393,rect,25,25"
 overlay0_desc1 = "right,110,393,rect,25,25"
 overlay0_desc2 = "up,70,360,rect,25,25"
@@ -21,6 +21,7 @@ overlay0_desc9 = "left|up,32,354,radial,20,20"
 overlay0_desc10 = "left|down,32,432,radial,20,20"
 overlay0_desc11 = "right|up,111,354,radial,20,20"
 overlay0_desc12 = "right|down,111,432,radial,20,20"
+overlay0_desc13 = "menu_toggle,73,50,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,292,53,rect,50,38"

media/overlays/genesis3-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0 = "left,52,695,rect,25,25"
 overlay0_desc1 = "right,159,695,rect,25,25"
 overlay0_desc2 = "up,107,638,rect,25,25"
@@ -22,6 +22,7 @@ overlay0_desc9 = "left|up,52,638,radial,25,25"
 overlay0_desc10 = "left|down,52,744,radial,25,25"
 overlay0_desc11 = "right|up,159,638,radial,25,25"
 overlay0_desc12 = "right|down,159,744,radial,25,25"
+overlay0_desc13 = "menu_toggle,240,575,rect,40,28"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"

media/overlays/genesis6-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = genesis_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 16
+overlay0_descs = 17
 overlay0_desc0 = "left,34,393,rect,25,25"
 overlay0_desc1 = "right,110,393,rect,25,25"
 overlay0_desc2 = "up,70,360,rect,25,25"
@@ -24,6 +24,7 @@ overlay0_desc12 = "left|up,32,354,radial,20,20"
 overlay0_desc13 = "left|down,32,432,radial,20,20"
 overlay0_desc14 = "right|up,111,354,radial,20,20"
 overlay0_desc15 = "right|down,111,432,radial,20,20"
+overlay0_desc16 = "menu_toggle,73,50,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,292,53,rect,50,38"

media/overlays/genesis6-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 16
+overlay0_descs = 17
 overlay0_desc0 = "left,52,695,rect,25,25"
 overlay0_desc1 = "right,159,695,rect,25,25"
 overlay0_desc2 = "up,107,638,rect,25,25"
@@ -25,6 +25,7 @@ overlay0_desc12 = "left|up,52,638,radial,25,25"
 overlay0_desc13 = "left|down,52,744,radial,25,25"
 overlay0_desc14 = "right|up,159,638,radial,25,25"
 overlay0_desc15 = "right|down,159,744,radial,25,25"
+overlay0_desc16 = "menu_toggle,240,575,rect,40,28"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"

media/overlays/nes-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = nintendo_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0  = "left,33,399,rect,20,20"
 overlay0_desc1  = "right,122,399,rect,20,20"
 overlay0_desc2  = "up,77,355,rect,20,20"
@@ -21,6 +21,7 @@ overlay0_desc9 = "left|up,29,350,radial,20,20"
 overlay0_desc10 = "left|down,29,440,radial,20,20"
 overlay0_desc11 = "right|up,121,350,radial,20,20"
 overlay0_desc12 = "right|down,121,440,radial,20,20"
+overlay0_desc13 = "menu_toggle,76,205,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,292,53,rect,50,38"

media/overlays/nes-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 13
+overlay0_descs = 14
 overlay0_desc0  = "left,39,701,rect,30,30"
 overlay0_desc1  = "right,156,701,rect,30,30"
 overlay0_desc2  = "up,97,641,rect,30,30"
@@ -22,6 +22,7 @@ overlay0_desc9 = "left|up,39,641,radial,30,30"
 overlay0_desc10 = "left|down,39,758,radial,30,30"
 overlay0_desc11 = "right|up,156,641,radial,30,30"
 overlay0_desc12 = "right|down,156,758,radial,30,30"
+overlay0_desc13 = "menu_toggle,240,595,rect,40,28"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"

media/overlays/psx-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = psx_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 19
+overlay0_descs = 20
 overlay0_desc0 = "left,34,395,rect,25,25"
 overlay0_desc1 = "right,112,395,rect,25,25"
 overlay0_desc2 = "up,70,356,rect,25,25"
@@ -27,6 +27,7 @@ overlay0_desc15 = "left|up,34,356,radial,20,20"
 overlay0_desc16 = "left|down,34,432,radial,20,20"
 overlay0_desc17 = "right|up,112,356,radial,20,20"
 overlay0_desc18 = "right|down,112,432,radial,20,20"
+overlay0_desc19 = "menu_toggle,732,217,rect,25,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,102,48,rect,90,30"

media/overlays/psx-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 19
+overlay0_descs = 20
 overlay0_desc0 = "left,41,695,rect,25,25"
 overlay0_desc1 = "right,157,695,rect,25,25"
 overlay0_desc2 = "up,98,637,rect,25,25"
@@ -28,6 +28,7 @@ overlay0_desc15 = "left|up,41,637,radial,20,20"
 overlay0_desc16 = "left|down,41,751,radial,20,20"
 overlay0_desc17 = "right|up,157,637,radial,20,20"
 overlay0_desc18 = "right|down,157,751,radial,20,20"
+overlay0_desc19 = "menu_toggle,240,764,rect,25,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"

media/overlays/snes-landscape.cfg

@@ -7,7 +7,7 @@ overlay2_overlay = nintendo_next.png
 overlay0_full_screen = true
 overlay1_full_screen = true
 
-overlay0_descs = 17
+overlay0_descs = 18
 overlay0_desc0  = "left,28,389,rect,30,30"
 overlay0_desc1  = "right,117,389,rect,30,30"
 overlay0_desc2  = "up,73,344,rect,30,30"
@@ -25,6 +25,7 @@ overlay0_desc13 = "left|up,28,344,radial,20,20"
 overlay0_desc14 = "left|down,28,434,radial,20,20"
 overlay0_desc15 = "right|up,117,344,radial,20,20"
 overlay0_desc16 = "right|down,117,434,radial,20,20"
+overlay0_desc17 = "menu_toggle,401,443,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,292,53,rect,50,38"

media/overlays/snes-portrait.cfg

@@ -8,7 +8,7 @@ overlay0_full_screen = true
 overlay1_full_screen = true
 overlay2_full_screen = true
 
-overlay0_descs = 17
+overlay0_descs = 18
 overlay0_desc0  = "left,40,703,rect,30,30"
 overlay0_desc1  = "right,156,703,rect,30,30"
 overlay0_desc2  = "up,98,644,rect,30,30"
@@ -26,6 +26,7 @@ overlay0_desc13 = "left|up,40,644,radial,30,30"
 overlay0_desc14 = "left|down,40,761,radial,30,30"
 overlay0_desc15 = "right|up,156,644,radial,30,30"
 overlay0_desc16 = "right|down,156,761,radial,30,30"
+overlay0_desc17 = "menu_toggle,240,760,radial,20,20"
 
 overlay1_descs = 11
 overlay1_desc0  = "load_state,120,52,rect,110,45"