libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Optimise menu_display_timedate()

Browse Source
This commit is contained in:
jdgleaver 2019-05-01 10:56:56 +01:00
parent c9f98fce2f
commit 2e68a634a2
2 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/drivers/rgui.c
View File

@ -21,7 +21,6 @@
#include <stdint.h>
#include <string.h>
#include <limits.h>
#include <time.h>
#include <string/stdstring.h>
#include <lists/file_list.h>
@ -3366,30 +3365,22 @@ static void rgui_render(void *data, bool is_idle)
/* Print clock (if required) */
if (settings->bools.menu_timedate_enable)
{
time_t current_time;
struct tm * time_info;
menu_display_ctx_datetime_t datetime;
char timedate[16];
timedate[0] = '\0';
/* menu_display_timedate() is incredibly slow
* -> do this the old fashioned way... */
datetime.s = timedate;
datetime.len = sizeof(timedate);
datetime.time_mode = 4;
/* Get current time */
time(&current_time);
time_info = localtime(&current_time);
menu_display_timedate(&datetime);
if (time_info)
{
snprintf(timedate, sizeof(timedate), "%02u:%02u",
(unsigned)time_info->tm_hour, (unsigned)time_info->tm_min);
blit_line(
timedate_x,
(RGUI_TERM_HEIGHT(fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, timedate,
rgui->colors.hover_color, rgui->colors.shadow_color);
}
blit_line(
timedate_x,
(RGUI_TERM_HEIGHT(fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, timedate,
rgui->colors.hover_color, rgui->colors.shadow_color);
}
}

119
menu/menu_driver.c
View File

@ -73,6 +73,7 @@
#define PARTICLES_COUNT 100
#define POWERSTATE_CHECK_INTERVAL (30 * 1000000)
#define DATETIME_CHECK_INTERVAL 1000000
typedef struct menu_ctx_load_image
{
@ -229,6 +230,11 @@ static size_t menu_driver_selection_ptr = 0;
/* Timers */
static retro_time_t menu_driver_current_time_us = 0;
static retro_time_t menu_driver_powerstate_last_time_us = 0;
static retro_time_t menu_driver_datetime_last_time_us = 0;
/* Storage container for current menu datetime
* representation string */
static char menu_datetime_cache[255] = {0};
/* Returns the OSK key at a given position */
int menu_display_osk_ptr_at_pos(void *data, int x, int y,
@ -364,66 +370,79 @@ static bool menu_display_check_compatibility(
* */
void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
{
time_t time_;
if (!datetime)
return;
time(&time_);
setlocale(LC_TIME, "");
switch (datetime->time_mode)
/* Trigger an update, if required */
if (menu_driver_current_time_us - menu_driver_datetime_last_time_us >=
DATETIME_CHECK_INTERVAL)
{
case 0: /* Date and time */
strftime(datetime->s, datetime->len,
"%Y-%m-%d %H:%M:%S", localtime(&time_));
break;
case 1: /* YY-MM-DD HH:MM */
strftime(datetime->s, datetime->len,
"%Y-%m-%d %H:%M", localtime(&time_));
break;
case 2: /* MM-DD-YYYY HH:MM */
strftime(datetime->s, datetime->len,
"%m-%d-%Y %H:%M", localtime(&time_));
break;
case 3: /* Time */
strftime(datetime->s, datetime->len,
"%H:%M:%S", localtime(&time_));
break;
case 4: /* Time (hours-minutes) */
strftime(datetime->s, datetime->len,
"%H:%M", localtime(&time_));
break;
case 5: /* Date and time, without year and seconds */
strftime(datetime->s, datetime->len,
"%d/%m %H:%M", localtime(&time_));
break;
case 6:
strftime(datetime->s, datetime->len,
"%m/%d %H:%M", localtime(&time_));
break;
case 7: /* Time (hours-minutes), in 12 hour AM-PM designation */
time_t time_;
menu_driver_datetime_last_time_us = menu_driver_current_time_us;
/* Get current time */
time(&time_);
setlocale(LC_TIME, "");
/* Format string representation */
switch (datetime->time_mode)
{
case 0: /* Date and time */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%Y-%m-%d %H:%M:%S", localtime(&time_));
break;
case 1: /* YY-MM-DD HH:MM */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%Y-%m-%d %H:%M", localtime(&time_));
break;
case 2: /* MM-DD-YYYY HH:MM */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%m-%d-%Y %H:%M", localtime(&time_));
break;
case 3: /* Time */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%H:%M:%S", localtime(&time_));
break;
case 4: /* Time (hours-minutes) */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%H:%M", localtime(&time_));
break;
case 5: /* Date and time, without year and seconds */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%d/%m %H:%M", localtime(&time_));
break;
case 6:
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%m/%d %H:%M", localtime(&time_));
break;
case 7: /* Time (hours-minutes), in 12 hour AM-PM designation */
#if defined(__linux__) && !defined(ANDROID)
strftime(datetime->s, datetime->len,
"%I : %M : %S %p", localtime(&time_));
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%I : %M : %S %p", localtime(&time_));
#else
{
char *local;
strftime(datetime->s, datetime->len,
"%I:%M:%S %p", localtime(&time_));
local = local_to_utf8_string_alloc(datetime->s);
if (local)
{
strlcpy(datetime->s, local, datetime->len);
free(local);
char *local;
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%I:%M:%S %p", localtime(&time_));
local = local_to_utf8_string_alloc(menu_datetime_cache);
if (local)
{
strlcpy(menu_datetime_cache, local, sizeof(menu_datetime_cache));
free(local);
}
}
}
#endif
}
}
/* Copy cached datetime string to input
* menu_display_ctx_datetime_t struct */
strlcpy(datetime->s, menu_datetime_cache, datetime->len);
}
/* Display current (battery) power state */