Make sender-hash based styling ("colored nicks") work again

[quassel.git] / src / uisupport / uistyle.cpp

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 7cae8b3..b5e8911 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -25,6 +25,8 @@
 #include "uisettings.h"
 #include "util.h"
 
+QHash<QString, UiStyle::FormatType> 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?
@@ -96,8 +98,12 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label) {
 
   fmt.merge(cachedFormat(key & 0x0000000000000000));  // basic
   fmt.merge(cachedFormat(key & 0x000000000000000f));  // msgtype
+  fmt.merge(cachedFormat(key & 0xffff000000000000));  // nickhash
+  fmt.merge(cachedFormat(key & 0xffff00000000000f));  // nickhash + msgtype
   fmt.merge(cachedFormat(key & 0x0000ffff00000000));  // label
   fmt.merge(cachedFormat(key & 0x0000ffff0000000f));  // label + msgtype
+  fmt.merge(cachedFormat(key & 0xffffffff00000000));  // label + nickhash
+  fmt.merge(cachedFormat(key & 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"
@@ -135,7 +141,7 @@ QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
   return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font()));
 }
 
-UiStyle::FormatType UiStyle::formatType(Message::Type msgType) const {
+UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
   switch(msgType) {
     case Message::Plain:
       return PlainMsg;
@@ -170,21 +176,21 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) const {
   return ErrorMsg;
 }
 
-UiStyle::FormatType UiStyle::formatType(const QString & code) const {
+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<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength) {
+QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) {
   QList<QTextLayout::FormatRange> 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);
@@ -202,7 +208,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat
     return StyledString();
   }
   StyledString result;
-  result.formatList.append(qMakePair((quint16)0, (quint32)None));
+  result.formatList.append(qMakePair((quint16)0, baseFormat));
   quint32 curfmt = baseFormat;
   int pos = 0; quint16 length = 0;
   for(;;) {
@@ -258,7 +264,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat
   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");
@@ -306,13 +312,17 @@ 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... -_-
 
@@ -377,7 +387,21 @@ void UiStyle::StyledMessage::style(UiStyle *style) const {
     default:
       t = tr("[%1]").arg(txt);
   }
-  _contents = style->styleString(t, style->formatType(type()));
+  _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 {
@@ -481,6 +505,22 @@ 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);
+}
+
 /***********************************************************************************/
 
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) {