X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=ed5156ce2e7e9ed81f3cee454787216c98e6921e;hp=96e86868cb3880b8e04f9033387930e2925438a8;hb=0cbdf2e324edc5f6ec3cee3842ee6b1830a57e23;hpb=7bd2084db21a5203fe6119d3eb8857aa11c80aa7 diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 96e86868..ed5156ce 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -25,6 +25,8 @@ #include "uisettings.h" #include "util.h" +QHash UiStyle::_formatCodes; + UiStyle::UiStyle() { // register FormatList if that hasn't happened yet // FIXME I don't think this actually avoids double registration... then again... does it hurt? @@ -41,20 +43,6 @@ UiStyle::UiStyle() { _formatCodes["%U"] = Underline; _formatCodes["%R"] = Reverse; - _formatCodes["%D0"] = PlainMsg; - _formatCodes["%Dn"] = NoticeMsg; - _formatCodes["%Ds"] = ServerMsg; - _formatCodes["%De"] = ErrorMsg; - _formatCodes["%Dj"] = JoinMsg; - _formatCodes["%Dp"] = PartMsg; - _formatCodes["%Dq"] = QuitMsg; - _formatCodes["%Dk"] = KickMsg; - _formatCodes["%Dr"] = RenameMsg; - _formatCodes["%Dm"] = ModeMsg; - _formatCodes["%Da"] = ActionMsg; - - _formatCodes["%DT"] = Timestamp; - _formatCodes["%DS"] = Sender; _formatCodes["%DN"] = Nick; _formatCodes["%DH"] = Hostmask; _formatCodes["%DC"] = ChannelName; @@ -85,14 +73,14 @@ void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint32 quint64 key = ftype | ((quint64)label << 32); // start with the most general format and then specialize - fmt.merge(cachedFormat(key & 0x00000000fffffff0)); // basic subelement format - fmt.merge(cachedFormat(key & 0x00000000ffffffff)); // subelement + msgtype - fmt.merge(cachedFormat(key & 0xffff0000fffffff0)); // subelement + nickhash - fmt.merge(cachedFormat(key & 0xffff0000ffffffff)); // subelement + nickhash + msgtype - fmt.merge(cachedFormat(key & 0x0000fffffffffff0)); // label + subelement - fmt.merge(cachedFormat(key & 0x0000ffffffffffff)); // label + subelement + msgtype - fmt.merge(cachedFormat(key & 0xfffffffffffffff0)); // label + subelement + nickhash - fmt.merge(cachedFormat(key & 0xffffffffffffffff)); // label + subelement + nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000fffffff0))); // basic subelement format + fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000ffffffff))); // subelement + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000fffffff0))); // subelement + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000ffffffff))); // subelement + nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000fffffffffff0))); // label + subelement + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xfffffffffffffff0))); // label + subelement + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype } // NOTE: This function is intimately tied to the values in FormatType. Don't change this @@ -105,13 +93,17 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label) { // check if we have exactly this format readily cached already QTextCharFormat fmt = cachedFormat(key); - if(fmt.isValid()) + if(fmt.properties().count()) return fmt; - fmt.merge(cachedFormat(key & 0x0000000000000000)); // basic - fmt.merge(cachedFormat(key & 0x000000000000000f)); // msgtype - fmt.merge(cachedFormat(key & 0x0000ffff00000000)); // label - fmt.merge(cachedFormat(key & 0x0000ffff0000000f)); // label + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000000000000000))); // basic + fmt.merge(cachedFormat(key & Q_UINT64_C(0x000000000000000f))); // msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff000000000000))); // nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff00000000000f))); // nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff00000000))); // label + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff0000000f))); // label + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff00000000))); // label + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff0000000f))); // label + nickhash + msgtype // 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" @@ -149,21 +141,56 @@ QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) { return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font())); } -UiStyle::FormatType UiStyle::formatType(const QString & code) const { +UiStyle::FormatType UiStyle::formatType(Message::Type msgType) { + switch(msgType) { + case Message::Plain: + return PlainMsg; + case Message::Notice: + return NoticeMsg; + case Message::Action: + return ActionMsg; + case Message::Nick: + return NickMsg; + case Message::Mode: + return ModeMsg; + case Message::Join: + return JoinMsg; + case Message::Part: + return PartMsg; + case Message::Quit: + return QuitMsg; + case Message::Kick: + return KickMsg; + case Message::Kill: + return KillMsg; + case Message::Server: + return ServerMsg; + case Message::Info: + return InfoMsg; + case Message::Error: + return ErrorMsg; + case Message::DayChange: + return DayChangeMsg; + } + Q_ASSERT(false); // we need to handle all message types + return ErrorMsg; +} + +UiStyle::FormatType UiStyle::formatType(const QString & code) { if(_formatCodes.contains(code)) return _formatCodes.value(code); return Invalid; } -QString UiStyle::formatCode(FormatType ftype) const { +QString UiStyle::formatCode(FormatType ftype) { return _formatCodes.key(ftype); } -QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength) { +QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) { QList formatRanges; QTextLayout::FormatRange range; int i = 0; for(i = 0; i < formatList.count(); i++) { - range.format = format(formatList.at(i).second); + range.format = format(formatList.at(i).second, messageLabel); range.start = formatList.at(i).first; if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start; formatRanges.append(range); @@ -174,15 +201,15 @@ QList UiStyle::toTextLayoutList(const FormatList &form // This method expects a well-formatted string, there is no error checking! // Since we create those ourselves, we should be pretty safe that nobody does something crappy here. -UiStyle::StyledString UiStyle::styleString(const QString &s_) { +UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat) { QString s = s_; if(s.length() > 65535) { qWarning() << QString("String too long to be styled: %1").arg(s); return StyledString(); } StyledString result; - result.formatList.append(qMakePair((quint16)0, (quint32)None)); - quint32 curfmt = (quint32)None; + result.formatList.append(qMakePair((quint16)0, baseFormat)); + quint32 curfmt = baseFormat; int pos = 0; quint16 length = 0; for(;;) { pos = s.indexOf('%', pos); @@ -237,7 +264,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) { return result; } -QString UiStyle::mircToInternal(const QString &mirc_) const { +QString UiStyle::mircToInternal(const QString &mirc_) { QString mirc = mirc_; mirc.replace('%', "%%"); // escape % just to be sure mirc.replace('\x02', "%B"); @@ -285,59 +312,96 @@ QString UiStyle::mircToInternal(const QString &mirc_) const { UiStyle::StyledMessage::StyledMessage(const Message &msg) : Message(msg) { + if(type() == Message::Plain) + _senderHash = 0xff; + else + _senderHash = 0x00; // this means we never compute the hash for msgs that aren't plain } -void UiStyle::StyledMessage::style(UiStyle *style) const { +void UiStyle::StyledMessage::style() const { QString user = userFromMask(sender()); QString host = hostFromMask(sender()); QString nick = nickFromMask(sender()); - QString txt = style->mircToInternal(contents()); + QString txt = UiStyle::mircToInternal(contents()); QString bufferName = bufferInfo().bufferName(); bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_- QString t; switch(type()) { case Message::Plain: - t = tr("%D0%1").arg(txt); break; + //: Plain Message + t = tr("%1").arg(txt); break; case Message::Notice: - t = tr("%Dn%1").arg(txt); break; - case Message::Topic: - case Message::Server: - t = tr("%Ds%1").arg(txt); break; - case Message::Error: - t = tr("%De%1").arg(txt); break; + //: Notice Message + t = tr("%1").arg(txt); break; + case Message::Action: + //: Action Message + t = tr("%DN%1%DN %2").arg(nick).arg(txt); + break; + case Message::Nick: + //: Nick Message + if(nick == contents()) t = tr("You are now known as %DN%1%DN").arg(txt); + else t = tr("%DN%1%DN is now known as %DN%2%DN").arg(nick, txt); + break; + case Message::Mode: + //: Mode Message + if(nick.isEmpty()) t = tr("User mode: %DM%1%DM").arg(txt); + else t = tr("Mode %DM%1%DM by %DN%2%DN").arg(txt, nick); + break; case Message::Join: - t = tr("%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; + //: Join Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; case Message::Part: - t = tr("%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); + //: Part Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; case Message::Quit: - t = tr("%Dq%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); + //: Quit Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; case Message::Kick: { QString victim = txt.section(" ", 0, 0); QString kickmsg = txt.section(" ", 1); - t = tr("%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName); + //: Kick Message + t = tr("%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName); if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg); } break; - case Message::Nick: - if(nick == contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); - else t = tr("%Dr%DN%1%DN is now known as %DN%2%DN").arg(nick, txt); - break; - case Message::Mode: - if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(txt); - else t = tr("%DmMode %DM%1%DM by %DN%2%DN").arg(txt, nick); - break; - case Message::Action: - t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt); + //case Message::Kill: FIXME + + case Message::Server: + //: Server Message + t = tr("%1").arg(txt); break; + case Message::Info: + //: Info Message + t = tr("%1").arg(txt); break; + case Message::Error: + //: Error Message + t = tr("%1").arg(txt); break; + case Message::DayChange: + //: Day Change Message + t = tr("{Day changed to %1}").arg(timestamp().toString()); break; default: - t = tr("%De[%1]").arg(txt); + t = tr("[%1]").arg(txt); } - _contents = style->styleString(t); + _contents = UiStyle::styleString(t, UiStyle::formatType(type())); +} + +const QString &UiStyle::StyledMessage::plainContents() const { + if(_contents.plainText.isNull()) + style(); + + return _contents.plainText; +} + +const UiStyle::FormatList &UiStyle::StyledMessage::contentsFormatList() const { + if(_contents.plainText.isNull()) + style(); + + return _contents.formatList; } QString UiStyle::StyledMessage::decoratedTimestamp() const { @@ -360,11 +424,20 @@ QString UiStyle::StyledMessage::decoratedSender() const { return tr("<%1>").arg(plainSender()); break; case Message::Notice: return tr("[%1]").arg(plainSender()); break; +<<<<<<< HEAD case Message::Topic: case Message::Server: return tr("*"); break; case Message::Error: return tr("*"); break; +======= + case Message::Action: + return tr("-*-"); break; + case Message::Nick: + return tr("<->"); break; + case Message::Mode: + return tr("***"); break; +>>>>>>> Handle all message types properly in UiStyle; eliminate msgtype format codes case Message::Join: return tr("-->"); break; case Message::Part: @@ -373,12 +446,16 @@ QString UiStyle::StyledMessage::decoratedSender() const { return tr("<--"); break; case Message::Kick: return tr("<-*"); break; - case Message::Nick: - return tr("<->"); break; - case Message::Mode: - return tr("***"); break; - case Message::Action: - return tr("-*-"); break; + case Message::Kill: + return tr("<-x"); break; + case Message::Server: + return tr("*"); break; + case Message::Info: + return tr("*"); break; + case Message::Error: + return tr("*"); break; + case Message::DayChange: + return tr("-"); break; default: return tr("%1").arg(plainSender()); } @@ -418,7 +495,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { case Message::Kick: return UiStyle::KickMsg; break; case Message::Nick: - return UiStyle::RenameMsg; break; + return UiStyle::NickMsg; break; case Message::Mode: return UiStyle::ModeMsg; break; case Message::Action: @@ -428,6 +505,21 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { } } +// FIXME hardcoded to 16 sender hashes +quint8 UiStyle::StyledMessage::senderHash() const { + if(_senderHash != 0xff) + return _senderHash; + + QString nick = nickFromMask(sender()).toLower(); + if(!nick.isEmpty()) { + int chopCount = 0; + while(nick.at(nick.count() - 1 - chopCount) == '_') + chopCount++; + nick.chop(chopCount); + } + quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size()); + return (_senderHash = (hash & 0xf) + 1); +} /***********************************************************************************/ @@ -466,5 +558,4 @@ void UiStyle::loadStyleSheet() { qDeleteAll(_metricsCache); _metricsCache.clear(); _formatCache = parser.formats(); - }