ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) Cleanup filebrowser code

This commit is contained in:
Twinaphex 2012-06-19 01:48:46 +02:00
parent 958b869c81
commit cc993e341f
3 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
console/fileio/file_browser.c
View File

@ -66,7 +66,36 @@ void filebrowser_pop_directory (filebrowser_t * filebrowser)
filebrowser->extensions); filebrowser->extensions);
} }
const char * filebrowser_get_current_dir (filebrowser_t *filebrowser)
{
return filebrowser->dir[filebrowser->directory_stack_size];
}
const char * filebrowser_get_current_path (filebrowser_t *filebrowser) const char * filebrowser_get_current_path (filebrowser_t *filebrowser)
{ {
return filebrowser->current_dir.elems[filebrowser->current_dir.ptr]; return filebrowser->current_dir.elems[filebrowser->current_dir.ptr];
} }
size_t filebrowser_get_current_index (filebrowser_t *filebrowser)
{
return filebrowser->current_dir.ptr;
}
void filebrowser_set_current_at (filebrowser_t *filebrowser, size_t pos)
{
filebrowser->current_dir.ptr = pos;
}
void filebrowser_set_current_increment (filebrowser_t *filebrowser, bool allow_wraparound)
{
filebrowser->current_dir.ptr++;
if (filebrowser->current_dir.ptr >= filebrowser->current_dir.size && allow_wraparound)
filebrowser->current_dir.ptr = 0;
}
void filebrowser_set_current_decrement (filebrowser_t *filebrowser, bool allow_wraparound)
{
filebrowser->current_dir.ptr--;
if (filebrowser->current_dir.ptr >= filebrowser->current_dir.size && allow_wraparound)
filebrowser->current_dir.ptr = filebrowser->current_dir.size - 1;
}

43
console/fileio/file_browser.h
View File

@ -38,42 +38,11 @@ void filebrowser_new(filebrowser_t *filebrowser, const char * start_dir, const c
void filebrowser_free(filebrowser_t *filebrowser); void filebrowser_free(filebrowser_t *filebrowser);
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension); void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension);
void filebrowser_pop_directory (filebrowser_t * filebrowser); void filebrowser_pop_directory (filebrowser_t * filebrowser);
const char * filebrowser_get_current_dir (filebrowser_t *filebrowser);
#define FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(filebrowser) (filebrowser.dir[filebrowser.directory_stack_size]) const char * filebrowser_get_current_path (filebrowser_t *filebrowser);
#define FILEBROWSER_GET_CURRENT_DIRECTORY_FILE_COUNT(filebrowser) (filebrowser.current_dir.size) size_t filebrowser_get_current_index (filebrowser_t *filebrowser);
#define FILEBROWSER_GOTO_ENTRY(filebrowser, i) filebrowser.current_dir.ptr = i; void filebrowser_set_current_at (filebrowser_t *filebrowser, size_t pos);
void filebrowser_set_current_increment (filebrowser_t *filebrowser, bool allow_wraparound);
#define FILEBROWSER_INCREMENT_ENTRY(filebrowser) \ void filebrowser_set_current_decrement (filebrowser_t *filebrowser, bool allow_wraparound);
{ \
filebrowser.current_dir.ptr++; \
if (filebrowser.current_dir.ptr >= filebrowser.current_dir.size) \
filebrowser.current_dir.ptr = 0; \
}
#define FILEBROWSER_INCREMENT_ENTRY_POINTER(filebrowser) \
{ \
filebrowser->current_dir.ptr++; \
if (filebrowser->current_dir.ptr >= filebrowser->current_dir.size) \
filebrowser->current_dir.ptr = 0; \
}
#define FILEBROWSER_DECREMENT_ENTRY(filebrowser) \
{ \
filebrowser.current_dir.ptr--; \
if (filebrowser.current_dir.ptr >= filebrowser.current_dir.size) \
filebrowser.current_dir.ptr = filebrowser.current_dir.size - 1; \
}
#define FILEBROWSER_DECREMENT_ENTRY_POINTER(filebrowser) \
{ \
filebrowser->current_dir.ptr--; \
if (filebrowser->current_dir.ptr >= filebrowser->current_dir.size) \
filebrowser->current_dir.ptr = filebrowser->current_dir.size - 1; \
}
#define FILEBROWSER_GET_CURRENT_FILENAME(filebrowser) (filebrowser.current_dir.elems[filebrowser.current_dir.ptr])
#define FILEBROWSER_GET_CURRENT_ENTRY_INDEX(filebrowser) (filebrowser.current_dir.ptr)
#define FILEBROWSER_IS_CURRENT_A_FILE(filebrowser) (path_file_exists(filebrowser.current_dir.elems[filebrowser.current_dir.ptr]))
#define FILEBROWSER_IS_CURRENT_A_DIRECTORY(filebrowser) (path_is_directory(filebrowser.current_dir.elems[filebrowser.current_dir.ptr]))
#endif /* FILEBROWSER_H_ */ #endif /* FILEBROWSER_H_ */

