X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=cbae7e68c47f8e78ecc8e91ea91fe0643c6c217e;hp=0e9a93a015cea465495fb8863de5e0b5ecf055c7;hb=670e7d401aae1196c0a24c59f96d267a8eb9d1bb;hpb=d59ac6d2c7ac587d6cc3a36b627ddd1fd03f47d6 diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 0e9a93a0..cbae7e68 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,13 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include #include -#include #include "buffersettings.h" +#include "icon.h" #include "qssparser.h" #include "quassel.h" #include "uistyle.h" @@ -35,7 +36,7 @@ QHash UiStyle::_formatCodes; bool UiStyle::_useCustomTimestampFormat; /// If true, use the custom timestamp format QString UiStyle::_timestampFormatString; /// Timestamp format QString UiStyle::_systemTimestampFormatString; /// Cached copy of system locale timestamp format -bool UiStyle::_showSenderPrefixes; /// If true, show prefixmodes before sender names +UiStyle::SenderPrefixMode UiStyle::_senderPrefixDisplay; /// Display of prefix modes before sender bool UiStyle::_showSenderBrackets; /// If true, show brackets around sender names namespace { @@ -61,16 +62,16 @@ QColor extendedMircColor(int number) } UiStyle::UiStyle(QObject *parent) - : QObject(parent), - _channelJoinedIcon(QIcon::fromTheme("irc-channel-joined", QIcon(":/icons/irc-channel-joined.png"))), - _channelPartedIcon(QIcon::fromTheme("irc-channel-parted", QIcon(":/icons/irc-channel-parted.png"))), - _userOfflineIcon(QIcon::fromTheme("im-user-offline", QIcon::fromTheme("user-offline", QIcon(":/icons/im-user-offline.png")))), - _userOnlineIcon(QIcon::fromTheme("im-user", QIcon::fromTheme("user-available", QIcon(":/icons/im-user.png")))), // im-user-* are non-standard oxygen extensions - _userAwayIcon(QIcon::fromTheme("im-user-away", QIcon::fromTheme("user-away", QIcon(":/icons/im-user-away.png")))), - _categoryOpIcon(QIcon::fromTheme("irc-operator")), - _categoryVoiceIcon(QIcon::fromTheme("irc-voice")), - _opIconLimit(UserCategoryItem::categoryFromModes("o")), - _voiceIconLimit(UserCategoryItem::categoryFromModes("v")) + : QObject(parent) + , _channelJoinedIcon{icon::get("irc-channel-active")} + , _channelPartedIcon{icon::get("irc-channel-inactive")} + , _userOfflineIcon{icon::get({"im-user-offline", "user-offline"})} + , _userOnlineIcon{icon::get({"im-user-online", "im-user", "user-available"})} + , _userAwayIcon{icon::get({"im-user-away", "user-away"})} + , _categoryOpIcon{icon::get("irc-operator")} + , _categoryVoiceIcon{icon::get("irc-voice")} + , _opIconLimit{UserCategoryItem::categoryFromModes("o")} + , _voiceIconLimit{UserCategoryItem::categoryFromModes("v")} { static bool registered = []() { qRegisterMetaType(); @@ -84,9 +85,9 @@ UiStyle::UiStyle(QObject *parent) // 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; @@ -99,8 +100,8 @@ UiStyle::UiStyle(QObject *parent) // in there. setUseCustomTimestampFormat(false); setTimestampFormatString(" hh:mm:ss"); - enableSenderPrefixes(false); - enableSenderBrackets(true); + setSenderPrefixDisplay(UiStyle::SenderPrefixMode::HighestMode); + enableSenderBrackets(false); // BufferView / NickView settings UiStyleSettings s; @@ -250,10 +251,10 @@ void UiStyle::setTimestampFormatString(const QString &format) } } -void UiStyle::enableSenderPrefixes(bool enabled) +void UiStyle::setSenderPrefixDisplay(UiStyle::SenderPrefixMode mode) { - if (_showSenderPrefixes != enabled) { - _showSenderPrefixes = enabled; + if (_senderPrefixDisplay != mode) { + _senderPrefixDisplay = mode; } } @@ -417,7 +418,7 @@ QVariant UiStyle::itemData(int role, const QTextCharFormat &format) const /******** Caching *******/ -QTextCharFormat UiStyle::format(quint64 key) const +QTextCharFormat UiStyle::parsedFormat(quint64 key) const { return _formats.value(key, QTextCharFormat()); } @@ -472,11 +473,22 @@ QTextCharFormat UiStyle::format(const Format &format, MessageLabel label) const 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(MessageLabel::Selected); mask <<= 1) { + for (quint32 mask = 0x00000001; mask <= static_cast(MessageLabel::Last); mask <<= 1) { if (static_cast(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(MessageLabel::Last); mask <<= 1) { + if (static_cast(label) & mask) { + mergeColors(charFormat, format, label & mask); + } } } @@ -492,34 +504,12 @@ void UiStyle::mergeFormat(QTextCharFormat &charFormat, const Format &format, Mes // 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(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(0x000000ff)), label); } @@ -527,10 +517,32 @@ void UiStyle::mergeFormat(QTextCharFormat &charFormat, const Format &format, Mes 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(FormatProperty::AllowForegroundOverride)).toBool(); + bool allowBg = charFormat.property(static_cast(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(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); } @@ -628,6 +640,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFor } Format curfmt{baseFormat, {}, {}}; + QChar fgChar{'f'}; // character to indicate foreground color, changed when reversing int pos = 0; quint16 length = 0; for (;;) { @@ -649,7 +662,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFor 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; @@ -677,7 +690,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFor } else if (s[pos+1] == 'D' && s[pos+2] == 'h') { // Hex color QColor color{s.mid(pos+4, 7)}; - if (s[pos+3] == 'f') { + if (s[pos+3] == fgChar) { curfmt.type &= 0xf0bfffff; // mask out mIRC foreground color curfmt.foreground = std::move(color); } @@ -691,11 +704,18 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, FormatType baseFor 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(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 @@ -737,11 +757,17 @@ QString UiStyle::mircToInternal(const QString &mirc_) 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': @@ -1032,8 +1058,18 @@ QString UiStyle::StyledMessage::plainSender() const QString UiStyle::StyledMessage::decoratedSender() const { QString _senderPrefixes; - if (_showSenderPrefixes) { + switch (_senderPrefixDisplay) { + case UiStyle::SenderPrefixMode::AllModes: + // Show every available mode _senderPrefixes = senderPrefixes(); + break; + case UiStyle::SenderPrefixMode::HighestMode: + // Show the highest available mode (left-most) + _senderPrefixes = senderPrefixes().left(1); + break; + case UiStyle::SenderPrefixMode::NoModes: + // Don't show any mode (already empty by default) + break; } switch (type()) {