X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=3a8dbc626653e1345fa2c2142fa228a4604e5cfa;hp=797dfbbfbdc9a71071417c70fc77a073b34eb19c;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=902c95728306e5ba115de84800fc8d5d239c9d62 diff --git a/src/common/message.cpp b/src/common/message.cpp index 797dfbbf..3a8dbc62 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Development Team * + * Copyright (C) 2005-07 by the Quassel IRC Team * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -26,11 +26,11 @@ 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, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags) - : _timeStamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) { + : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) { } @@ -62,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 . + // 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; } @@ -87,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()) { @@ -118,29 +149,29 @@ void Message::format() { break; case Message::Nick: s = tr("%Dr<->"); - if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(text()); - else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, text()); + if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); + else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, txt); break; case Message::Mode: s = tr("%Dm***"); if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text()); - else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(text(), nick); + else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(txt, nick); break; case Message::Action: s = tr("%Da-*-"); - t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(text()); + t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(txt); break; default: s = tr("%De%1").arg(sender()); - t = tr("%De[%1]").arg(text()); + t = tr("%De[%1]").arg(txt); } _formattedSender = s; _formattedText = t; } -QString Message::formattedTimeStamp() { +QString Message::formattedTimestamp() { format(); - return _formattedTimeStamp; + return _formattedTimestamp; } QString Message::formattedSender() { @@ -153,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; } @@ -168,7 +207,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg) { 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;