From 092b2625dd53427cbb7992998780a0bf2b547109 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 May 2013 15:20:45 +0200 Subject: [PATCH] (RMenu/RGUI) Drop MODE_MENU_INGAME --- frontend/menu/menu_common.c | 9 +------ frontend/menu/rgui.c | 13 ++++------- frontend/menu/rmenu.c | 40 ++++++++++++++------------------ frontend/menu/rmenu_xui.cpp | 2 -- frontend/platform/platform_ps3.c | 2 +- general.h | 1 - retroarch.c | 4 ---- 7 files changed, 23 insertions(+), 48 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 3473bae256..4781d4fe15 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -604,9 +604,7 @@ bool menu_iterate(void) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT)) { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) - rgui->need_refresh = true; - + rgui->need_refresh = true; g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_PREINIT); rgui->old_input_state |= 1ULL << DEVICE_NAV_MENU; } @@ -666,11 +664,6 @@ bool menu_iterate(void) return true; deinit: -#ifdef HAVE_RGUI - /* TODO - see if we can remove this */ - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME); -#endif - return false; } #endif diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 5c030d9e23..3e7851e184 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -218,7 +218,7 @@ rgui_handle_t *rgui_init(void) RARCH_ERR("no font bmp or bin, abort"); /* TODO - should be refactored - perhaps don't do rarch_fail but instead * exit program */ - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME)); + g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_GAME)); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); return NULL; } @@ -2388,7 +2388,6 @@ int rgui_iterate(rgui_handle_t *rgui) rgui->need_refresh = true; while (rgui->menu_stack->size > 1) rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr); - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME); return rgui_settings_iterate(rgui, RGUI_ACTION_REFRESH); case RGUI_ACTION_MESSAGE: @@ -2479,17 +2478,13 @@ int rgui_input_postprocess(void *data, uint64_t old_state) g_extern.main_is_init && !g_extern.libretro_dummy) { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); - + g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); ret = -1; } - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME_EXIT) && - g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU_INGAME) - | (1ULL << MODE_MENU_INGAME_EXIT)); + if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME_EXIT)) + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME_EXIT); if (ret < 0) { diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index c29cc33113..7e079d96e8 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -2921,27 +2921,24 @@ static int ingame_menu_screenshot(void *data, uint64_t input) rgui_handle_t *rgui = (rgui_handle_t*)data; rgui->frame_buf_show = false; - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) - { - if ((input & (1ULL << DEVICE_NAV_A)) || (input & (1ULL << DEVICE_NAV_MENU))) - menu_stack_pop(rgui->menu_type); + if ((input & (1ULL << DEVICE_NAV_A)) || (input & (1ULL << DEVICE_NAV_MENU))) + menu_stack_pop(rgui->menu_type); #ifdef HAVE_SCREENSHOTS - if (input & (1ULL << DEVICE_NAV_B)) - { - const uint16_t *data = (const uint16_t*)g_extern.frame_cache.data; - unsigned width = g_extern.frame_cache.width; - unsigned height = g_extern.frame_cache.height; - int pitch = g_extern.frame_cache.pitch; + if (input & (1ULL << DEVICE_NAV_B)) + { + const uint16_t *data = (const uint16_t*)g_extern.frame_cache.data; + unsigned width = g_extern.frame_cache.width; + unsigned height = g_extern.frame_cache.height; + int pitch = g_extern.frame_cache.pitch; - // Negative pitch is needed as screenshot takes bottom-up, - // but we use top-down. - screenshot_dump(g_settings.screenshot_directory, - data + (height - 1) * (pitch >> 1), - width, height, -pitch, false); - } -#endif + // Negative pitch is needed as screenshot takes bottom-up, + // but we use top-down. + screenshot_dump(g_settings.screenshot_directory, + data + (height - 1) * (pitch >> 1), + width, height, -pitch, false); } +#endif return 0; } @@ -2961,9 +2958,7 @@ int rgui_input_postprocess(void *data, uint64_t old_state) if ((rgui->trigger_state & (1ULL << DEVICE_NAV_MENU)) && g_extern.main_is_init) { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); - + g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); ret = -1; @@ -2978,11 +2973,10 @@ int rgui_input_postprocess(void *data, uint64_t old_state) ret = -1; } - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME_EXIT) && - g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) + if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME_EXIT)) { menu_stack_pop(rgui->menu_type); - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU_INGAME) | (1ULL << MODE_MENU_INGAME_EXIT)); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME_EXIT); } return ret; diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index b37bebb8b4..8001c97c86 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1785,8 +1785,6 @@ bool menu_iterate(void) return true; deinit: - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME); - process_input_ret = 0; return false; diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 1b6c0a0410..ec2dadd0ce 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -151,7 +151,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat { case CELL_SYSUTIL_REQUEST_EXITGAME: gl->quitting = true; - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME)); + g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_GAME)); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); break; #ifdef HAVE_OSKUTIL diff --git a/general.h b/general.h index 7e0117bcde..fa5c695901 100644 --- a/general.h +++ b/general.h @@ -108,7 +108,6 @@ enum menu_enums MODE_MENU_WIDESCREEN, MODE_MENU_HD, MODE_MENU_PREINIT, - MODE_MENU_INGAME, MODE_MENU_INGAME_EXIT, MODE_INFO_DRAW, MODE_FPS_DRAW, diff --git a/retroarch.c b/retroarch.c index f9f72e51a5..551527c80d 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2969,9 +2969,6 @@ static inline bool check_enter_rgui(void) bool rmenu_toggle = input_key_pressed_func(RARCH_MENU_TOGGLE) || (g_extern.libretro_dummy && !old_rmenu_toggle); if (rmenu_toggle && !old_rmenu_toggle) { - if (g_extern.menu_toggle_behavior == 0) - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME); - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU); old_rmenu_toggle = true; return true; @@ -3052,7 +3049,6 @@ bool rarch_main_iterate(void) { g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU); - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME); return false; } #endif