* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <utility>
#include <vector>
#include <QApplication>
// Now initialize the mapping between FormatCodes and FormatTypes...
_formatCodes["%O"] = FormatType::Base;
_formatCodes["%B"] = FormatType::Bold;
- _formatCodes["%S"] = FormatType::Italic;
+ _formatCodes["%I"] = FormatType::Italic;
_formatCodes["%U"] = FormatType::Underline;
- _formatCodes["%R"] = FormatType::Reverse;
+ _formatCodes["%S"] = FormatType::Strikethrough;
_formatCodes["%DN"] = FormatType::Nick;
_formatCodes["%DH"] = FormatType::Hostmask;
/******** Caching *******/
-QTextCharFormat UiStyle::format(quint64 key) const
+QTextCharFormat UiStyle::parsedFormat(quint64 key) const
{
return _formats.value(key, QTextCharFormat());
}
if (charFormat.properties().count())
return charFormat;
+ // Merge all formats except mIRC and extended colors
mergeFormat(charFormat, format, label & 0xffff0000); // keep nickhash in label
-
for (quint32 mask = 0x00000001; mask <= static_cast<quint32>(MessageLabel::Selected); mask <<= 1) {
if (static_cast<quint32>(label) & mask) {
- mergeFormat(charFormat, {format.type, {}, {}}, label & (mask | 0xffff0000)); // Don't re-apply extended colors
+ mergeFormat(charFormat, format, label & (mask | 0xffff0000));
+ }
+ }
+
+ // Merge mIRC and extended colors, if appropriate. These override any color set previously in the format,
+ // unless the AllowForegroundOverride or AllowBackgroundOverride properties are set (via stylesheet).
+ if (_allowMircColors) {
+ mergeColors(charFormat, format, MessageLabel::None);
+ for (quint32 mask = 0x00000001; mask <= static_cast<quint32>(MessageLabel::Selected); mask <<= 1) {
+ if (static_cast<quint32>(label) & mask) {
+ mergeColors(charFormat, format, label & mask);
+ }
}
}
// TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
// or "foreground 01 and background 03"
if ((format.type & 0xfff00) != FormatType::Base) { // element format
- for (quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
+ for (quint32 mask = 0x00100; mask <= 0x80000; mask <<= 1) {
if ((format.type & mask) != FormatType::Base) {
mergeSubElementFormat(charFormat, format.type & (mask | 0xff), label);
}
}
}
-
- // Now we handle color codes
- // We assume that those can't be combined with subelement and message types.
- if (_allowMircColors) {
- // Classic mIRC colors (styleable)
- if ((format.type & 0x00400000) != FormatType::Base)
- mergeSubElementFormat(charFormat, format.type & 0x0f400000, label); // foreground
- if ((format.type & 0x00800000) != FormatType::Base)
- mergeSubElementFormat(charFormat, format.type & 0xf0800000, label); // background
- if ((format.type & 0x00c00000) == static_cast<FormatType>(0x00c00000))
- mergeSubElementFormat(charFormat, format.type & 0xffc00000, label); // combination
-
- // Extended mIRC colors (hardcoded)
- if (format.foreground.isValid())
- charFormat.setForeground(format.foreground);
- if (format.background.isValid())
- charFormat.setBackground(format.background);
- }
-
- // URL
- if ((format.type & FormatType::Url) != FormatType::Base)
- mergeSubElementFormat(charFormat, format.type & (FormatType::Url | static_cast<FormatType>(0x000000ff)), label);
}
void UiStyle::mergeSubElementFormat(QTextCharFormat &fmt, FormatType ftype, MessageLabel label) const
{
quint64 key = ftype | label;
- fmt.merge(format(key & 0x0000ffffffffff00ull)); // label + subelement
- fmt.merge(format(key & 0x0000ffffffffffffull)); // label + subelement + msgtype
- fmt.merge(format(key & 0xffffffffffffff00ull)); // label + subelement + nickhash
- fmt.merge(format(key & 0xffffffffffffffffull)); // label + subelement + nickhash + msgtype
+ fmt.merge(parsedFormat(key & 0x0000ffffffffff00ull)); // label + subelement
+ fmt.merge(parsedFormat(key & 0x0000ffffffffffffull)); // label + subelement + msgtype
+ fmt.merge(parsedFormat(key & 0xffffffffffffff00ull)); // label + subelement + nickhash
+ fmt.merge(parsedFormat(key & 0xffffffffffffffffull)); // label + subelement + nickhash + msgtype
+}
+
+
+void UiStyle::mergeColors(QTextCharFormat &charFormat, const Format &format, MessageLabel label) const
+{
+ bool allowFg = charFormat.property(static_cast<int>(FormatProperty::AllowForegroundOverride)).toBool();
+ bool allowBg = charFormat.property(static_cast<int>(FormatProperty::AllowBackgroundOverride)).toBool();
+
+ // Classic mIRC colors (styleable)
+ // We assume that those can't be combined with subelement and message types.
+ if (allowFg && (format.type & 0x00400000) != FormatType::Base)
+ charFormat.merge(parsedFormat((format.type & 0x0f400000) | label)); // foreground
+ if (allowBg && (format.type & 0x00800000) != FormatType::Base)
+ charFormat.merge(parsedFormat((format.type & 0xf0800000) | label)); // background
+ if (allowFg && allowBg && (format.type & 0x00c00000) == static_cast<FormatType>(0x00c00000))
+ charFormat.merge(parsedFormat((format.type & 0xffc00000) | label)); // combination
+
+ // Extended mIRC colors (hardcoded)
+ if (allowFg && format.foreground.isValid())
+ charFormat.setForeground(format.foreground);
+ if (allowBg && format.background.isValid())
+ charFormat.setBackground(format.background);
}
}
Format curfmt{baseFormat, {}, {}};
+ QChar fgChar{'f'}; // character to indicate foreground color, changed when reversing
int pos = 0; quint16 length = 0;
for (;;) {
pos++;
continue;
}
- if (s[pos+1] == 'D' && s[pos+2] == 'c') { // color code
+ if (s[pos+1] == 'D' && s[pos+2] == 'c') { // mIRC color code
if (s[pos+3] == '-') { // color off
curfmt.type &= 0x003fffff;
curfmt.foreground = QColor{};
quint32 color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue();
// Color values 0-15 are traditional mIRC colors, defined in the stylesheet and thus going through the format engine
// Larger color values are hardcoded and applied separately (cf. https://modern.ircdocs.horse/formatting.html#colors-16-98)
- if (s[pos+3] == 'f') {
+ if (s[pos+3] == fgChar) {
if (color < 16) {
// Traditional mIRC color, defined in the stylesheet
curfmt.type &= 0xf0ffffff;
length = 6;
}
}
+ else if (s[pos+1] == 'D' && s[pos+2] == 'h') { // Hex color
+ QColor color{s.mid(pos+4, 7)};
+ if (s[pos+3] == fgChar) {
+ curfmt.type &= 0xf0bfffff; // mask out mIRC foreground color
+ curfmt.foreground = std::move(color);
+ }
+ else {
+ curfmt.type &= 0x0f7fffff; // mask out mIRC background color
+ curfmt.background = std::move(color);
+ }
+ length = 11;
+ }
else if (s[pos+1] == 'O') { // reset formatting
curfmt.type &= 0x000000ff; // we keep message type-specific formatting
curfmt.foreground = QColor{};
curfmt.background = QColor{};
+ fgChar = 'f';
length = 2;
}
- else if (s[pos+1] == 'R') { // reverse
- // TODO: implement reverse formatting
-
+ else if (s[pos+1] == 'R') { // Reverse colors
+ fgChar = (fgChar == 'f' ? 'b' : 'f');
+ quint32 orig = static_cast<quint32>(curfmt.type & 0xffc00000);
+ curfmt.type &= 0x003fffff;
+ curfmt.type |= (orig & 0x00400000) <<1;
+ curfmt.type |= (orig & 0x0f000000) <<4;
+ curfmt.type |= (orig & 0x00800000) >>1;
+ curfmt.type |= (orig & 0xf0000000) >>4;
+ std::swap(curfmt.foreground, curfmt.background);
length = 2;
}
else { // all others are toggles
QString mirc;
mirc.reserve(mirc_.size());
foreach (const QChar &c, mirc_) {
- if ((c < '\x20' || c == '\x7f') && c != '\x03') {
+ if ((c < '\x20' || c == '\x7f') && c != '\x03' && c != '\x04') {
switch (c.unicode()) {
case '\x02':
mirc += "%B";
case '\x09':
mirc += " ";
break;
+ case '\x11':
+ // Monospace not supported yet
+ break;
case '\x12':
case '\x16':
mirc += "%R";
break;
case '\x1d':
+ mirc += "%I";
+ break;
+ case '\x1e':
mirc += "%S";
break;
case '\x1f':
// %Dc- turns color off.
// Note: We use the "mirc standard" as described in <http://www.mirc.co.uk/help/color.txt>.
// This means that we don't accept something like \x03,5 (even though others, like WeeChat, do).
- int pos = 0;
- while (true) {
- pos = mirc.indexOf('\x03', pos);
- if (pos < 0)
- break; // no more mirc color codes
- QString ins, num;
- int l = mirc.length();
- int i = pos + 1;
- // check for fg color
- if (i < l && mirc[i].isDigit()) {
- num = mirc[i++];
- if (i < l && mirc[i].isDigit())
- num.append(mirc[i++]);
- else
- num.prepend('0');
- ins = QString("%Dcf%1").arg(num);
-
- if (i+1 < l && mirc[i] == ',' && mirc[i+1].isDigit()) {
- i++;
+ {
+ int pos = 0;
+ while (true) {
+ pos = mirc.indexOf('\x03', pos);
+ if (pos < 0)
+ break; // no more mirc color codes
+ QString ins, num;
+ int l = mirc.length();
+ int i = pos + 1;
+ // check for fg color
+ if (i < l && mirc[i].isDigit()) {
num = mirc[i++];
if (i < l && mirc[i].isDigit())
num.append(mirc[i++]);
else
num.prepend('0');
- ins += QString("%Dcb%1").arg(num);
+ ins = QString("%Dcf%1").arg(num);
+
+ if (i+1 < l && mirc[i] == ',' && mirc[i+1].isDigit()) {
+ i++;
+ num = mirc[i++];
+ if (i < l && mirc[i].isDigit())
+ num.append(mirc[i++]);
+ else
+ num.prepend('0');
+ ins += QString("%Dcb%1").arg(num);
+ }
+ }
+ else {
+ ins = "%Dc-";
}
+ mirc.replace(pos, i-pos, ins);
}
- else {
- ins = "%Dc-";
+ }
+
+ // Hex colors, as specified in https://modern.ircdocs.horse/formatting.html#hex-color
+ // %Dhf#rrggbb is foreground, %Dhb#rrggbb is background
+ {
+ static const QRegExp rx{"[\\da-fA-F]{6}"};
+ int pos = 0;
+ while (true) {
+ if (pos >= mirc.length())
+ break;
+ pos = mirc.indexOf('\x04', pos);
+ if (pos < 0)
+ break;
+ int i = pos + 1;
+ QString ins;
+ auto num = mirc.mid(i, 6);
+ if (!num.isEmpty() && rx.exactMatch(num)) {
+ ins = "%Dhf#" + num.toLower();
+ i += 6;
+ if (i < mirc.length() && mirc[i] == ',' && !(num = mirc.mid(i + 1, 6)).isEmpty() && rx.exactMatch(num)) {
+ ins += "%Dhb#" + num.toLower();
+ i += 7;
+ }
+ }
+ else {
+ ins = "%Dc-";
+ }
+ mirc.replace(pos, i - pos, ins);
+ pos += ins.length();
}
- mirc.replace(pos, i-pos, ins);
}
+
return mirc;
}
projects / quassel.git / blobdiff