48
ps3/menu.c
View File

@ -222,7 +222,7 @@ static void browser_update(filebrowser_t * b)
{ {
if(b->current_dir.ptr < b->current_dir.size-1) if(b->current_dir.ptr < b->current_dir.size-1)
{ {
FILEBROWSER_INCREMENT_ENTRY_POINTER(b); filebrowser_set_current_increment(b, true);
set_delay = DELAY_SMALLEST; set_delay = DELAY_SMALLEST;
} }
} }
@ -231,7 +231,7 @@ static void browser_update(filebrowser_t * b)
{ {
if(b->current_dir.ptr < b->current_dir.size-1) if(b->current_dir.ptr < b->current_dir.size-1)
{ {
FILEBROWSER_INCREMENT_ENTRY_POINTER(b); filebrowser_set_current_increment(b, true);
set_delay = DELAY_SMALLEST; set_delay = DELAY_SMALLEST;
} }
} }
@ -240,7 +240,7 @@ static void browser_update(filebrowser_t * b)
{ {
if(b->current_dir.ptr > 0) if(b->current_dir.ptr > 0)
{ {
FILEBROWSER_DECREMENT_ENTRY_POINTER(b); filebrowser_set_current_decrement(b, true);
set_delay = DELAY_SMALLEST; set_delay = DELAY_SMALLEST;
} }
} }
@ -249,7 +249,7 @@ static void browser_update(filebrowser_t * b)
{ {
if(b->current_dir.ptr > 0) if(b->current_dir.ptr > 0)
{ {
FILEBROWSER_DECREMENT_ENTRY_POINTER(b); filebrowser_set_current_decrement(b, true);
set_delay = DELAY_SMALLEST; set_delay = DELAY_SMALLEST;
} }
} }
@ -886,7 +886,7 @@ static void select_file(uint32_t menu_id)
if (CTRL_CROSS(button_was_pressed)) if (CTRL_CROSS(button_was_pressed))
{ {
if(FILEBROWSER_IS_CURRENT_A_DIRECTORY(tmpBrowser)) if(path_is_directory(filebrowser_get_current_path(&tmpBrowser)))
{ {
/*if 'filename' is in fact '..' - then pop back directory instead of /*if 'filename' is in fact '..' - then pop back directory instead of
adding '..' to filename path */ adding '..' to filename path */
@ -894,13 +894,13 @@ static void select_file(uint32_t menu_id)
filebrowser_pop_directory(&tmpBrowser); filebrowser_pop_directory(&tmpBrowser);
else else
{ {
snprintf(path, sizeof(path), FILEBROWSER_GET_CURRENT_FILENAME(tmpBrowser)); snprintf(path, sizeof(path), filebrowser_get_current_path(&tmpBrowser));
filebrowser_push_directory(&tmpBrowser, path, true); filebrowser_push_directory(&tmpBrowser, path, true);
} }
} }
else if (FILEBROWSER_IS_CURRENT_A_FILE(tmpBrowser)) else if (path_file_exists(filebrowser_get_current_path(&tmpBrowser)))
{ {
snprintf(path, sizeof(path), FILEBROWSER_GET_CURRENT_FILENAME(tmpBrowser)); snprintf(path, sizeof(path), filebrowser_get_current_path(&tmpBrowser));
switch(menu_id) switch(menu_id)
{ {
@ -949,7 +949,7 @@ static void select_file(uint32_t menu_id)
menuStackindex--; menuStackindex--;
} }
cellDbgFontPrintf(0.09f, 0.09f, FONT_SIZE, YELLOW, "PATH: %s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(tmpBrowser)); cellDbgFontPrintf(0.09f, 0.09f, FONT_SIZE, YELLOW, "PATH: %s", filebrowser_get_current_dir(&tmpBrowser));
cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, title); cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, title);
cellDbgFontPrintf(0.09f, 0.92f, 0.92, YELLOW, "X - Select %s /\\ - return to settings START - Reset Startdir", object); cellDbgFontPrintf(0.09f, 0.92f, 0.92, YELLOW, "X - Select %s /\\ - return to settings START - Reset Startdir", object);
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "%s", comment); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "%s", comment);
@ -984,9 +984,9 @@ static void select_directory(uint32_t menu_id)
if (CTRL_SQUARE(button_was_pressed)) if (CTRL_SQUARE(button_was_pressed))
{ {
if(FILEBROWSER_IS_CURRENT_A_DIRECTORY(tmpBrowser)) if(path_is_directory(filebrowser_get_current_path(&tmpBrowser)))
{ {
snprintf(path, sizeof(path), FILEBROWSER_GET_CURRENT_FILENAME(tmpBrowser)); snprintf(path, sizeof(path), filebrowser_get_current_path(&tmpBrowser));
switch(menu_id) switch(menu_id)
{ {
case PATH_SAVESTATES_DIR_CHOICE: case PATH_SAVESTATES_DIR_CHOICE:
@ -1029,7 +1029,7 @@ static void select_directory(uint32_t menu_id)
if (CTRL_CROSS(button_was_pressed)) if (CTRL_CROSS(button_was_pressed))
{ {
if(FILEBROWSER_IS_CURRENT_A_DIRECTORY(tmpBrowser)) if(path_is_directory(filebrowser_get_current_path(&tmpBrowser)))
{ {
/* if 'filename' is in fact '..' - then pop back directory instead of /* if 'filename' is in fact '..' - then pop back directory instead of
* adding '..' to filename path */ * adding '..' to filename path */
@ -1038,7 +1038,7 @@ static void select_directory(uint32_t menu_id)
filebrowser_pop_directory(&tmpBrowser); filebrowser_pop_directory(&tmpBrowser);
else else
{ {
snprintf(newpath, sizeof(newpath), FILEBROWSER_GET_CURRENT_FILENAME(tmpBrowser)); snprintf(newpath, sizeof(newpath), filebrowser_get_current_path(&tmpBrowser));
filebrowser_push_directory(&tmpBrowser, newpath, false); filebrowser_push_directory(&tmpBrowser, newpath, false);
} }
} }
@ -1046,7 +1046,7 @@ static void select_directory(uint32_t menu_id)
} }
cellDbgFontPrintf (0.09f, 0.09f, FONT_SIZE, YELLOW, cellDbgFontPrintf (0.09f, 0.09f, FONT_SIZE, YELLOW,
"PATH: %s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(tmpBrowser)); "PATH: %s", filebrowser_get_current_dir(&tmpBrowser));
cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "DIRECTORY SELECTION"); cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "DIRECTORY SELECTION");
cellDbgFontPuts(0.09f, 0.93f, 0.92f, YELLOW, cellDbgFontPuts(0.09f, 0.93f, 0.92f, YELLOW,
"X - Enter dir /\\ - return to settings START - Reset Startdir"); "X - Enter dir /\\ - return to settings START - Reset Startdir");
@ -1916,7 +1916,7 @@ static void select_rom(void)
if (CTRL_CROSS(button_was_pressed)) if (CTRL_CROSS(button_was_pressed))
{ {
if(FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser)) if(path_is_directory(filebrowser_get_current_path(&browser)))
{ {
/*if 'filename' is in fact '..' - then pop back directory instead of adding '..' to filename path */ /*if 'filename' is in fact '..' - then pop back directory instead of adding '..' to filename path */
@ -1926,41 +1926,41 @@ static void select_rom(void)
} }
else else
{ {
snprintf(newpath, sizeof(newpath), FILEBROWSER_GET_CURRENT_FILENAME(browser)); snprintf(newpath, sizeof(newpath), filebrowser_get_current_path(&browser));
filebrowser_push_directory(&browser, newpath, true); filebrowser_push_directory(&browser, newpath, true);
} }
} }
else if (FILEBROWSER_IS_CURRENT_A_FILE(browser)) else if (path_file_exists(filebrowser_get_current_path(&browser)))
{ {
char rom_path_temp[PATH_MAX]; char rom_path_temp[PATH_MAX];
struct retro_system_info info; struct retro_system_info info;
retro_get_system_info(&info); retro_get_system_info(&info);
bool block_zip_extract = info.block_extract; bool block_zip_extract = info.block_extract;
snprintf(rom_path_temp, sizeof(rom_path_temp), FILEBROWSER_GET_CURRENT_FILENAME(browser)); snprintf(rom_path_temp, sizeof(rom_path_temp), filebrowser_get_current_path(&browser));
if((strstr(rom_path_temp, ".zip") || strstr(rom_path_temp, ".ZIP")) && !block_zip_extract) if((strstr(rom_path_temp, ".zip") || strstr(rom_path_temp, ".ZIP")) && !block_zip_extract)
rarch_extract_zipfile(rom_path_temp); rarch_extract_zipfile(rom_path_temp);
else else
{ {
snprintf(g_console.rom_path, sizeof(g_console.rom_path), FILEBROWSER_GET_CURRENT_FILENAME(browser)); snprintf(g_console.rom_path, sizeof(g_console.rom_path), filebrowser_get_current_path(&browser));
rarch_settings_change(S_START_RARCH); rarch_settings_change(S_START_RARCH);
} }
} }
} }
} }
if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser)) if (path_is_directory(filebrowser_get_current_path(&browser)))
{ {
if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"app_home") || !strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"host_root")) if(!strcmp(filebrowser_get_current_path(&browser),"app_home") || !strcmp(filebrowser_get_current_path(&browser),"host_root"))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart.");
else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"..")) else if(!strcmp(filebrowser_get_current_path(&browser),".."))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory.");
else else
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to enter the directory."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to enter the directory.");
} }
if (FILEBROWSER_IS_CURRENT_A_FILE(browser)) if (path_file_exists(filebrowser_get_current_path(&browser)))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to load the game. "); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to load the game. ");
struct retro_system_info info; struct retro_system_info info;
@ -1970,7 +1970,7 @@ static void select_rom(void)
cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "FILE BROWSER"); cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "FILE BROWSER");
cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s (v%s)", id, info.library_version); cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s (v%s)", id, info.library_version);
cellDbgFontPrintf (0.09f, 0.09f, FONT_SIZE, YELLOW, cellDbgFontPrintf (0.09f, 0.09f, FONT_SIZE, YELLOW,
"PATH: %s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser)); "PATH: %s", filebrowser_get_current_dir(&browser));
cellDbgFontPuts (0.09f, 0.93f, FONT_SIZE, YELLOW, cellDbgFontPuts (0.09f, 0.93f, FONT_SIZE, YELLOW,
"L3 + R3 - resume game SELECT - Settings screen"); "L3 + R3 - resume game SELECT - Settings screen");
gl_render_msg_post(gl); gl_render_msg_post(gl);