mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) No longer rely on MODE_MENU_DRAW

Browse Source
This commit is contained in:
twinaphex 2013-04-11 15:29:43 +02:00
parent ea969282f4
commit 7bb9f0d288
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/menu/rmenu.c
View File

@ -58,6 +58,7 @@ struct texture_image *menu_texture;
struct texture_image *menu_panel; struct texture_image *menu_panel;
#endif #endif
static bool menu_bg_show = true;
filebrowser_t *browser; filebrowser_t *browser;
filebrowser_t *tmpBrowser; filebrowser_t *tmpBrowser;
unsigned currently_selected_controller_menu = 0; unsigned currently_selected_controller_menu = 0;
@ -220,6 +221,7 @@ static const char *menu_drive_mapping_next(void)
RMENU GRAPHICS RMENU GRAPHICS
============================================================ */ ============================================================ */
static void rmenu_gfx_init(void) static void rmenu_gfx_init(void)
{ {
menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture)); menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
@ -2921,18 +2923,13 @@ static int ingame_menu_resize(uint8_t menu_type, uint64_t input)
if (input & (1ULL << RMENU_DEVICE_NAV_A)) if (input & (1ULL << RMENU_DEVICE_NAV_A))
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW); menu_bg_show = true;
} }
if ((input & (1ULL << RMENU_DEVICE_NAV_Y))) if ((input & (1ULL << RMENU_DEVICE_NAV_Y)))
{ menu_bg_show = !menu_bg_show;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
else
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
}
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) if (menu_bg_show)
{ {
char viewport_x[32]; char viewport_x[32];
char viewport_y[32]; char viewport_y[32];
@ -3191,10 +3188,7 @@ static int ingame_menu_core_options(uint8_t menu_type, uint64_t input)
float y_increment = POSITION_Y_START; float y_increment = POSITION_Y_START;
if (input & (1ULL << RMENU_DEVICE_NAV_A)) if (input & (1ULL << RMENU_DEVICE_NAV_A))
{
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
}
display_menubar(menu_type); display_menubar(menu_type);
@ -3266,14 +3260,14 @@ static int ingame_menu_core_options(uint8_t menu_type, uint64_t input)
static int ingame_menu_screenshot(uint8_t menu_type, uint64_t input) static int ingame_menu_screenshot(uint8_t menu_type, uint64_t input)
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW); menu_bg_show = false;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME))
{ {
if (input & (1ULL << RMENU_DEVICE_NAV_A)) if (input & (1ULL << RMENU_DEVICE_NAV_A))
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW); menu_bg_show = true;
} }
#ifdef HAVE_SCREENSHOTS #ifdef HAVE_SCREENSHOTS
@ -3340,7 +3334,7 @@ static int menu_input_process(uint8_t menu_type, uint64_t old_state)
) )
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW); menu_bg_show = true;
} }
int ret = -1; int ret = -1;
@ -3409,8 +3403,6 @@ bool menu_iterate(void)
menu_stack_push(INGAME_MENU); menu_stack_push(INGAME_MENU);
} }
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
#ifndef __CELLOS_LV2__ #ifndef __CELLOS_LV2__
rmenu_gfx_init(); rmenu_gfx_init();
#endif #endif
@ -3559,7 +3551,7 @@ bool menu_iterate(void)
{ {
driver.video_poke->set_texture_frame(driver.video_data, menu_texture->pixels, driver.video_poke->set_texture_frame(driver.video_data, menu_texture->pixels,
true, menu_texture->width, menu_texture->height, 1.0f); true, menu_texture->width, menu_texture->height, 1.0f);
driver.video_poke->set_texture_enable(driver.video_data, true); driver.video_poke->set_texture_enable(driver.video_data, menu_bg_show);
} }
} }
@ -3580,8 +3572,6 @@ deinit:
if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
#ifdef _XBOX1 #ifdef _XBOX1
rmenu_gfx_free(); rmenu_gfx_free();
#endif #endif