X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=993a76f5cdcee82e2c86259bff63e60ce3c65d9c;hp=1e12cd1a106f2d67ef08cd9a803a5b67a504dc03;hb=94f1513df11401c44e79278c838a0708bcd83823;hpb=e5f3a784b8c6e6b4fe9b299c3a3553f31fba5601 diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp index 1e12cd1a..993a76f5 100644 --- a/src/qtui/chatlinemodelitem.cpp +++ b/src/qtui/chatlinemodelitem.cpp @@ -39,80 +39,83 @@ typedef struct { // PRIVATE DATA FOR CHATLINE MODEL ITEM class ChatLineModelItemPrivate { - struct ChatLinePart { - QString plainText; - UiStyle::FormatList formatList; - inline ChatLinePart(const QString &pT, const UiStyle::FormatList &fL) : plainText(pT), formatList(fL) {} - }; public: - inline ChatLineModelItemPrivate(const Message &msg) : _msgBuffer(new Message(msg)), timestamp(0), sender(0), contents(0) {} - inline ~ChatLineModelItemPrivate() { + inline ChatLineModelItemPrivate(const Message &msg) : _msgBuffer(new Message(msg)), _styledMsg(0) {} + ~ChatLineModelItemPrivate() { if(_msgBuffer) { delete _msgBuffer; } else { - delete timestamp; - delete sender; - delete contents; + delete _styledMsg; } } inline bool needsStyling() { return (bool)_msgBuffer; } - inline ChatLinePart *partByColumn(MessageModel::ColumnType column) { - switch(column) { - case ChatLineModel::TimestampColumn: - return timestamp; - case ChatLineModel::SenderColumn: - return sender; - case ChatLineModel::ContentsColumn: - return contents; - default: - Q_ASSERT(false); - return 0; - } - } - - inline const QString &plainText(MessageModel::ColumnType column) { + QVariant data(MessageModel::ColumnType column, int role) { if(needsStyling()) style(); - return partByColumn(column)->plainText; - } - - inline const UiStyle::FormatList &formatList(MessageModel::ColumnType column) { - if(needsStyling()) - style(); - return partByColumn(column)->formatList; - } - - inline const ChatLineModel::WrapList &wrapList() { - if(needsStyling()) - style(); - if(_wrapList.isEmpty()) - computeWrapList(); - return _wrapList; + switch(column) { + case ChatLineModel::TimestampColumn: + switch(role) { + case ChatLineModel::DisplayRole: + return _styledMsg->decoratedTimestamp(); + case ChatLineModel::EditRole: + return _styledMsg->timestamp(); + case ChatLineModel::FormatRole: + return QVariant::fromValue(UiStyle::FormatList() + << qMakePair((quint16)0, (quint32)_styledMsg->timestampFormat())); + } + break; + case ChatLineModel::SenderColumn: + switch(role) { + case ChatLineModel::DisplayRole: + return _styledMsg->decoratedSender(); + case ChatLineModel::EditRole: + return _styledMsg->sender(); + case ChatLineModel::FormatRole: + return QVariant::fromValue(UiStyle::FormatList() + << qMakePair((quint16)0, (quint32)_styledMsg->senderFormat())); + } + break; + case ChatLineModel::ContentsColumn: + switch(role) { + case ChatLineModel::DisplayRole: + case ChatLineModel::EditRole: + return _styledMsg->contents(); + case ChatLineModel::FormatRole: + return QVariant::fromValue(_styledMsg->contentsFormatList()); + case ChatLineModel::WrapListRole: + if(_wrapList.isEmpty()) + computeWrapList(); + return QVariant::fromValue(_wrapList); + } + break; + default: + Q_ASSERT(false); + return 0; + } + return QVariant(); } private: - inline void style() { - QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(*_msgBuffer); - - timestamp = new ChatLinePart(m.timestamp.plainText, m.timestamp.formatList); - sender = new ChatLinePart(m.sender.plainText, m.sender.formatList); - contents = new ChatLinePart(m.contents.plainText, m.contents.formatList); + void style() { + _styledMsg = new QtUiStyle::StyledMessage(QtUi::style()->styleMessage(*_msgBuffer)); delete _msgBuffer; _msgBuffer = 0; } - inline void computeWrapList() { - if(contents->plainText.isEmpty()) + void computeWrapList() { + int length = _styledMsg->contents().length(); + if(!length) return; enum Mode { SearchStart, SearchEnd }; QList wplist; // use a temp list which we'll later copy into a QVector for efficiency - QTextBoundaryFinder finder(QTextBoundaryFinder::Word, contents->plainText.unicode(), contents->plainText.length(), TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize); + QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _styledMsg->contents().unicode(), length, + TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize); int idx; int oldidx = 0; @@ -123,36 +126,36 @@ private: word.start = 0; qreal wordstartx = 0; - QTextLayout layout(contents->plainText); + QTextLayout layout(_styledMsg->contents()); QTextOption option; option.setWrapMode(QTextOption::NoWrap); layout.setTextOption(option); - layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(contents->formatList, contents->plainText.length())); + layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_styledMsg->contentsFormatList(), length)); layout.beginLayout(); QTextLine line = layout.createLine(); - line.setNumColumns(contents->plainText.length()); + line.setNumColumns(length); layout.endLayout(); do { idx = finder.toNextBoundary(); if(idx < 0) { - idx = contents->plainText.length(); - wordStart = false; - wordEnd = false; - mode = SearchStart; + idx = length; + wordStart = false; + wordEnd = false; + mode = SearchStart; } else { - wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord); - wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord); + wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord); + wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord); } //if(flg) qDebug() << idx << mode << wordStart << wordEnd << contents->plainText.left(idx) << contents->plainText.mid(idx); if(mode == SearchEnd || (!wordStart && wordEnd)) { - if(wordStart || !wordEnd) continue; - oldidx = idx; - mode = SearchStart; - continue; + if(wordStart || !wordEnd) continue; + oldidx = idx; + mode = SearchStart; + continue; } qreal wordendx = line.cursorToX(oldidx); qreal trailingendx = line.cursorToX(idx); @@ -163,12 +166,12 @@ private: wplist.append(word); if(wordStart) { - word.start = idx; - mode = SearchEnd; + word.start = idx; + mode = SearchEnd; } // the part " || (finder.position() == contents->plainText.length())" shouldn't be necessary // but in rare and indeterministic cases Qt states that the end of the text is not a boundary o_O - } while(finder.isAtBoundary() || (finder.position() == contents->plainText.length())); + } while(finder.isAtBoundary() || (finder.position() == length)); // A QVector needs less space than a QList _wrapList.resize(wplist.count()); @@ -179,7 +182,7 @@ private: ChatLineModel::WrapList _wrapList; Message *_msgBuffer; - ChatLinePart *timestamp, *sender, *contents; + UiStyle::StyledMessage *_styledMsg; static unsigned char *TextBoundaryFinderBuffer; static int TextBoundaryFinderBufferSize; @@ -203,20 +206,7 @@ ChatLineModelItem::~ChatLineModelItem() { } QVariant ChatLineModelItem::data(int column, int role) const { - if(column < ChatLineModel::TimestampColumn || column > ChatLineModel::ContentsColumn) - return MessageModelItem::data(column, role); - MessageModel::ColumnType columnType = (MessageModel::ColumnType)column; - - switch(role) { - case ChatLineModel::DisplayRole: - return _data->plainText(columnType); - case ChatLineModel::FormatRole: - return QVariant::fromValue(_data->formatList(columnType)); - case ChatLineModel::WrapListRole: - if(columnType != ChatLineModel::ContentsColumn) - return QVariant(); - return QVariant::fromValue(_data->wrapList()); - } - return MessageModelItem::data(column, role); + QVariant d = _data->data((MessageModel::ColumnType)column, role); + if(!d.isValid()) return MessageModelItem::data(column, role); + return d; } -