WindyMadman/cuberite
1
0
Fork 0
mirror of https://github.com/cuberite/cuberite.git synced 2025-01-08 11:57:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement formatting codes

Browse Source
This commit is contained in:
mathiascode 2020-03-16 07:28:29 +02:00
parent 5a2163d7e6
commit 490e5ae4db
1 changed files with 81 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/CompositeChat.cpp
View File

@ -120,27 +120,40 @@ void cCompositeChat::ParseText(const AString & a_ParseText)
switch (a_ParseText[i])
{
case '@':
case '&':
{
// Color code
// Formatting code
i++;
if (i >= len)
{
// Not enough following text
break;
}
if (a_ParseText[i] == '@')
switch (a_ParseText[i])
{
// "@@" escape, just put a "@" into the current text and keep parsing as text
if (i > first + 1)
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':
case 'k':
case 'l':
case 'm':
case 'n':
case 'o':
{
CurrentText.append(a_ParseText.c_str() + first, i - first - 1);
}
first = i + 1;
continue;
}
else
{
// True color code. Create a part for the CurrentText and start parsing anew:
// True formatting code. Create a part for the CurrentText and start parsing anew:
if (i >= first)
{
CurrentText.append(a_ParseText.c_str() + first, i - first - 1);
@ -152,6 +165,14 @@ void cCompositeChat::ParseText(const AString & a_ParseText)
CurrentText.clear();
}
AddStyle(CurrentStyle, a_ParseText.substr(i - 1, 2));
break;
}
default:
{
// Not a valid formatting code. Go back.
i--;
break;
}
}
break;
}
@ -226,7 +247,7 @@ void cCompositeChat::UnderlineUrls(void)
{
if ((*itr)->m_PartType == ptUrl)
{
(*itr)->m_Style.append("u");
(*itr)->m_Style.append("@n");
}
} // for itr - m_Parts[]
}
@ -298,16 +319,6 @@ void cCompositeChat::AddStyle(AString & a_Style, const AString & a_AddStyle)
{
return;
}
if (a_AddStyle[0] == '@')
{
size_t idx = a_Style.find('@');
if ((idx != AString::npos) && (idx != a_Style.length()))
{
a_Style.erase(idx, 2);
}
a_Style.append(a_AddStyle);
return;
}
a_Style.append(a_AddStyle);
}
@ -425,50 +436,11 @@ void cCompositeChat::AddChatPartStyle(Json::Value & a_Value, const AString & a_P
size_t len = a_PartStyle.length();
for (size_t i = 0; i < len; i++)
{
switch (a_PartStyle[i])
{
case 'b':
{
// bold
a_Value["bold"] = Json::Value(true);
break;
}
case 'i':
{
// italic
a_Value["italic"] = Json::Value(true);
break;
}
case 'u':
{
// Underlined
a_Value["underlined"] = Json::Value(true);
break;
}
case 's':
{
// strikethrough
a_Value["strikethrough"] = Json::Value(true);
break;
}
case 'o':
{
// obfuscated
a_Value["obfuscated"] = Json::Value(true);
break;
}
case '@':
{
// Color, specified by the next char:
// Text formatting or color, specified by the next char:
i++;
if (i >= len)
{
// String too short, didn't contain a color
// String too short, didn't contain a formatting code
break;
}
switch (a_PartStyle[i])
@ -489,9 +461,25 @@ void cCompositeChat::AddChatPartStyle(Json::Value & a_Value, const AString & a_P
case 'd': a_Value["color"] = Json::Value("light_purple"); break;
case 'e': a_Value["color"] = Json::Value("yellow"); break;
case 'f': a_Value["color"] = Json::Value("white"); break;
} // switch (color)
} // case '@'
} // switch (Style[i])
case 'k': a_Value["obfuscated"] = Json::Value(true); break;
case 'l': a_Value["bold"] = Json::Value(true); break;
case 'm': a_Value["strikethrough"] = Json::Value(true); break;
case 'n': a_Value["underlined"] = Json::Value(true); break;
case 'o': a_Value["italic"] = Json::Value(true); break;
// Reset text style
case 'r':
{
a_Value["color"] = Json::Value("reset");
a_Value["obfuscated"] = Json::Value(false);
a_Value["bold"] = Json::Value(false);
a_Value["strikethrough"] = Json::Value(false);
a_Value["underlined"] = Json::Value(false);
a_Value["italic"] = Json::Value(false);
break;
}
} // switch (formatting code)
} // for i - a_PartStyle[]
}