Skip to content

Add more options to configure the progressbar #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elkowar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add more options to configure the progressbar #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3569617
Add more options to configure the progressbar by using different char…
elkowar Jun 21, 2020
263cf09
Merge branch 'ncmpcpp:master' into progressbar_more_different_characters
lokesh-krishna Aug 25, 2021
3602c04
Update documentation regarding progressbar
lokesh-krishna Aug 25, 2021
eb855b0
Replace char with wchar_t
lokesh-krishna Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions doc/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,11 @@
#centered_cursor = no
#
##
## Note: You can specify third character which will be used to build 'empty'
## part of progressbar.
## Note: You can specify up to 5 characters here:
## given the config
## progressbar_look = 12345
## the progressbar would look like this:
## 122222344444444444444445
##
#progressbar_look = =>
#
Expand Down
2 changes: 1 addition & 1 deletion doc/ncmpcpp.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ Default state for autocenter mode at start.
If enabled, currently highlighted position in the list will be always centered.
.TP
.B progressbar_look = TEXT
This variable defines the look of progressbar. Note that it has to be exactly two or three characters long.
This variable defines the look of the progressbar. Note that it has to be between two and five characters long. Two characters alone define the elapsed and remaining part of the progressbar. Three characters define the elapsed part, separator between the elapsed and remaining part and the remaining part of the bar respectively. Four define the first character of the bar, the elapsed part, the remaining part and the final character of the bar respectively. Five characters define the first character of the bar, the elapsed part, the separator between the elapsed and remaining part, the remaining part and the final character of the bar respectively.
.TP
.B default_place_to_search_in = database/playlist
If set to "playlist", Search engine will perform searching in current MPD playlist rather than in music database.
Expand Down
6 changes: 3 additions & 3 deletions src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,9 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
p.add("centered_cursor", &centered_cursor, "no", yes_no);
p.add("progressbar_look", &progressbar, "=>", [](std::string v) {
auto result = ToWString(std::move(v));
boundsCheck<std::wstring::size_type>(result.size(), 2, 3);
// If two characters were specified, fill \0 as the third one.
result.resize(3);
boundsCheck<std::wstring::size_type>(result.size(), 2, 5);
// If less than 5 characters were specified, fill \0 as the remaining.
result.resize(5);
return result;
});
p.add("default_place_to_search_in", &search_in_db, "database", [](std::string v) {
Expand Down
43 changes: 35 additions & 8 deletions src/statusbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,51 @@ void Progressbar::draw(unsigned int elapsed, unsigned int time)
unsigned pb_width = wFooter->getWidth();
unsigned howlong = time ? pb_width*elapsed/time : 0;
*wFooter << Config.progressbar_color;
if (Config.progressbar[2] != '\0')

// set the different bar characters depending on the amount of configured chars
wchar_t bar_start_char = Config.progressbar[0];
wchar_t bar_time_char = Config.progressbar[0];
wchar_t bar_time_end_char = Config.progressbar[1];
wchar_t bar_remaining_char = Config.progressbar[2];
wchar_t bar_remaining_end_char = Config.progressbar[2];
if (Config.progressbar[3] != '\0')
{
bar_time_char = Config.progressbar[1];
bar_remaining_char = Config.progressbar[2];
bar_time_end_char = Config.progressbar[3];
bar_remaining_end_char = Config.progressbar[3];
}
if (Config.progressbar[4] != '\0')
{
bar_remaining_end_char = Config.progressbar[4];
}


// draw the progressbar
if (Config.progressbar[2] == '\0')
{
mvwhline(wFooter->raw(), 0, 0, 0, pb_width);
}
else
{
wFooter->goToXY(0, 0);
for (unsigned i = 0; i < pb_width; ++i)
*wFooter << Config.progressbar[2];
*wFooter << bar_start_char;
for (unsigned i = 1; i < pb_width - 1; ++i) {
*wFooter << bar_remaining_char;
}
*wFooter << bar_remaining_end_char;
wFooter->goToXY(0, 0);
}
else
mvwhline(wFooter->raw(), 0, 0, 0, pb_width);
*wFooter << NC::FormattedColor::End<>(Config.progressbar_color);
if (time)
{
*wFooter << Config.progressbar_elapsed_color;
pb_width = std::min(size_t(howlong), wFooter->getWidth());
for (unsigned i = 0; i < pb_width; ++i)
*wFooter << Config.progressbar[0];
*wFooter << bar_start_char;
for (unsigned i = 1; i < pb_width; ++i)
*wFooter << bar_time_char;
if (howlong < wFooter->getWidth())
*wFooter << Config.progressbar[1];
*wFooter << bar_time_end_char;
*wFooter << NC::FormattedColor::End<>(Config.progressbar_elapsed_color);
}
}
Expand Down