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

(Menu/OSD) Refactor "fps_text" into "status_text" internally 

"fps_text" is used for several status parameters, not just FPS.
This commit is contained in:
Hugo Hromic 2020-07-19 16:58:58 +01:00
parent f1fed5397a
commit c3bf17d3f5
3 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gfx/gfx_widgets.c
View File

@ -1407,29 +1407,29 @@ void gfx_widgets_frame(void *data)
} }
#endif #endif
/* FPS Counter */ /* Status Text (fps, framecount, memory, core status message) */
if ( fps_show if ( fps_show
|| framecount_show || framecount_show
|| memory_show || memory_show
|| core_status_msg_show || core_status_msg_show
) )
{ {
const char *text = *p_dispwidget->gfx_widgets_fps_text == '\0' const char *text = *p_dispwidget->gfx_widgets_status_text == '\0'
? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE) ? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)
: p_dispwidget->gfx_widgets_fps_text; : p_dispwidget->gfx_widgets_status_text;
int text_width = font_driver_get_message_width( int text_width = font_driver_get_message_width(
p_dispwidget->gfx_widget_fonts.regular.font, p_dispwidget->gfx_widget_fonts.regular.font,
text, text,
(unsigned)strlen(text), 1.0f); (unsigned)strlen(text), 1.0f);
int total_width = text_width int total_width = text_width
+ p_dispwidget->simple_widget_padding * 2; + p_dispwidget->simple_widget_padding * 2;
int fps_text_x = top_right_x_advance int status_text_x = top_right_x_advance
- p_dispwidget->simple_widget_padding - text_width; - p_dispwidget->simple_widget_padding - text_width;
/* Ensure that left hand side of text does /* Ensure that left hand side of text does
* not bleed off the edge of the screen */ * not bleed off the edge of the screen */
fps_text_x = (fps_text_x < 0) ? 0 : fps_text_x; status_text_x = (status_text_x < 0) ? 0 : status_text_x;
gfx_display_set_alpha(gfx_widgets_backdrop_orig, DEFAULT_BACKDROP); gfx_display_set_alpha(gfx_widgets_backdrop_orig, DEFAULT_BACKDROP);
@ -1446,8 +1446,8 @@ void gfx_widgets_frame(void *data)
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular, gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,
text, text,
fps_text_x, status_text_x,
p_dispwidget->simple_widget_height / 2.0f p_dispwidget->simple_widget_height / 2.0f
+ p_dispwidget->gfx_widget_fonts.regular.line_centre_offset, + p_dispwidget->gfx_widget_fonts.regular.line_centre_offset,
video_width, video_height, video_width, video_height,
0xFFFFFFFF, 0xFFFFFFFF,
@ -2018,14 +2018,14 @@ static void gfx_widgets_free(dispgfx_widget_t *p_dispwidget)
font_driver_bind_block(NULL, NULL); font_driver_bind_block(NULL, NULL);
} }
bool gfx_widgets_set_fps_text( bool gfx_widgets_set_status_text(
void *data, void *data,
const char *new_fps_text) const char *new_status_text)
{ {
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data; dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data;
strlcpy(p_dispwidget->gfx_widgets_fps_text, strlcpy(p_dispwidget->gfx_widgets_status_text,
new_fps_text, sizeof(p_dispwidget->gfx_widgets_fps_text)); new_status_text, sizeof(p_dispwidget->gfx_widgets_status_text));
return true; return true;
} }

6
gfx/gfx_widgets.h
View File

@ -196,7 +196,7 @@ typedef struct dispgfx_widget
uintptr_t gfx_widgets_icons_textures[ uintptr_t gfx_widgets_icons_textures[
MENU_WIDGETS_ICON_LAST]; MENU_WIDGETS_ICON_LAST];
char gfx_widgets_fps_text[255]; char gfx_widgets_status_text[255];
uintptr_t gfx_widgets_generic_tag; uintptr_t gfx_widgets_generic_tag;
gfx_widget_fonts_t gfx_widget_fonts; gfx_widget_fonts_t gfx_widget_fonts;
fifo_buffer_t *msg_queue; fifo_buffer_t *msg_queue;
@ -374,9 +374,9 @@ void gfx_widgets_frame(void *data);
void *dispwidget_get_ptr(void); void *dispwidget_get_ptr(void);
bool gfx_widgets_set_fps_text( bool gfx_widgets_set_status_text(
void *data, void *data,
const char *new_fps_text); const char *new_status_text);
extern const gfx_widget_t gfx_widget_screenshot; extern const gfx_widget_t gfx_widget_screenshot;
extern const gfx_widget_t gfx_widget_volume; extern const gfx_widget_t gfx_widget_volume;

55
retroarch.c
View File

