X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=fc4dfccbeaa470467be30c277092cb201c46aacb;hp=c4c9bf1326a650a894bc586987954f8b482f0210;hb=1cad7d10240a398c11af0043720d675e631f016f;hpb=6d021114c9dbcccbfe5e7c485c8e705404f35123

diff --git a/src/common/message.cpp b/src/common/message.cpp
index c4c9bf13..fc4dfccb 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -19,16 +19,18 @@
  ***************************************************************************/
 
 #include "message.h"
+
 #include "util.h"
+
 #include <QDataStream>
 
-Message::Message(BufferId __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
+Message::Message(BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
   : _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
-  _timeStamp = QDateTime::currentDateTime().toUTC();
+  _timestamp = QDateTime::currentDateTime().toUTC();
 }
 
-Message::Message(QDateTime __ts, BufferId __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _timeStamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
+Message::Message(QDateTime __ts, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
+  : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
 
 }
 
@@ -40,7 +42,7 @@ void Message::setMsgId(MsgId _id) {
   _msgId = _id;
 }
 
-BufferId Message::buffer() const {
+BufferInfo Message::buffer() const {
   return _buffer;
 }
 
@@ -60,19 +62,50 @@ quint8 Message::flags() const {
    return _flags;
 }
 
-QDateTime Message::timeStamp() const {
-  return _timeStamp;
+QDateTime Message::timestamp() const {
+  return _timestamp;
 }
 
 QString Message::mircToInternal(QString mirc) {
   mirc.replace('%', "%%");      // escape % just to be sure
   mirc.replace('\x02', "%B");
-  mirc.replace('\x03', "%C");
   mirc.replace('\x0f', "%O");
   mirc.replace('\x12', "%R");
   mirc.replace('\x16', "%R");
   mirc.replace('\x1d', "%S");
   mirc.replace('\x1f', "%U");
+
+  // Now we bring the color codes (\x03) in a sane format that can be parsed more easily later.
+  // %Dcfxx is foreground, %Dcbxx is background color, where xx is a 2 digit dec number denoting the color code.
+  // %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;
+  for(;;) {
+    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++;
+        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);
+  }
   return mirc;
 }
 
@@ -85,7 +118,7 @@ void Message::format() {
   QString networkName = buffer().network();
   QString bufferName = buffer().buffer();
 
-  _formattedTimeStamp = tr("%DT[%1]").arg(timeStamp().toLocalTime().toString("hh:mm:ss"));
+  _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 
   QString s, t;
   switch(type()) {
@@ -136,9 +169,9 @@ void Message::format() {
   _formattedText = t;
 }
 
-QString Message::formattedTimeStamp() {
+QString Message::formattedTimestamp() {
   format();
-  return _formattedTimeStamp;
+  return _formattedTimestamp;
 }
 
 QString Message::formattedSender() {
@@ -151,8 +184,16 @@ QString Message::formattedText() {
   return _formattedText;
 }
 
+/*
+QString Message::formattedToHtml(const QString &f) {
+
+
+  return f;
+}
+*/
+
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  out << (quint32)msg.timeStamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
+  out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
       << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
   return out;
 }
@@ -161,12 +202,12 @@ QDataStream &operator>>(QDataStream &in, Message &msg) {
   quint8 t, f;
   quint32 ts;
   QByteArray s, m;
-  BufferId buf;
+  BufferInfo buf;
   in >> ts >> t >> f >> buf >> s >> m;
   msg._type = (Message::Type)t;
   msg._flags = (quint8)f;
   msg._buffer = buf;
-  msg._timeStamp = QDateTime::fromTime_t(ts);
+  msg._timestamp = QDateTime::fromTime_t(ts);
   msg._sender = QString::fromUtf8(s);
   msg._text = QString::fromUtf8(m);
   return in;