CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor ticker line creation.

Browse Source 
Move to menu_common. Can be reused.
This commit is contained in:
Themaister 2013-05-05 11:26:02 +02:00
parent 5b8257d62c
commit 65deccfcad
3 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/menu/menu_common.c
View File

@ -561,6 +561,38 @@ void menu_free(void)
free(rgui);
}
void menu_ticker_line(char *buf, size_t len, unsigned index, const char *str)
{
size_t str_len = strlen(str);
if (str_len <= len)
{
strlcpy(buf, str, len + 1);
return;
}
// Wrap long strings in options with some kind of ticker line.
unsigned ticker_period = 2 * (str_len - len) + 4;
unsigned phase = index % ticker_period;
unsigned phase_left_stop = 2;
unsigned phase_left_moving = phase_left_stop + (str_len - len);
unsigned phase_right_stop = phase_left_moving + 2;
unsigned left_offset = phase - phase_left_stop;
unsigned right_offset = (str_len - len) - (phase - phase_right_stop);
// Ticker period: [Wait at left (2 ticks), Progress to right (type_len - w), Wait at right (2 ticks), Progress to left].
if (phase < phase_left_stop)
strlcpy(buf, str, len + 1);
else if (phase < phase_left_moving)
strlcpy(buf, str + left_offset, len + 1);
else if (phase < phase_right_stop)
strlcpy(buf, str + str_len - len, len + 1);
else
strlcpy(buf, str + right_offset, len + 1);
}
#ifndef HAVE_RMENU_XUI
#if defined(HAVE_RMENU) || defined(HAVE_RGUI)
bool menu_iterate(void)

2
frontend/menu/menu_common.h
View File

@ -281,6 +281,8 @@ void shader_manager_get_str(struct gfx_shader *shader,
char *type_str, size_t type_str_size, unsigned type);
#endif
void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str);
void load_menu_game_prepare(void);
bool load_menu_game(void);
void load_menu_game_history(unsigned game_index);

27
frontend/menu/rgui.c
View File

@ -742,7 +742,6 @@ static void render_text(rgui_handle_t *rgui)
char entry_title_buf[256];
char type_str_buf[64];
size_t type_len = strlen(type_str);
strlcpy(entry_title_buf, path, sizeof(entry_title_buf));
strlcpy(type_str_buf, type_str, sizeof(type_str_buf));
@ -756,30 +755,8 @@ static void render_text(rgui_handle_t *rgui)
"%.*s...%s", TERM_WIDTH - (w + 1 + 2) - 8, path, &path[path_len - 5]);
}
}
else if (type_len > w)
{
// Wrap long strings in options with some kind of ticker line.
unsigned index = g_extern.frame_count / 15;
unsigned ticker_period = 2 * (type_len - w) + 4;
unsigned phase = index % ticker_period;
unsigned phase_left_stop = 2;
unsigned phase_left_moving = phase_left_stop + (type_len - w);
unsigned phase_right_stop = phase_left_moving + 2;
unsigned left_offset = phase - phase_left_stop;
unsigned right_offset = (type_len - w) - (phase - phase_right_stop);
// Ticker period: [Wait at left (2 ticks), Progress to right (type_len - w), Wait at right (2 ticks), Progress to left].
if (phase < phase_left_stop)
strlcpy(type_str_buf, type_str, w + 1);
else if (phase < phase_left_moving)
strlcpy(type_str_buf, type_str + left_offset, w + 1);
else if (phase < phase_right_stop)
strlcpy(type_str_buf, type_str + type_len - w, w + 1);
else
strlcpy(type_str_buf, type_str + right_offset, w + 1);
}
else
menu_ticker_line(type_str_buf, w, g_extern.frame_count / 15, type_str);
snprintf(message, sizeof(message), "%c %-*.*s %-*s",
i == rgui->selection_ptr ? '>' : ' ',