mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-10 03:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu/RGUI) Drop MODE_MENU_INGAME

Browse Source
This commit is contained in:
twinaphex 2013-05-05 15:20:45 +02:00
parent 1540cb9bba
commit 092b2625dd
7 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/menu/menu_common.c
View File

@ -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

13
frontend/menu/rgui.c
View File

@ -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)
{

40
frontend/menu/rmenu.c
View File

@ -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;

2
frontend/menu/rmenu_xui.cpp
View File

@ -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;

2
frontend/platform/platform_ps3.c
View File

@ -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

1
general.h
View File

@ -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,

4
retroarch.c
View File

@ -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