@ -32331,7 +32331,7 @@ unsigned video_pixel_get_alignment(unsigned pitch)
static void video_driver_frame(const void *data, unsigned width, static void video_driver_frame(const void *data, unsigned width,
unsigned height, size_t pitch) unsigned height, size_t pitch)
{ {
char fps_text[128]; char status_text[128];
static char video_driver_msg[256]; static char video_driver_msg[256];
static retro_time_t curr_time; static retro_time_t curr_time;
static retro_time_t fps_time; static retro_time_t fps_time;
@ -32348,7 +32348,7 @@ static void video_driver_frame(const void *data, unsigned width,
bool widgets_active = p_rarch->widgets_active; bool widgets_active = p_rarch->widgets_active;
#endif #endif
fps_text[0] = '\0'; status_text[0] = '\0';
video_driver_msg[0] = '\0'; video_driver_msg[0] = '\0';
if (!video_driver_active) if (!video_driver_active)
@ -32396,19 +32396,19 @@ static void video_driver_frame(const void *data, unsigned width,
if (video_info.fps_show) if (video_info.fps_show)
buf_pos = snprintf( buf_pos = snprintf(
fps_text, sizeof(fps_text), status_text, sizeof(status_text),
"FPS: %6.2f", last_fps); "FPS: %6.2f", last_fps);
if (video_info.framecount_show) if (video_info.framecount_show)
{ {
char frames_text[64]; char frames_text[64];
if (fps_text[buf_pos-1] != '\0') if (status_text[buf_pos-1] != '\0')
strlcat(fps_text, " || ", sizeof(fps_text)); strlcat(status_text, " || ", sizeof(status_text));
snprintf(frames_text, snprintf(frames_text,
sizeof(frames_text), sizeof(frames_text),
"%s: %" PRIu64, msg_hash_to_str(MSG_FRAMES), "%s: %" PRIu64, msg_hash_to_str(MSG_FRAMES),
(uint64_t)p_rarch->video_driver_frame_count); (uint64_t)p_rarch->video_driver_frame_count);
buf_pos = strlcat(fps_text, frames_text, sizeof(fps_text)); buf_pos = strlcat(status_text, frames_text, sizeof(status_text));
} }
if (video_info.memory_show) if (video_info.memory_show)
@ -32421,9 +32421,9 @@ static void video_driver_frame(const void *data, unsigned width,
snprintf( snprintf(
mem, sizeof(mem), "MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), mem, sizeof(mem), "MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f),
mem_bytes_total / (1024.0f * 1024.0f)); mem_bytes_total / (1024.0f * 1024.0f));
if (fps_text[buf_pos-1] != '\0') if (status_text[buf_pos-1] != '\0')
strlcat(fps_text, " || ", sizeof(fps_text)); strlcat(status_text, " || ", sizeof(status_text));
strlcat(fps_text, mem, sizeof(fps_text)); strlcat(status_text, mem, sizeof(status_text));
} }
if ((p_rarch->video_driver_frame_count % fps_update_interval) == 0) if ((p_rarch->video_driver_frame_count % fps_update_interval) == 0)
@ -32435,12 +32435,12 @@ static void video_driver_frame(const void *data, unsigned width,
p_rarch->video_driver_title_buf, p_rarch->video_driver_title_buf,
sizeof(p_rarch->video_driver_window_title)); sizeof(p_rarch->video_driver_window_title));
if (!string_is_empty(fps_text)) if (!string_is_empty(status_text))
{ {
strlcat(p_rarch->video_driver_window_title, strlcat(p_rarch->video_driver_window_title,
" || ", sizeof(p_rarch->video_driver_window_title)); " || ", sizeof(p_rarch->video_driver_window_title));
strlcat(p_rarch->video_driver_window_title, strlcat(p_rarch->video_driver_window_title,
fps_text, sizeof(p_rarch->video_driver_window_title)); status_text, sizeof(p_rarch->video_driver_window_title));
} }
curr_time = new_time; curr_time = new_time;
@ -32456,17 +32456,14 @@ static void video_driver_frame(const void *data, unsigned width,
sizeof(p_rarch->video_driver_window_title)); sizeof(p_rarch->video_driver_window_title));
if (video_info.fps_show) if (video_info.fps_show)
strlcpy(fps_text, strlcpy(status_text,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
sizeof(fps_text)); sizeof(status_text));
p_rarch->video_driver_window_title_update = true; p_rarch->video_driver_window_title_update = true;
} }
/* Add core status message to 'fps_text' string /* Add core status message to status text */
* TODO/FIXME: fps_text is used for several status
* parameters, not just FPS. It should probably be
* renamed to reflect this... */
if (video_info.core_status_msg_show) if (video_info.core_status_msg_show)
{ {
/* Note: We need to lock a mutex here. Strictly /* Note: We need to lock a mutex here. Strictly
@ -32492,18 +32489,18 @@ static void video_driver_frame(const void *data, unsigned width,
} }
else else
{ {
/* If 'fps_text' is already set, add status /* If status text is already set, add status
* message at the end */ * message at the end */
if (!string_is_empty(fps_text)) if (!string_is_empty(status_text))
{ {
strlcat(fps_text, strlcat(status_text,
" || ", sizeof(fps_text)); " || ", sizeof(status_text));
strlcat(fps_text, strlcat(status_text,
runloop_core_status_msg.str, sizeof(fps_text)); runloop_core_status_msg.str, sizeof(status_text));
} }
else else
strlcpy(fps_text, runloop_core_status_msg.str, strlcpy(status_text, runloop_core_status_msg.str,
sizeof(fps_text)); sizeof(status_text));
} }
RUNLOOP_MSG_QUEUE_UNLOCK(); RUNLOOP_MSG_QUEUE_UNLOCK();
@ -32678,7 +32675,7 @@ static void video_driver_frame(const void *data, unsigned width,
p_rarch->video_driver_frame_count++; p_rarch->video_driver_frame_count++;
/* Display the FPS, with a higher priority. */ /* Display the status text, with a higher priority. */
if ( video_info.fps_show if ( video_info.fps_show
|| video_info.framecount_show || video_info.framecount_show
|| video_info.memory_show || video_info.memory_show
@ -32687,13 +32684,13 @@ static void video_driver_frame(const void *data, unsigned width,
{ {
#if defined(HAVE_GFX_WIDGETS) #if defined(HAVE_GFX_WIDGETS)
if (widgets_active) if (widgets_active)
gfx_widgets_set_fps_text( gfx_widgets_set_status_text(
&p_rarch->dispwidget_st, &p_rarch->dispwidget_st,
fps_text); status_text);
else else
#endif #endif
{ {
runloop_msg_queue_push(fps_text, 2, 1, true, NULL, runloop_msg_queue_push(status_text, 2, 1, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
} }