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

Merge pull request #8194 from jdgleaver/rgui-subsystem

Browse Source 
(RGUI) Add Subsystem support
This commit is contained in:
Twinaphex 2019-02-07 14:50:31 +01:00 committed by GitHub
commit 4ce93b11ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 100 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dynamic.c
View File

@ -222,6 +222,13 @@ static bool environ_cb_get_system_info(unsigned cmd, void *data)
{
for (i = 0; i < size && i < SUBSYSTEM_MAX_SUBSYSTEMS; i++)
{
/* Nasty, but have to do it like this since
* the pointers are const char *
* (if we don't free them, we get a memory leak) */
if (!string_is_empty(subsystem_data[i].desc))
free((char *)subsystem_data[i].desc);
if (!string_is_empty(subsystem_data[i].ident))
free((char *)subsystem_data[i].ident);
subsystem_data[i].desc = strdup(info[i].desc);
subsystem_data[i].ident = strdup(info[i].ident);
subsystem_data[i].id = info[i].id;
@ -232,6 +239,13 @@ static bool environ_cb_get_system_info(unsigned cmd, void *data)
for (j = 0; j < subsystem_data[i].num_roms && j < SUBSYSTEM_MAX_SUBSYSTEM_ROMS; j++)
{
/* Nasty, but have to do it like this since
* the pointers are const char *
* (if we don't free them, we get a memory leak) */
if (!string_is_empty(subsystem_data_roms[i][j].desc))
free((char *)subsystem_data_roms[i][j].desc);
if (!string_is_empty(subsystem_data_roms[i][j].valid_extensions))
free((char *)subsystem_data_roms[i][j].valid_extensions);
subsystem_data_roms[i][j].desc = strdup(info[i].roms[j].desc);
subsystem_data_roms[i][j].valid_extensions = strdup(info[i].roms[j].valid_extensions);
subsystem_data_roms[i][j].required = info[i].roms[j].required;

21
menu/menu_displaylist.c
View File

@ -92,6 +92,7 @@
#include "../core_info.h"
#include "../wifi/wifi_driver.h"
#include "../tasks/tasks_internal.h"
#include "../dynamic.h"
static char new_path_entry[4096] = {0};
static char new_lbl_entry[4096] = {0};
@ -7507,6 +7508,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
{
settings_t *settings = config_get_ptr();
rarch_system_info_t *sys_info = runloop_get_system_info();
const struct retro_subsystem_info* subsystem;
if (sys_info)
{
@ -7529,18 +7531,29 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
if (frontend_driver_has_fork())
#endif
{
if (settings->bools.menu_show_load_core)
if (settings->bools.menu_show_load_core)
{
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_CORE_LIST, PARSE_ACTION, false);
if (settings->bools.menu_show_load_core)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_SIDELOAD_CORE_LIST, PARSE_ACTION, false);
}
}
if (settings->bools.menu_show_load_content)
{
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_LOAD_CONTENT_LIST,
PARSE_ACTION, false);
/* Core fully loaded, use the subsystem data */
if (sys_info->subsystem.data)
subsystem = sys_info->subsystem.data;
/* Core not loaded completely, use the data we peeked on load core */
else
subsystem = subsystem_data;
menu_subsystem_populate(subsystem, info);
}
if (settings->bools.menu_content_show_history)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY,

77
menu/menu_driver.c
View File

@ -2691,7 +2691,16 @@ void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha)
void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_displaylist_info_t *info)
{
settings_t *settings = config_get_ptr();
char star_char[8];
unsigned i = 0;
bool is_rgui = string_is_equal(settings->arrays.menu_driver, "rgui");
/* Select approriate 'star' marker for subsystem menu entries
* (i.e. RGUI does not support unicode, so use a 'standard'
* character fallback) */
snprintf(star_char, sizeof(star_char), "%s", is_rgui ? "*" : "\u2605");
if (subsystem && subsystem_current_count > 0)
{
for (i = 0; i < subsystem_current_count; i++, subsystem++)
@ -2704,8 +2713,20 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
snprintf(s, sizeof(s),
"Load %s %s",
subsystem->desc,
i == content_get_subsystem()
? "\u2605" : " ");
star_char);
/* RGUI does not support sublabels, so have to add the
* appropriate text to the menu entry itself... */
if (is_rgui)
{
char tmp[PATH_MAX_LENGTH];
snprintf(tmp, sizeof(tmp),
"%s [%s %s]", s, "Current Content:",
subsystem->roms[content_get_subsystem_rom_id()].desc);
strlcpy(s, tmp, sizeof(s));
}
menu_entries_append_enum(info->list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
@ -2717,8 +2738,31 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
snprintf(s, sizeof(s),
"Start %s %s",
subsystem->desc,
i == content_get_subsystem()
? "\u2605" : " ");
star_char);
/* RGUI does not support sublabels, so have to add the
* appropriate text to the menu entry itself... */
if (is_rgui)
{
unsigned j = 0;
char rom_buff[PATH_MAX_LENGTH];
char tmp[PATH_MAX_LENGTH];
rom_buff[0] = '\0';
for (j = 0; j < content_get_subsystem_rom_id(); j++)
{
strlcat(rom_buff, path_basename(content_get_subsystem_rom(j)), sizeof(rom_buff));
if (j != content_get_subsystem_rom_id() - 1)
strlcat(rom_buff, "|", sizeof(rom_buff));
}
if (!string_is_empty(rom_buff))
{
snprintf(tmp, sizeof(tmp), "%s [%s]", s, rom_buff);
strlcpy(s, tmp, sizeof(s));
}
}
menu_entries_append_enum(info->list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_LOAD),
@ -2729,10 +2773,27 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
else
{
snprintf(s, sizeof(s),
"Load %s %s",
subsystem->desc,
i == content_get_subsystem()
? "\u2605" : " ");
"Load %s",
subsystem->desc);
/* RGUI does not support sublabels, so have to add the
* appropriate text to the menu entry itself... */
if (is_rgui)
{
/* This check is probably not required (it's not done
* in menu_cbs_sublabel.c action_bind_sublabel_subsystem_add(),
* anyway), but no harm in being safe... */
if (subsystem->num_roms > 0)
{
char tmp[PATH_MAX_LENGTH];
snprintf(tmp, sizeof(tmp),
"%s [%s %s]", s, "Current Content:",
subsystem->roms[0].desc);
strlcpy(s, tmp, sizeof(s));
}
}
menu_entries_append_enum(info->list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),