(menu.c) Cleanups

This commit is contained in:
twinaphex 2015-01-11 06:14:13 +01:00
parent 751f2b7403
commit 22ccfc7db7

View File

@ -299,6 +299,9 @@ void menu_free(void *data)
void menu_ticker_line(char *buf, size_t len, unsigned idx,
const char *str, bool selected)
{
unsigned ticker_period, phase, phase_left_stop;
unsigned phase_left_moving, phase_right_stop;
unsigned left_offset, right_offset;
size_t str_len = strlen(str);
if (str_len <= len)
@ -314,17 +317,16 @@ void menu_ticker_line(char *buf, size_t len, unsigned idx,
return;
}
{
/* Wrap long strings in options with some kind of ticker line. */
unsigned ticker_period = 2 * (str_len - len) + 4;
unsigned phase = idx % ticker_period;
ticker_period = 2 * (str_len - len) + 4;
phase = idx % 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;
phase_left_stop = 2;
phase_left_moving = phase_left_stop + (str_len - len);
phase_right_stop = phase_left_moving + 2;
unsigned left_offset = phase - phase_left_stop;
unsigned right_offset = (str_len - len) - (phase - phase_right_stop);
left_offset = phase - phase_left_stop;
right_offset = (str_len - len) - (phase - phase_right_stop);
/* Ticker period:
* [Wait at left (2 ticks),
@ -341,7 +343,6 @@ void menu_ticker_line(char *buf, size_t len, unsigned idx,
else
strlcpy(buf, str + right_offset, len + 1);
}
}
void menu_apply_deferred_settings(void)
{
@ -357,8 +358,12 @@ void menu_apply_deferred_settings(void)
for (; setting->type != ST_NONE; setting++)
{
if ((setting->type < ST_GROUP) && (setting->flags & SD_FLAG_IS_DEFERRED))
{
if (setting->type >= ST_GROUP)
continue;
if (!(setting->flags & SD_FLAG_IS_DEFERRED))
continue;
switch (setting->type)
{
case ST_BOOL:
@ -393,7 +398,7 @@ void menu_apply_deferred_settings(void)
case ST_DIR:
case ST_STRING:
case ST_BIND:
/* always run the deferred write handler */
/* Always run the deferred write handler */
setting->deferred_handler(setting);
break;
default:
@ -401,7 +406,6 @@ void menu_apply_deferred_settings(void)
}
}
}
}
/**
* menu_iterate: