Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put scrolling code into function and use it also in lyrics screen

Browse Source
This commit is contained in:
Andrzej Rybczak
2008-12-19 23:23:50 +01:00
parent c6a57511fe
commit a84067d1ab
4 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/helpers.cpp
View File

@@ -877,3 +877,40 @@ const basic_buffer<my_char_t> &ShowTagInInfoScreen(const string &tag)
return ShowTag(tag);
# endif
}
void Scroller(Window &w, const string &string, size_t width, size_t &pos)
{
std::basic_string<my_char_t> s = TO_WSTRING(string);
size_t len;
# ifdef _UTF8
len = Window::Length(s);
# else
len = s.length();
# endif
if (len > width)
{
# ifdef _UTF8
s += L" ** ";
# else
s += " ** ";
# endif
len = 0;
std::basic_string<my_char_t>::const_iterator b = s.begin(), e = s.end();
for (std::basic_string<my_char_t>::const_iterator it = b+pos; it != e && len < width; it++)
{
len += wcwidth(*it);
w << *it;
}
if (++pos >= s.length())
pos = 0;
for (; len < width; b++)
{
len += wcwidth(*b);
w << *b;
}
}
else
w << s;
}

2
src/helpers.h
View File

@@ -70,5 +70,7 @@ Window &Statusbar();
const Buffer &ShowTag(const string &);
const basic_buffer<my_char_t> &ShowTagInInfoScreen(const string &);
void Scroller(Window &, const string &, size_t, size_t &);
#endif

65
src/ncmpcpp.cpp
View File

