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

(Xbox 1) Menu tweaks

Browse Source
This commit is contained in:
twinaphex 2012-08-03 04:09:38 +02:00
parent c96608eadc
commit 7cc14a6c4d
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/griffin/griffin.c
View File

@ -284,7 +284,7 @@ MENU
#if defined(_XBOX360) #if defined(_XBOX360)
#include "../../360/frontend-xdk/menu.cpp" #include "../../360/frontend-xdk/menu.cpp"
#elif defined(_XBOX1) #elif defined(_XBOX1)
#include "../../xbox1/frontend/menu.cpp" #include "../../xbox1/frontend/menu.c"
#include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp" #include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp"
#include "../../xbox1/frontend/RetroLaunch/Surface.cpp" #include "../../xbox1/frontend/RetroLaunch/Surface.cpp"
#elif defined(GEKKO) #elif defined(GEKKO)

36
xbox1/frontend/menu.cpp → xbox1/frontend/menu.c
View File

@ -23,6 +23,7 @@
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"
#ifdef _XBOX1
#include "../../gfx/fonts/xdk1_xfonts.h" #include "../../gfx/fonts/xdk1_xfonts.h"
#define NUM_ENTRY_PER_PAGE 17 #define NUM_ENTRY_PER_PAGE 17
@ -37,13 +38,7 @@
#define MENU_MAIN_BG_X 0 #define MENU_MAIN_BG_X 0
#define MENU_MAIN_BG_Y 0 #define MENU_MAIN_BG_Y 0
menu menuStack[10]; int xpos, ypos;
int menuStackindex = 0;
filebrowser_t browser;
filebrowser_t tmpBrowser;
static unsigned currently_selected_controller_menu = 0;
// Rom selector panel with coords // Rom selector panel with coords
d3d_surface_t m_menuMainRomSelectPanel; d3d_surface_t m_menuMainRomSelectPanel;
// Background image with coords // Background image with coords
@ -56,6 +51,15 @@ int m_menuMainRomListPos_y;
// Backbuffer width, height // Backbuffer width, height
int width; int width;
int height; int height;
#endif
menu menuStack[10];
int menuStackindex = 0;
filebrowser_t browser;
filebrowser_t tmpBrowser;
static unsigned currently_selected_controller_menu = 0;
char m_title[128]; char m_title[128];
static uint64_t old_state = 0; static uint64_t old_state = 0;
@ -588,7 +592,7 @@ static void display_menubar(menu *current_menu)
fb = &tmpBrowser; fb = &tmpBrowser;
case FILE_BROWSER_MENU: case FILE_BROWSER_MENU:
snprintf(current_path, sizeof(current_path), "PATH: %s", filebrowser_get_current_dir(fb)); snprintf(current_path, sizeof(current_path), "PATH: %s", filebrowser_get_current_dir(fb));
render_msg_place_func(x_position, current_y_position, /* size */0, /* color */0, current_path); render_msg_place_func(x_position, current_y_position, 0, 0, current_path);
break; break;
default: default:
break; break;
@ -657,7 +661,7 @@ static void browser_render(filebrowser_t *b, float current_x, float current_y, f
if(strcmp(current_pathname, b->current_dir.list->elems[i].data) == 0) if(strcmp(current_pathname, b->current_dir.list->elems[i].data) == 0)
d3d_surface_render(&m_menuMainRomSelectPanel, currentX, currentY, ROM_PANEL_WIDTH, ROM_PANEL_HEIGHT); d3d_surface_render(&m_menuMainRomSelectPanel, currentX, currentY, ROM_PANEL_WIDTH, ROM_PANEL_HEIGHT);
xfonts_render_msg_place(device_ptr, currentX, currentY, 0 /* scale */, rom_basename); render_msg_place_func(currentX, currentY, 0, 0, rom_basename);
} }
} }
@ -680,7 +684,7 @@ static void menu_romselect_iterate(filebrowser_t *filebrowser, menu_romselect_ac
static void select_rom(item *items, menu *current_menu, uint64_t input) static void select_rom(item *items, menu *current_menu, uint64_t input)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
browser_update(&browser, input, rarch_console_get_rom_ext()); browser_update(&browser, input, rarch_console_get_rom_ext());
@ -698,13 +702,8 @@ static void select_rom(item *items, menu *current_menu, uint64_t input)
menu_romselect_iterate(&browser, action); menu_romselect_iterate(&browser, action);
display_menubar(current_menu); display_menubar(current_menu);
//Display some text
//Center the text (hardcoded)
int xpos = width == 640 ? 65 : 400;
int ypos = width == 640 ? 430 : 670;
xfonts_render_msg_place(d3d, xpos, ypos, 0 /* scale */, m_title); render_msg_place_func(xpos, ypos, 0, 0, m_title);
} }
int menu_init(void) int menu_init(void)
@ -754,6 +753,11 @@ int menu_init(void)
// Load rom selector panel // Load rom selector panel
d3d_surface_new(&m_menuMainRomSelectPanel, "D:\\Media\\menuMainRomSelectPanel.png"); d3d_surface_new(&m_menuMainRomSelectPanel, "D:\\Media\\menuMainRomSelectPanel.png");
//Display some text
//Center the text (hardcoded)
xpos = width == 640 ? 65 : 400;
ypos = width == 640 ? 430 : 670;
g_console.mode_switch = MODE_MENU; g_console.mode_switch = MODE_MENU;