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

ignore special chars that occurs in tag values

Browse Source 
ncmpcpp shouldn't treat '$' characters that
are part of a tag as special format chars.
This commit is contained in:
Andrzej Rybczak
2009-09-26 18:29:52 +02:00
parent 3e75ff6455
commit 4efaa18927
4 changed files with 90 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/helpers.h
View File

@@ -92,48 +92,73 @@ template <typename C> void String2Buffer(const std::basic_string<C> &s, basic_bu
{
for (typename std::basic_string<C>::const_iterator it = s.begin(); it != s.end(); ++it)
{
if (*it != '$')
buf << *it;
else if (isdigit(*++it))
buf << Color(*it-'0');
else
if (*it == '$')
{
switch (*it)
if (++it == s.end())
{
case 'b':
buf << fmtBold;
break;
case 'u':
buf << fmtUnderline;
break;
case 'a':
buf << fmtAltCharset;
break;
case 'r':
buf << fmtReverse;
break;
case '/':
switch (*++it)
{
case 'b':
buf << fmtBoldEnd;
buf << '$';
break;
}
else if (isdigit(*it))
{
buf << Color(*it-'0');
}
else
{
switch (*it)
{
case 'b':
buf << fmtBold;
break;
case 'u':
buf << fmtUnderline;
break;
case 'a':
buf << fmtAltCharset;
break;
case 'r':
buf << fmtReverse;
break;
case '/':
if (++it == s.end())
{
buf << "$/";
break;
case 'u':
buf << fmtUnderlineEnd;
break;
case 'a':
buf << fmtAltCharsetEnd;
break;
case 'r':
buf << fmtReverseEnd;
break;
}
break;
default:
buf << *it;
break;
}
switch (*it)
{
case 'b':
buf << fmtBoldEnd;
break;
case 'u':
buf << fmtUnderlineEnd;
break;
case 'a':
buf << fmtAltCharsetEnd;
break;
case 'r':
buf << fmtReverseEnd;
break;
default:
buf << '$' << *--it;
break;
}
break;
default:
buf << *--it;
break;
}
}
}
else if (*it == MPD::Song::FormatEscapeCharacter)
{
// treat '$' as a normal character if song format escape char is prepended to it
if (++it == s.end() || *it != '$')
--it;
buf << *it;
}
else
buf << *it;
}
}