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

fix scrolling if unicode is disabled

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-01-15 20:44:03 +01:00
parent 24c308dac8
commit 14befc5b56
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/helpers.cpp
View File

@@ -846,14 +846,22 @@ void Scroller(Window &w, const string &string, size_t width, size_t &pos)
std::basic_string<my_char_t>::const_iterator b = s.begin(), e = s.end(); 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++) for (std::basic_string<my_char_t>::const_iterator it = b+pos; it != e && len < width; it++)
{ {
# ifdef _UTF8
len += wcwidth(*it); len += wcwidth(*it);
# else
len++;
# endif
w << *it; w << *it;
} }
if (++pos >= s.length()) if (++pos >= s.length())
pos = 0; pos = 0;
for (; len < width; b++) for (; len < width; b++)
{ {
# ifdef _UTF8
len += wcwidth(*b); len += wcwidth(*b);
# else
len++;
# endif
w << *b; w << *b;
} }
} }