mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 12:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1/PS3) more menu compatibility tweaks

Browse Source
This commit is contained in:
twinaphex 2012-08-03 19:36:11 +02:00
parent a32fee16f4
commit bc92cbc40a
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ps3/frontend/menu.c
View File

@ -51,6 +51,8 @@
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../gfx/context/ps3_ctx.h" #include "../../gfx/context/ps3_ctx.h"
#elif defined(_XBOX)
#include "../../gfx/context/xdk_ctx.h"
#endif #endif
#if defined(HAVE_CG) #if defined(HAVE_CG)
@ -607,6 +609,7 @@ static void display_menubar(menu *current_menu)
float x_position = POSITION_X; float x_position = POSITION_X;
#ifdef _XBOX1 #ifdef _XBOX1
float current_y_position = m_menuMainRomListPos_y;
float font_size = m_menuMainRomListPos_y; float font_size = m_menuMainRomListPos_y;
#else #else
float font_size = HARDCODE_FONT_SIZE; float font_size = HARDCODE_FONT_SIZE;
@ -2298,6 +2301,7 @@ void menu_loop(void)
do do
{ {
RARCH_LOG("reaches here #0\n");
//first button input frame //first button input frame
uint64_t input_state_first_frame = 0; uint64_t input_state_first_frame = 0;
uint64_t input_state = 0; uint64_t input_state = 0;
@ -2407,6 +2411,8 @@ void menu_loop(void)
} }
} }
RARCH_LOG("reaches here #1\n");
gfx_ctx_clear(); gfx_ctx_clear();
if(current_menu->enum_id == INGAME_MENU_RESIZE && (trig_state & RETRO_DEVICE_ID_JOYPAD_Y) || current_menu->enum_id == INGAME_MENU_SCREENSHOT) if(current_menu->enum_id == INGAME_MENU_RESIZE && (trig_state & RETRO_DEVICE_ID_JOYPAD_Y) || current_menu->enum_id == INGAME_MENU_SCREENSHOT)
@ -2471,6 +2477,8 @@ void menu_loop(void)
break; break;
} }
RARCH_LOG("reaches here #1.1\n");
float x_position = POSITION_X; float x_position = POSITION_X;
float starting_y_position = POSITION_Y_START; float starting_y_position = POSITION_Y_START;
float y_position_increment = POSITION_Y_INCREMENT; float y_position_increment = POSITION_Y_INCREMENT;
@ -2488,6 +2496,8 @@ void menu_loop(void)
old_state = input_state_first_frame; old_state = input_state_first_frame;
RARCH_LOG("reaches here #1.2\n");
if(IS_TIMER_EXPIRED(device_ptr)) if(IS_TIMER_EXPIRED(device_ptr))
{ {
// if we want to force goto the emulation loop, skip this // if we want to force goto the emulation loop, skip this
@ -2516,6 +2526,7 @@ void menu_loop(void)
SET_TIMER_EXPIRATION(device_ptr, 30); SET_TIMER_EXPIRATION(device_ptr, 30);
} }
#ifndef _XBOX1
const char * message = msg_queue_pull(g_extern.msg_queue); const char * message = msg_queue_pull(g_extern.msg_queue);
float message_y_position = 0.75f; float message_y_position = 0.75f;
float message_scale = 1.05f; float message_scale = 1.05f;
@ -2525,19 +2536,26 @@ void menu_loop(void)
render_msg_place_func(g_settings.video.msg_pos_x, message_y_position, message_scale, WHITE, message); render_msg_place_func(g_settings.video.msg_pos_x, message_y_position, message_scale, WHITE, message);
render_msg_post_func(); render_msg_post_func();
} }
#endif
RARCH_LOG("reaches here #1.3\n");
gfx_ctx_swap_buffers(); gfx_ctx_swap_buffers();
#ifdef HAVE_SYSUTILS #ifdef HAVE_SYSUTILS
cellSysutilCheckCallback(); cellSysutilCheckCallback();
#endif #endif
#ifdef _XBOX1 RARCH_LOG("reaches here #1.4\n");
device_ptr->frame_count++;
#endif
#ifndef _XBOX1
if(current_menu->enum_id == INGAME_MENU_RESIZE && (old_state & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) || current_menu->enum_id == INGAME_MENU_SCREENSHOT) if(current_menu->enum_id == INGAME_MENU_RESIZE && (old_state & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) || current_menu->enum_id == INGAME_MENU_SCREENSHOT)
{ } { }
else else
gfx_ctx_set_blend(false); gfx_ctx_set_blend(false);
#endif
RARCH_LOG("reaches here #1.5\n");
RARCH_LOG("reaches here #2\n");
}while(g_console.menu_enable); }while(g_console.menu_enable);
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__

2
xbox1/frontend/menu.c
View File

@ -657,7 +657,7 @@ static void browser_render(filebrowser_t *b, float current_x, float current_y, f
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
unsigned file_count = b->current_dir.list->size; unsigned file_count = b->current_dir.list->size;
unsigned current_index, page_number, page_base, i; unsigned int current_index, page_number, page_base, i;
float currentX, currentY, ySpacing; float currentX, currentY, ySpacing;
current_index = b->current_dir.ptr; current_index = b->current_dir.ptr;