@@ -337,13 +337,16 @@ int main(int argc, char *argv[])
int found_pos = 0;
int input;
size_t lyrics_scroll_begin = 0;
Song lyrics_song;
Song edited_song;
Song sought_pattern;
bool main_exit = 0;
bool title_allowed = !Config.display_screens_numbers_on_start;
string lyrics_title;
string screen_title;
string info_title;
// local variables end
@@ -373,42 +376,42 @@ int main(int argc, char *argv[])
messages_allowed = 1;
// header stuff
const size_t max_allowed_title_length = wHeader ? wHeader->GetWidth()-volume_state.length() : 0;
if (current_screen == csBrowser && input == ERR && browsed_dir.length() > max_allowed_title_length)
const size_t max_allowed_title_length = wHeader ? wHeader->GetWidth()-volume_state.length()-screen_title.length() : 0;
if (input == ERR
&& ((current_screen == csBrowser && browsed_dir.length() > max_allowed_title_length)
|| current_screen == csLyrics))
redraw_header = 1;
if (Config.header_visibility && redraw_header)
{
string title;
switch (current_screen)
{
case csHelp:
title = "Help";
screen_title = "Help";
break;
case csPlaylist:
title = "Playlist ";
screen_title = "Playlist ";
break;
case csBrowser:
title = "Browse: ";
screen_title = "Browse: ";
break;
case csTinyTagEditor:
case csTagEditor:
title = "Tag editor";
screen_title = "Tag editor";
break;
case csInfo:
title = info_title;
screen_title = info_title;
break;
case csSearcher:
title = "Search engine";
screen_title = "Search engine";
break;
case csLibrary:
title = "Media library";
screen_title = "Media library";
break;
case csLyrics:
title = lyrics_title;
screen_title = "Lyrics: ";
break;
case csPlaylistEditor:
title = "Playlist editor";
screen_title = "Playlist editor";
break;
default:
break;
@@ -417,33 +420,24 @@ int main(int argc, char *argv[])
if (title_allowed)
{
wHeader->Bold(1);
wHeader->WriteXY(0, 0, 1, "%s", title.c_str());
wHeader->WriteXY(0, 0, 1, "%s", screen_title.c_str());
wHeader->Bold(0);
if (current_screen == csPlaylist)
{
DisplayTotalPlaylistLength(*wHeader);
}
else if (current_screen == csBrowser)
{
size_t max_length_without_scroll = wHeader->GetWidth()-volume_state.length()-title.length();
my_string_t wbrowseddir = TO_WSTRING(browsed_dir);
wHeader->Bold(1);
if (browsed_dir.length() > max_length_without_scroll)
{
# ifdef _UTF8
wbrowseddir += L" ** ";
# else
wbrowseddir += " ** ";
# endif
const size_t scrollsize = max_length_without_scroll;
my_string_t part = wbrowseddir.substr(browsed_dir_scroll_begin++, scrollsize);
if (part.length() < scrollsize)
part += wbrowseddir.substr(0, scrollsize-part.length());
wHeader->WriteXY(title.length(), 0, 0, UTF_S_FMT, part.c_str());
if (browsed_dir_scroll_begin >= wbrowseddir.length())
browsed_dir_scroll_begin = 0;
Scroller(*wHeader, browsed_dir, max_allowed_title_length, browsed_dir_scroll_begin);
wHeader->Bold(0);
}
else
wHeader->WriteXY(title.length(), 0, 0, "%s", browsed_dir.c_str());
else if (current_screen == csLyrics)
{
wHeader->Bold(1);
Scroller(*wHeader, lyrics_song.toString("%a - %t"), max_allowed_title_length, lyrics_scroll_begin);
wHeader->Bold(0);
}
}
@@ -456,7 +450,7 @@ int main(int argc, char *argv[])
}
wHeader->SetColor(Config.volume_color);
wHeader->WriteXY(max_allowed_title_length, 0, 0, "%s", volume_state.c_str());
wHeader->WriteXY(wHeader->GetWidth()-volume_state.length(), 0, 0, "%s", volume_state.c_str());
wHeader->SetColor(Config.header_color);
wHeader->Refresh();
redraw_header = 0;
@@ -3430,13 +3424,14 @@ int main(int argc, char *argv[])
}
if (!s->GetArtist().empty() && !s->GetTitle().empty())
{
lyrics_scroll_begin = 0;
lyrics_song = *s;
wPrev = wCurrent;
prev_screen = current_screen;
wCurrent = sLyrics;
redraw_header = 1;
wCurrent->Clear();
current_screen = csLyrics;
lyrics_title = "Lyrics: " + s->GetArtist() + " - " + s->GetTitle();
sLyrics->WriteXY(0, 0, 0, "Fetching lyrics...");
sLyrics->Refresh();
# ifdef HAVE_CURL_CURL_H

24
src/status_checker.cpp
View File

@@ -343,29 +343,9 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
tracklength += Song::ShowTime(elapsed);
tracklength += "]";
}
my_string_t playing_song = TO_WSTRING(s.toString(Config.song_status_format));
const size_t max_length_without_scroll = wFooter->GetWidth()-player_state.length()-tracklength.length();
wFooter->WriteXY(0, 1, 0, "%s", player_state.c_str());
wFooter->WriteXY(0, 1, 1, "%s", player_state.c_str());
wFooter->Bold(0);
if (playing_song.length() > max_length_without_scroll)
{
# ifdef _UTF8
playing_song += L" ** ";
# else
playing_song += " ** ";
# endif
const size_t scrollsize = max_length_without_scroll+playing_song.length();
my_string_t part = playing_song.substr(playing_song_scroll_begin++, scrollsize);
if (part.length() < scrollsize)
part += playing_song.substr(0, scrollsize-part.length());
wFooter->WriteXY(player_state.length(), 1, 0, UTF_S_FMT, part.c_str());
if (playing_song_scroll_begin >= playing_song.length())
playing_song_scroll_begin = 0;
}
else
wFooter->WriteXY(player_state.length(), 1, 1, "%s", s.toString(Config.song_status_format).c_str());
Scroller(*wFooter, s.toString(Config.song_status_format), wFooter->GetWidth()-player_state.length()-tracklength.length(), playing_song_scroll_begin);
wFooter->Bold(1);
wFooter->WriteXY(wFooter->GetWidth()-tracklength.length(), 1, 1, "%s", tracklength.c_str());