mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Ozone) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-09-01 07:26:04 +02:00
parent 1e842c9701
commit eb1ab2e429
3 changed files with 87 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
menu/drivers/ozone/ozone.c
View File

@ -174,12 +174,7 @@ static size_t ozone_get_onscreen_category_selection(
/* Returns true if specified entry is currently /* Returns true if specified entry is currently
* displayed on screen */ * displayed on screen */
static bool INLINE ozone_entry_onscreen( #define OZONE_ENTRY_ONSCREEN(ozone, idx) (((idx) >= (ozone)->first_onscreen_entry) && ((idx) <= (ozone)->last_onscreen_entry))
ozone_handle_t *ozone, size_t idx)
{
return (idx >= ozone->first_onscreen_entry) &&
(idx <= ozone->last_onscreen_entry);
}
/* If currently selected entry is off screen, /* If currently selected entry is off screen,
* moves selection to specified on screen target * moves selection to specified on screen target
@ -192,7 +187,7 @@ static void ozone_auto_select_onscreen_entry(
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
/* Check whether selected item is already on screen */ /* Check whether selected item is already on screen */
if (ozone_entry_onscreen(ozone, selection)) if (OZONE_ENTRY_ONSCREEN(ozone, selection))
return; return;
/* Update selection index */ /* Update selection index */
@ -227,13 +222,15 @@ static bool INLINE ozone_metadata_override_available(ozone_handle_t *ozone)
* Short circuiting means that in most cases * Short circuiting means that in most cases
* only 'ozone->is_playlist' will be evaluated, * only 'ozone->is_playlist' will be evaluated,
* so this isn't too much of a performance hog... */ * so this isn't too much of a performance hog... */
return ozone->is_playlist && return ozone->is_playlist
ozone->show_thumbnail_bar && && ozone->show_thumbnail_bar
!ozone->selection_core_is_viewer && && !ozone->selection_core_is_viewer
(ozone->thumbnails.left.status != GFX_THUMBNAIL_STATUS_MISSING) && && (ozone->thumbnails.left.status != GFX_THUMBNAIL_STATUS_MISSING)
gfx_thumbnail_is_enabled(ozone->thumbnail_path_data, GFX_THUMBNAIL_LEFT) && && gfx_thumbnail_is_enabled(ozone->thumbnail_path_data,
(ozone->thumbnails.right.status != GFX_THUMBNAIL_STATUS_MISSING) && GFX_THUMBNAIL_LEFT)
gfx_thumbnail_is_enabled(ozone->thumbnail_path_data, GFX_THUMBNAIL_RIGHT); && (ozone->thumbnails.right.status != GFX_THUMBNAIL_STATUS_MISSING)
&& gfx_thumbnail_is_enabled(ozone->thumbnail_path_data,
GFX_THUMBNAIL_RIGHT);
} }
@ -306,17 +303,19 @@ static enum menu_action ozone_parse_menu_entry_action(
{ {
/* If cursor is active, ensure we target /* If cursor is active, ensure we target
* an on screen category */ * an on screen category */
size_t selection = (ozone->cursor_mode) ? size_t selection = (ozone->cursor_mode)
ozone_get_onscreen_category_selection(ozone) : ozone->categories_selection_ptr; ? ozone_get_onscreen_category_selection(ozone)
: ozone->categories_selection_ptr;
new_selection = (int)(selection + 1); new_selection = (int)(selection + 1);
if (new_selection >= (int)(ozone->system_tab_end + horizontal_list_size + 1)) if (new_selection >= (int)(ozone->system_tab_end
+ horizontal_list_size + 1))
new_selection = 0; new_selection = 0;
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE; new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
ozone->cursor_mode = false; ozone->cursor_mode = false;
break; break;
} }
@ -333,17 +332,17 @@ static enum menu_action ozone_parse_menu_entry_action(
{ {
/* If cursor is active, ensure we target /* If cursor is active, ensure we target
* an on screen category */ * an on screen category */
size_t selection = (ozone->cursor_mode) ? size_t selection = (ozone->cursor_mode)
ozone_get_onscreen_category_selection(ozone) : ozone->categories_selection_ptr; ? ozone_get_onscreen_category_selection(ozone)
: ozone->categories_selection_ptr;
new_selection = (int)selection - 1; new_selection = (int)selection - 1;
if (new_selection < 0) if (new_selection < 0)
new_selection = horizontal_list_size + ozone->system_tab_end; new_selection = horizontal_list_size + ozone->system_tab_end;
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE; new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
ozone->cursor_mode = false; ozone->cursor_mode = false;
break; break;
} }
@ -360,7 +359,7 @@ static enum menu_action ozone_parse_menu_entry_action(
if (ozone->cursor_in_sidebar) if (ozone->cursor_in_sidebar)
{ {
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE; new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
break; break;
} }
else if (ozone->depth > 1) else if (ozone->depth > 1)
@ -399,8 +398,8 @@ static enum menu_action ozone_parse_menu_entry_action(
* of a search, if required */ * of a search, if required */
if (ozone->is_playlist) if (ozone->is_playlist)
{ {
struct string_list *menu_search_terms = menu_driver_search_get_terms(); struct string_list *menu_search_terms =
menu_driver_search_get_terms();
if (menu_search_terms && if (menu_search_terms &&
(menu_search_terms->size > 0)) (menu_search_terms->size > 0))
break; break;
@ -498,17 +497,15 @@ static int ozone_menu_entry_action(
void *userdata, menu_entry_t *entry, void *userdata, menu_entry_t *entry,
size_t i, enum menu_action action) size_t i, enum menu_action action)
{ {
menu_entry_t new_entry;
ozone_handle_t *ozone = (ozone_handle_t*)userdata; ozone_handle_t *ozone = (ozone_handle_t*)userdata;
menu_entry_t *entry_ptr = entry; menu_entry_t *entry_ptr = entry;
size_t selection = i; size_t selection = i;
size_t new_selection;
menu_entry_t new_entry;
/* Process input action */ /* Process input action */
enum menu_action new_action = ozone_parse_menu_entry_action(ozone, action); enum menu_action new_action = ozone_parse_menu_entry_action(ozone, action);
/* Check whether current selection has changed /* Check whether current selection has changed
* (due to automatic on screen entry selection...) */ * (due to automatic on screen entry selection...) */
new_selection = menu_navigation_get_selection(); size_t new_selection = menu_navigation_get_selection();
if (new_selection != selection) if (new_selection != selection)
{ {
@ -529,7 +526,6 @@ static int ozone_menu_entry_action(
new_selection, new_action); new_selection, new_action);
} }
static void ozone_free_node(ozone_node_t *node) static void ozone_free_node(ozone_node_t *node)
{ {
if (!node) if (!node)
@ -591,25 +587,25 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
file_list_initialize(&ozone->selection_buf_old); file_list_initialize(&ozone->selection_buf_old);
ozone->draw_sidebar = true; ozone->draw_sidebar = true;
ozone->sidebar_offset = 0; ozone->sidebar_offset = 0;
ozone->pending_message = NULL; ozone->pending_message = NULL;
ozone->is_playlist = false; ozone->is_playlist = false;
ozone->categories_selection_ptr = 0; ozone->categories_selection_ptr = 0;
ozone->pending_message = NULL; ozone->pending_message = NULL;
ozone->show_cursor = false; ozone->show_cursor = false;
ozone->first_frame = true; ozone->first_frame = true;
ozone->cursor_mode = false; ozone->cursor_mode = false;
ozone->sidebar_collapsed = false; ozone->sidebar_collapsed = false;
ozone->animations.sidebar_text_alpha = 1.0f; ozone->animations.sidebar_text_alpha = 1.0f;
ozone->animations.thumbnail_bar_position = 0.0f; ozone->animations.thumbnail_bar_position = 0.0f;
ozone->show_thumbnail_bar = false; ozone->show_thumbnail_bar = false;
ozone->dimensions_sidebar_width = 0.0f; ozone->dimensions_sidebar_width = 0.0f;
ozone->num_search_terms_old = 0; ozone->num_search_terms_old = 0;
ozone->thumbnail_path_data = gfx_thumbnail_path_init(); ozone->thumbnail_path_data = gfx_thumbnail_path_init();
if (!ozone->thumbnail_path_data) if (!ozone->thumbnail_path_data)
@ -630,35 +626,37 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
ozone_sidebar_update_collapse(ozone, false); ozone_sidebar_update_collapse(ozone, false);
ozone->system_tab_end = 0; ozone->system_tab_end = 0;
ozone->tabs[ozone->system_tab_end] = OZONE_SYSTEM_TAB_MAIN; ozone->tabs[ozone->system_tab_end] = OZONE_SYSTEM_TAB_MAIN;
if (settings->bools.menu_content_show_settings && !settings->bools.kiosk_mode_enable) if ( settings->bools.menu_content_show_settings
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_SETTINGS; && !settings->bools.kiosk_mode_enable)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_SETTINGS;
if (settings->bools.menu_content_show_favorites) if (settings->bools.menu_content_show_favorites)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_FAVORITES; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_FAVORITES;
if (settings->bools.menu_content_show_history) if (settings->bools.menu_content_show_history)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_HISTORY; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_HISTORY;
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
if (settings->bools.menu_content_show_images) if (settings->bools.menu_content_show_images)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_IMAGES; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_IMAGES;
#endif #endif
if (settings->bools.menu_content_show_music) if (settings->bools.menu_content_show_music)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_MUSIC; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_MUSIC;
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV) #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
if (settings->bools.menu_content_show_video) if (settings->bools.menu_content_show_video)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_VIDEO; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_VIDEO;
#endif #endif
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
if (settings->bools.menu_content_show_netplay) if (settings->bools.menu_content_show_netplay)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_NETPLAY; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_NETPLAY;
#endif #endif
if (settings->bools.menu_content_show_add && !settings->bools.kiosk_mode_enable) if ( settings->bools.menu_content_show_add
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_ADD; && !settings->bools.kiosk_mode_enable)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_ADD;
#if defined(HAVE_LIBRETRODB) #if defined(HAVE_LIBRETRODB)
if (settings->bools.menu_content_show_explore) if (settings->bools.menu_content_show_explore)
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_EXPLORE; ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_EXPLORE;
#endif #endif
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
@ -693,7 +691,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
fallback_color_theme = true; fallback_color_theme = true;
} }
else else
fallback_color_theme = true; fallback_color_theme = true;
if (fallback_color_theme) if (fallback_color_theme)
{ {
@ -705,10 +703,10 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
ozone->animations.scroll_y = 0.0f; ozone->animations.scroll_y = 0.0f;
ozone->animations.scroll_y_sidebar = 0.0f; ozone->animations.scroll_y_sidebar = 0.0f;
ozone->first_onscreen_entry = 0; ozone->first_onscreen_entry = 0;
ozone->last_onscreen_entry = 0; ozone->last_onscreen_entry = 0;
ozone->first_onscreen_category = 0; ozone->first_onscreen_category = 0;
ozone->last_onscreen_category = 0; ozone->last_onscreen_category = 0;
/* Assets path */ /* Assets path */
fill_pathname_join( fill_pathname_join(
@ -897,18 +895,15 @@ static bool ozone_init_font(
static void ozone_cache_footer_label(ozone_handle_t *ozone, static void ozone_cache_footer_label(ozone_handle_t *ozone,
ozone_footer_label_t *label, enum msg_hash_enums enum_idx) ozone_footer_label_t *label, enum msg_hash_enums enum_idx)
{ {
unsigned length; const char *str = msg_hash_to_str(enum_idx);
/* Determine pixel width */
unsigned length = (unsigned)strlen(str);
/* Assign string */ /* Assign string */
label->str = msg_hash_to_str(enum_idx); label->str = str;
label->width = font_driver_get_message_width(
/* Determine pixel width */
length = (unsigned)strlen(label->str);
label->width = font_driver_get_message_width(
ozone->fonts.footer.font, ozone->fonts.footer.font,
label->str, length, 1.0f); label->str, length, 1.0f);
/* If font_driver_get_message_width() fails, /* If font_driver_get_message_width() fails,
* use predetermined glyph_width as a fallback */ * use predetermined glyph_width as a fallback */
if (label->width < 0) if (label->width < 0)
@ -959,8 +954,8 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
scale_factor = ozone->last_scale_factor; scale_factor = ozone->last_scale_factor;
/* Calculate dimensions */ /* Calculate dimensions */
ozone->dimensions.header_height = HEADER_HEIGHT * scale_factor; ozone->dimensions.header_height = HEADER_HEIGHT * scale_factor;
ozone->dimensions.footer_height = FOOTER_HEIGHT * scale_factor; ozone->dimensions.footer_height = FOOTER_HEIGHT * scale_factor;
ozone->dimensions.entry_padding_horizontal_half = ENTRY_PADDING_HORIZONTAL_HALF * scale_factor; ozone->dimensions.entry_padding_horizontal_half = ENTRY_PADDING_HORIZONTAL_HALF * scale_factor;
ozone->dimensions.entry_padding_horizontal_full = ENTRY_PADDING_HORIZONTAL_FULL * scale_factor; ozone->dimensions.entry_padding_horizontal_full = ENTRY_PADDING_HORIZONTAL_FULL * scale_factor;
@ -987,12 +982,12 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
if (ozone->dimensions_sidebar_width == 0) if (ozone->dimensions_sidebar_width == 0)
ozone->dimensions_sidebar_width = (float)ozone->dimensions.sidebar_width_normal; ozone->dimensions_sidebar_width = (float)ozone->dimensions.sidebar_width_normal;
ozone->dimensions.thumbnail_bar_width = ozone->dimensions.thumbnail_bar_width =
ozone->dimensions.sidebar_width_normal - ozone->dimensions.sidebar_width_normal -
ozone->dimensions.sidebar_entry_icon_size - ozone->dimensions.sidebar_entry_icon_size -
ozone->dimensions.sidebar_entry_icon_padding; ozone->dimensions.sidebar_entry_icon_padding;
ozone->dimensions.cursor_size = CURSOR_SIZE * scale_factor; ozone->dimensions.cursor_size = CURSOR_SIZE * scale_factor;
ozone->dimensions.fullscreen_thumbnail_padding = FULLSCREEN_THUMBNAIL_PADDING * scale_factor; ozone->dimensions.fullscreen_thumbnail_padding = FULLSCREEN_THUMBNAIL_PADDING * scale_factor;
@ -1116,7 +1111,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
#endif #endif
strlcpy(filename, OZONE_TEXTURES_FILES[i], sizeof(filename)); strlcpy(filename, OZONE_TEXTURES_FILES[i], sizeof(filename));
strlcat(filename, ".png", sizeof(filename)); strlcat(filename, FILE_PATH_PNG_EXTENSION, sizeof(filename));
#if 0 #if 0
if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR && discord_avatar_is_ready()) if (i == OZONE_TEXTURE_DISCORD_OWN_AVATAR && discord_avatar_is_ready())
@ -1133,11 +1128,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
{ {
#endif #endif
if (!gfx_display_reset_textures_list(filename, ozone->png_path, &ozone->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL)) if (!gfx_display_reset_textures_list(filename, ozone->png_path, &ozone->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
{
ozone->has_all_assets = false; ozone->has_all_assets = false;
RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path,
PATH_DEFAULT_SLASH(), filename);
}
#if 0 #if 0
} }
#endif #endif
@ -1151,7 +1142,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
filename[0] = '\0'; filename[0] = '\0';
strlcpy(filename, strlcpy(filename,
OZONE_TAB_TEXTURES_FILES[i], sizeof(filename)); OZONE_TAB_TEXTURES_FILES[i], sizeof(filename));
strlcat(filename, ".png", sizeof(filename)); strlcat(filename, FILE_PATH_PNG_EXTENSION, sizeof(filename));
if (!gfx_display_reset_textures_list(filename, ozone->tab_path, &ozone->tab_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL)) if (!gfx_display_reset_textures_list(filename, ozone->tab_path, &ozone->tab_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
{ {

12
menu/drivers/ozone/ozone_sidebar.c
View File

@ -120,7 +120,7 @@ unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST] = {
static void ozone_sidebar_collapse_end(void *userdata) static void ozone_sidebar_collapse_end(void *userdata)
{ {
ozone_handle_t *ozone = (ozone_handle_t*) userdata; ozone_handle_t *ozone = (ozone_handle_t*)userdata;
ozone->sidebar_collapsed = true; ozone->sidebar_collapsed = true;
} }
@ -248,9 +248,13 @@ void ozone_draw_sidebar(
video_width, video_width,
video_height, video_height,
ozone->sidebar_offset, ozone->sidebar_offset,
video_height - ozone->dimensions.footer_height - ozone->dimensions.sidebar_gradient_height - ozone->dimensions.spacer_1px, video_height
- ozone->dimensions.footer_height
- ozone->dimensions.sidebar_gradient_height
- ozone->dimensions.spacer_1px,
(unsigned)ozone->dimensions_sidebar_width, (unsigned)ozone->dimensions_sidebar_width,
ozone->dimensions.sidebar_gradient_height + ozone->dimensions.spacer_1px, ozone->dimensions.sidebar_gradient_height
+ ozone->dimensions.spacer_1px,
video_width, video_width,
video_height, video_height,
ozone->theme->sidebar_bottom_gradient); ozone->theme->sidebar_bottom_gradient);
@ -575,7 +579,7 @@ void ozone_sidebar_update_collapse(ozone_handle_t *ozone, bool allow_animation)
ozone->animations.sidebar_text_alpha = 0.0f; ozone->animations.sidebar_text_alpha = 0.0f;
ozone->dimensions_sidebar_width = ozone->dimensions_sidebar_width =
ozone->dimensions.sidebar_width_collapsed; ozone->dimensions.sidebar_width_collapsed;
ozone_sidebar_collapse_end(ozone); ozone->sidebar_collapsed = true;
} }
} }
/* Show it */ /* Show it */

10
menu/drivers/ozone/ozone_texture.c
View File

@ -27,6 +27,8 @@
#include "../../../cheevos/badges.h" #include "../../../cheevos/badges.h"
#endif #endif
#include "../../../file_path_special.h"
#include "../../../verbosity.h" #include "../../../verbosity.h"
static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = { static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
@ -449,7 +451,7 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
(type < MENU_SETTINGS_NETPLAY_ROOMS_START) (type < MENU_SETTINGS_NETPLAY_ROOMS_START)
) )
{ {
int index = type - MENU_SETTINGS_CHEEVOS_START; int index = type - MENU_SETTINGS_CHEEVOS_START;
uintptr_t badge_texture = cheevos_get_menu_badge_texture(index); uintptr_t badge_texture = cheevos_get_menu_badge_texture(index);
if (badge_texture) if (badge_texture)
return badge_texture; return badge_texture;
@ -846,14 +848,10 @@ bool ozone_reset_theme_textures(ozone_handle_t *ozone)
char filename[PATH_MAX_LENGTH]; char filename[PATH_MAX_LENGTH];
strlcpy(filename, OZONE_THEME_TEXTURES_FILES[i], strlcpy(filename, OZONE_THEME_TEXTURES_FILES[i],
sizeof(filename)); sizeof(filename));
strlcat(filename, ".png", sizeof(filename)); strlcat(filename, FILE_PATH_PNG_EXTENSION, sizeof(filename));
if (!gfx_display_reset_textures_list(filename, theme_path, &theme->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL)) if (!gfx_display_reset_textures_list(filename, theme_path, &theme->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
{
RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", theme_path,
PATH_DEFAULT_SLASH(), filename);
result = false; result = false;
}
} }
} }