len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small cleanup statusbar

Browse source 
move some things around and split out a few things to their own functions

Change-Id: I76ce216776ca939f030cb0b2caefc09b56fe66df
This commit is contained in:
William Wilgus 2025-01-16 11:26:18 -05:00 • committed by William Wilgus
parent ca2e195a76
commit e5690803c6
2 changed files with 75 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

134
apps/gui/statusbar.c
View file

@ -160,8 +160,9 @@ static void gui_statusbar_time(struct screen * display, struct tm *time);
* Initializes a status bar * Initializes a status bar
* - bar : the bar to initialize * - bar : the bar to initialize
*/ */
static void gui_statusbar_init(struct gui_statusbar * bar) static void gui_statusbar_init(struct screen * display, struct gui_statusbar * bar)
{ {
bar->display = display;
bar->redraw_volume = true; bar->redraw_volume = true;
bar->volume_icon_switch_tick = bar->battery_icon_switch_tick = current_tick; bar->volume_icon_switch_tick = bar->battery_icon_switch_tick = current_tick;
memset((void*)&(bar->lastinfo), 0, sizeof(struct status_info)); memset((void*)&(bar->lastinfo), 0, sizeof(struct status_info));
@ -170,24 +171,12 @@ static void gui_statusbar_init(struct gui_statusbar * bar)
#endif #endif
} }
#define GET_RECT(vp, vals,display) do { \ static struct screen * sb_fill_bar_info(struct gui_statusbar * bar)
viewport_set_fullscreen(&(vp), (display)->screen_type); \
(vp).flags &= ~VP_FLAG_ALIGN_RIGHT; \
(vp).height = STATUSBAR_HEIGHT; \
(vp).x = STATUSBAR_X_POS; \
if ((vals) != STATUSBAR_BOTTOM) \
(vp).y = 0; \
else \
(vp).y = (display)->lcdheight - STATUSBAR_HEIGHT; \
} while(0)
void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct viewport *vp)
{ {
struct screen * display = bar->display; struct screen *display = bar->display;
struct viewport *last_vp = NULL;
if (!display) if (!display)
return; return display;
bar->info.battlevel = battery_level(); bar->info.battlevel = battery_level();
#ifdef HAVE_USB_POWER #ifdef HAVE_USB_POWER
@ -213,7 +202,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
else else
{ {
#else /* CONFIG_CHARGING < CHARGING_MONITOR */ #else /* CONFIG_CHARGING < CHARGING_MONITOR */
lasttime = current_tick; lasttime = current_tick;
{ {
#endif /* CONFIG_CHARGING < CHARGING_MONITOR */ #endif /* CONFIG_CHARGING < CHARGING_MONITOR */
/* animate in (max.) 4 steps, starting near the current charge level */ /* animate in (max.) 4 steps, starting near the current charge level */
@ -240,7 +229,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
bar->battery_icon_switch_tick = current_tick + HZ; bar->battery_icon_switch_tick = current_tick + HZ;
} }
} }
bar->info.volume = global_settings.volume; bar->info.volume = global_settings.volume;
bar->info.shuffle = global_settings.playlist_shuffle; bar->info.shuffle = global_settings.playlist_shuffle;
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD
@ -253,14 +241,23 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
#endif #endif
bar->info.repeat = global_settings.repeat_mode; bar->info.repeat = global_settings.repeat_mode;
bar->info.playmode = current_playmode(); bar->info.playmode = current_playmode();
#if CONFIG_RTC
bar->time = get_time();
#endif /* CONFIG_RTC */
#if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
if(!display->has_disk_led) if(!display->has_disk_led)
bar->info.led = led_read(HZ/2); /* delay should match polling interval */ bar->info.led = led_read(HZ/2); /* delay should match polling interval */
#endif #endif
#if CONFIG_RTC
bar->time = get_time(); return display;
#endif /* CONFIG_RTC */ }
void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct viewport *vp)
{
struct viewport *last_vp = NULL;
struct screen * display = sb_fill_bar_info(bar);
if (!display)
return;
/* only redraw if forced to, or info has changed */ /* only redraw if forced to, or info has changed */
if (force_redraw || bar->redraw_volume || if (force_redraw || bar->redraw_volume ||
@ -273,6 +270,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
display->fill_viewport(); display->fill_viewport();
display->set_drawmode(DRMODE_SOLID); display->set_drawmode(DRMODE_SOLID);
display->setfont(FONT_SYSFIXED);
if (bar->info.battery_state) if (bar->info.battery_state)
gui_statusbar_icon_battery(display, bar->info.battlevel, gui_statusbar_icon_battery(display, bar->info.battlevel,
@ -311,22 +309,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
else else
#endif #endif
{ {
switch (bar->info.repeat) { gui_statusbar_icon_play_mode(display, bar->info.repeat);
#ifdef AB_REPEAT_ENABLE
case REPEAT_AB:
gui_statusbar_icon_play_mode(display, Icon_RepeatAB);
break;
#endif /* AB_REPEAT_ENABLE */
case REPEAT_ONE:
gui_statusbar_icon_play_mode(display, Icon_RepeatOne);
break;
case REPEAT_ALL:
case REPEAT_SHUFFLE:
gui_statusbar_icon_play_mode(display, Icon_Repeat);
break;
}
if (bar->info.shuffle) if (bar->info.shuffle)
gui_statusbar_icon_shuffle(display); gui_statusbar_icon_shuffle(display);
} }
@ -342,8 +326,11 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
#endif /* CONFIG_RTC */ #endif /* CONFIG_RTC */
#if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
if(!display->has_disk_led && bar->info.led) if(!display->has_disk_led && bar->info.led)
{
gui_statusbar_led(display); gui_statusbar_led(display);
}
#endif #endif
display->setfont(FONT_UI);
display->update_viewport(); display->update_viewport();
display->set_viewport(last_vp); display->set_viewport(last_vp);
bar->lastinfo = bar->info; bar->lastinfo = bar->info;
@ -389,14 +376,13 @@ static void gui_statusbar_icon_battery(struct screen * display, int percent,
if (global_settings.battery_display && (percent > -1) && (percent <= 100)) { if (global_settings.battery_display && (percent > -1) && (percent <= 100)) {
#endif #endif
/* Numeric display */ /* Numeric display */
display->setfont(FONT_SYSFIXED);
snprintf(buffer, sizeof(buffer), "%3d", percent); snprintf(buffer, sizeof(buffer), "%3d", percent);
display->getstringsize(buffer, &width, &height); font_getstringsize(buffer, &width, &height, FONT_SYSFIXED);
if (height <= STATUSBAR_HEIGHT) if (height <= STATUSBAR_HEIGHT) {
display->putsxy(STATUSBAR_BATTERY_X_POS display->putsxy(STATUSBAR_BATTERY_X_POS
+ STATUSBAR_BATTERY_WIDTH / 2 + STATUSBAR_BATTERY_WIDTH / 2
- width/2, STATUSBAR_Y_POS, buffer); - width/2, STATUSBAR_Y_POS, buffer);
display->setfont(FONT_UI); }
} }
else { else {
@ -424,10 +410,8 @@ static void gui_statusbar_icon_battery(struct screen * display, int percent,
} }
if (percent == -1 || percent > 100) { if (percent == -1 || percent > 100) {
display->setfont(FONT_SYSFIXED);
display->putsxy(STATUSBAR_BATTERY_X_POS + STATUSBAR_BATTERY_WIDTH / 2 display->putsxy(STATUSBAR_BATTERY_X_POS + STATUSBAR_BATTERY_WIDTH / 2
- 4, STATUSBAR_Y_POS, "?"); - 4, STATUSBAR_Y_POS, "?");
display->setfont(FONT_UI);
} }
} }
@ -444,13 +428,9 @@ static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume)
int type = global_settings.volume_type; int type = global_settings.volume_type;
struct screen * display=bar->display; struct screen * display=bar->display;
const int minvol = sound_min(SOUND_VOLUME); const int minvol = sound_min(SOUND_VOLUME);
const int maxvol = sound_max(SOUND_VOLUME);
const int num_decimals = sound_numdecimals(SOUND_VOLUME);
if (volume < minvol) if (volume < minvol)
volume = minvol; volume = minvol;
if (volume > maxvol)
volume = maxvol;
if (volume == minvol) { if (volume == minvol) {
display->mono_bitmap(bitmap_icons_7x8[Icon_Mute], display->mono_bitmap(bitmap_icons_7x8[Icon_Mute],
@ -458,6 +438,10 @@ static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume)
STATUSBAR_Y_POS, 7, SB_ICON_HEIGHT); STATUSBAR_Y_POS, 7, SB_ICON_HEIGHT);
} }
else { else {
const int maxvol = sound_max(SOUND_VOLUME);
if (volume > maxvol)
volume = maxvol;
/* We want to redraw the icon later on */ /* We want to redraw the icon later on */
if (bar->last_volume != volume && bar->last_volume >= minvol) { if (bar->last_volume != volume && bar->last_volume >= minvol) {
bar->volume_icon_switch_tick = current_tick + HZ; bar->volume_icon_switch_tick = current_tick + HZ;
@ -473,18 +457,17 @@ static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume)
/* display volume level numerical? */ /* display volume level numerical? */
if (type) if (type)
{ {
const int num_decimals = sound_numdecimals(SOUND_VOLUME);
if (num_decimals) if (num_decimals)
volume /= 10 * num_decimals; volume /= 10 * num_decimals;
display->setfont(FONT_SYSFIXED);
snprintf(buffer, sizeof(buffer), "%2d", volume); snprintf(buffer, sizeof(buffer), "%2d", volume);
display->getstringsize(buffer, &width, &height); font_getstringsize(buffer, &width, &height, FONT_SYSFIXED);
if (height <= STATUSBAR_HEIGHT) if (height <= STATUSBAR_HEIGHT) {
{
display->putsxy(STATUSBAR_VOLUME_X_POS display->putsxy(STATUSBAR_VOLUME_X_POS
+ STATUSBAR_VOLUME_WIDTH / 2 + STATUSBAR_VOLUME_WIDTH / 2
- width/2, STATUSBAR_Y_POS, buffer); - width/2, STATUSBAR_Y_POS, buffer);
} }
display->setfont(FONT_UI);
} else { } else {
/* display volume bar */ /* display volume bar */
vol = (volume - minvol) * 14 / (maxvol - minvol); vol = (volume - minvol) * 14 / (maxvol - minvol);
@ -515,11 +498,32 @@ static void gui_statusbar_icon_play_state(struct screen * display, int state)
*/ */
static void gui_statusbar_icon_play_mode(struct screen * display, int mode) static void gui_statusbar_icon_play_mode(struct screen * display, int mode)
{ {
display->mono_bitmap(bitmap_icons_7x8[mode], STATUSBAR_PLAY_MODE_X_POS, switch (mode) {
STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH, #ifdef AB_REPEAT_ENABLE
SB_ICON_HEIGHT); case REPEAT_AB:
} display->mono_bitmap(bitmap_icons_7x8[Icon_RepeatAB],
STATUSBAR_PLAY_MODE_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH,
SB_ICON_HEIGHT);
break;
#endif /* AB_REPEAT_ENABLE */
case REPEAT_ONE:
display->mono_bitmap(bitmap_icons_7x8[Icon_RepeatOne],
STATUSBAR_PLAY_MODE_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH,
SB_ICON_HEIGHT);
break;
case REPEAT_ALL:
case REPEAT_SHUFFLE:
display->mono_bitmap(bitmap_icons_7x8[Icon_Repeat],
STATUSBAR_PLAY_MODE_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH,
SB_ICON_HEIGHT);
break;
}
}
/* /*
* Print shuffle mode to status bar * Print shuffle mode to status bar
*/ */
@ -589,13 +593,13 @@ static void gui_statusbar_time(struct screen * display, struct tm *time)
else { else {
p = "--:--"; p = "--:--";
} }
display->setfont(FONT_SYSFIXED);
display->getstringsize(p, &width, &height); font_getstringsize(p, &width, &height, FONT_SYSFIXED);
if (height <= STATUSBAR_HEIGHT) { if (height <= STATUSBAR_HEIGHT) {
display->putsxy(STATUSBAR_TIME_X_END(display->getwidth()) - width, display->putsxy(STATUSBAR_TIME_X_END(display->getwidth()) - width,
STATUSBAR_Y_POS, p); STATUSBAR_Y_POS, p);
} }
display->setfont(FONT_UI);
} }
#endif #endif
@ -648,7 +652,6 @@ static void gui_statusbar_write_format_info(struct screen * display)
} }
} }
/* Show bitmap - clipping right edge if needed */ /* Show bitmap - clipping right edge if needed */
display->mono_bitmap_part(bm, 0, 0, STATUSBAR_ENCODER_WIDTH, display->mono_bitmap_part(bm, 0, 0, STATUSBAR_ENCODER_WIDTH,
xpos, STATUSBAR_Y_POS, width, SB_ICON_HEIGHT); xpos, STATUSBAR_Y_POS, width, SB_ICON_HEIGHT);
@ -720,8 +723,7 @@ static void gui_statusbar_icon_recording_info(struct screen * display)
void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) void gui_syncstatusbar_init(struct gui_syncstatusbar * bars)
{ {
FOR_NB_SCREENS(i) { FOR_NB_SCREENS(i) {
gui_statusbar_init( &(bars->statusbars[i]) ); gui_statusbar_init(&(screens[i]), &(bars->statusbars[i]));
gui_statusbar_set_screen( &(bars->statusbars[i]), &(screens[i]) );
} }
} }

13
apps/gui/statusbar.h
View file

@ -57,14 +57,15 @@ enum statusbar_values { STATUSBAR_OFF = 0, STATUSBAR_TOP, STATUSBAR_BOTTOM };
struct gui_statusbar struct gui_statusbar
{ {
long battery_icon_switch_tick;
long volume_icon_switch_tick;
int last_volume;
bool redraw_volume; /* true if the volume gauge needs updating */
struct status_info info; struct status_info info;
struct status_info lastinfo; struct status_info lastinfo;
bool redraw_volume; /* true if the volume gauge needs updating */
int last_volume;
long volume_icon_switch_tick;
long battery_icon_switch_tick;
#if CONFIG_RTC #if CONFIG_RTC
struct tm *time; struct tm *time;
int last_tm_min; int last_tm_min;