X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=9ebc126498709cacfc929e6bf7335f7f201b4734;hp=480c1b55ed761c94ce5f799135a3ce51d9fdc74b;hb=3dd76d9373fb46b7be3f7f963b3d3a38ded63ae5;hpb=04315f46a16fc3627218377071e008b6b9744992 diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp index 480c1b55..9ebc1264 100644 --- a/src/qtui/chatlinemodelitem.cpp +++ b/src/qtui/chatlinemodelitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,59 +18,68 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "chatlinemodelitem.h" + #include #include -#include "chatlinemodelitem.h" #include "chatlinemodel.h" #include "qtui.h" #include "qtuistyle.h" // This Struct is taken from Harfbuzz. We use it only to calc it's size. // we use a shared memory region so we do not have to malloc a buffer area for every line -typedef struct { - /*HB_LineBreakType*/ unsigned lineBreakType : 2; - /*HB_Bool*/ unsigned whiteSpace : 1; /* A unicode whitespace character, except NBSP, ZWNBSP */ - /*HB_Bool*/ unsigned charStop : 1; /* Valid cursor position (for left/right arrow) */ - /*HB_Bool*/ unsigned wordBoundary : 1; - /*HB_Bool*/ unsigned sentenceBoundary : 1; - unsigned unused : 2; -} HB_CharAttributes_Dummy; - -unsigned char *ChatLineModelItem::TextBoundaryFinderBuffer = (unsigned char *)malloc(512 * sizeof(HB_CharAttributes_Dummy)); +using HB_CharAttributes_Dummy = struct +{ + /*HB_LineBreakType*/ unsigned lineBreakType : 2; + /*HB_Bool*/ unsigned whiteSpace : 1; /* A unicode whitespace character, except NBSP, ZWNBSP */ + /*HB_Bool*/ unsigned charStop : 1; /* Valid cursor position (for left/right arrow) */ + /*HB_Bool*/ unsigned wordBoundary : 1; + /*HB_Bool*/ unsigned sentenceBoundary : 1; + unsigned unused : 2; +}; + +unsigned char* ChatLineModelItem::TextBoundaryFinderBuffer = (unsigned char*)malloc(512 * sizeof(HB_CharAttributes_Dummy)); int ChatLineModelItem::TextBoundaryFinderBufferSize = 512 * (sizeof(HB_CharAttributes_Dummy) / sizeof(unsigned char)); // **************************************** // the actual ChatLineModelItem // **************************************** -ChatLineModelItem::ChatLineModelItem(const Message &msg) - : MessageModelItem(), - _styledMsg(msg) +ChatLineModelItem::ChatLineModelItem(const Message& msg) + : MessageModelItem() + , _styledMsg(msg) { if (!msg.sender().contains('!')) _styledMsg.setFlags(msg.flags() |= Message::ServerMsg); -} + if (_styledMsg.type() == Message::Nick) { + // HACK: Work around nick changes on Quassel core not properly being set as Self + // While this is fixed in the core, old cores and past history will still show incorrectly. + if (nickFromMask(_styledMsg.sender()) == stripFormatCodes(_styledMsg.contents()).toLower()) { + _styledMsg.setFlags(msg.flags() |= Message::Self); + } + } + // Unfortunately, the missing Self flag for other message types can't easily be worked around. +} -bool ChatLineModelItem::setData(int column, const QVariant &value, int role) +bool ChatLineModelItem::setData(int column, const QVariant& value, int role) { switch (role) { case MessageModel::FlagsRole: - _styledMsg.setFlags((Message::Flags)value.toUInt()); + _styledMsg.setFlags((Message::Flags)value.toInt()); return true; default: return MessageModelItem::setData(column, value, role); } } - QVariant ChatLineModelItem::data(int column, int role) const { if (role == ChatLineModel::MsgLabelRole) - return messageLabel(); + return QVariant::fromValue(messageLabel()); QVariant variant; - MessageModel::ColumnType col = (MessageModel::ColumnType)column; + auto col = (MessageModel::ColumnType)column; switch (col) { case ChatLineModel::TimestampColumn: variant = timestampData(role); @@ -89,7 +98,6 @@ QVariant ChatLineModelItem::data(int column, int role) const return variant; } - QVariant ChatLineModelItem::timestampData(int role) const { switch (role) { @@ -98,17 +106,16 @@ QVariant ChatLineModelItem::timestampData(int role) const case ChatLineModel::EditRole: return _styledMsg.timestamp(); case ChatLineModel::BackgroundRole: - return backgroundBrush(UiStyle::Timestamp); + return backgroundBrush(UiStyle::FormatType::Timestamp); case ChatLineModel::SelectedBackgroundRole: - return backgroundBrush(UiStyle::Timestamp, true); + return backgroundBrush(UiStyle::FormatType::Timestamp, true); case ChatLineModel::FormatRole: - return QVariant::fromValue(UiStyle::FormatList() - << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Timestamp)); + return QVariant::fromValue( + {std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Timestamp, {}, {}})}); } return QVariant(); } - QVariant ChatLineModelItem::senderData(int role) const { switch (role) { @@ -117,17 +124,16 @@ QVariant ChatLineModelItem::senderData(int role) const case ChatLineModel::EditRole: return _styledMsg.plainSender(); case ChatLineModel::BackgroundRole: - return backgroundBrush(UiStyle::Sender); + return backgroundBrush(UiStyle::FormatType::Sender); case ChatLineModel::SelectedBackgroundRole: - return backgroundBrush(UiStyle::Sender, true); + return backgroundBrush(UiStyle::FormatType::Sender, true); case ChatLineModel::FormatRole: - return QVariant::fromValue(UiStyle::FormatList() - << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Sender)); + return QVariant::fromValue( + {std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Sender, {}, {}})}); } return QVariant(); } - QVariant ChatLineModelItem::contentsData(int role) const { switch (role) { @@ -135,9 +141,9 @@ QVariant ChatLineModelItem::contentsData(int role) const case ChatLineModel::EditRole: return _styledMsg.plainContents(); case ChatLineModel::BackgroundRole: - return backgroundBrush(UiStyle::Contents); + return backgroundBrush(UiStyle::FormatType::Contents); case ChatLineModel::SelectedBackgroundRole: - return backgroundBrush(UiStyle::Contents, true); + return backgroundBrush(UiStyle::FormatType::Contents, true); case ChatLineModel::FormatRole: return QVariant::fromValue(_styledMsg.contentsFormatList()); case ChatLineModel::WrapListRole: @@ -148,27 +154,27 @@ QVariant ChatLineModelItem::contentsData(int role) const return QVariant(); } - -quint32 ChatLineModelItem::messageLabel() const +UiStyle::MessageLabel ChatLineModelItem::messageLabel() const { - quint32 label = _styledMsg.senderHash() << 16; + using MessageLabel = UiStyle::MessageLabel; + + auto label = static_cast(_styledMsg.senderHash() << 16); if (_styledMsg.flags() & Message::Self) - label |= UiStyle::OwnMsg; + label |= MessageLabel::OwnMsg; if (_styledMsg.flags() & Message::Highlight) - label |= UiStyle::Highlight; + label |= MessageLabel::Highlight; return label; } - QVariant ChatLineModelItem::backgroundBrush(UiStyle::FormatType subelement, bool selected) const { - QTextCharFormat fmt = QtUi::style()->format(UiStyle::formatType(_styledMsg.type()) | subelement, messageLabel() | (selected ? UiStyle::Selected : 0)); + QTextCharFormat fmt = QtUi::style()->format({UiStyle::formatType(_styledMsg.type()) | subelement, {}, {}}, + messageLabel() | (selected ? UiStyle::MessageLabel::Selected : UiStyle::MessageLabel::None)); if (fmt.hasProperty(QTextFormat::BackgroundBrush)) return QVariant::fromValue(fmt.background()); return QVariant(); } - void ChatLineModelItem::computeWrapList() const { QString text = _styledMsg.plainContents(); @@ -176,9 +182,12 @@ void ChatLineModelItem::computeWrapList() const if (!length) return; - QList wplist; // use a temp list which we'll later copy into a QVector for efficiency - QTextBoundaryFinder finder(QTextBoundaryFinder::Line, _styledMsg.plainContents().unicode(), length, - TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize); + QList wplist; // use a temp list which we'll later copy into a QVector for efficiency + QTextBoundaryFinder finder(QTextBoundaryFinder::Line, + _styledMsg.plainContents().unicode(), + length, + TextBoundaryFinderBuffer, + TextBoundaryFinderBufferSize); int idx; int oldidx = 0; @@ -191,7 +200,7 @@ void ChatLineModelItem::computeWrapList() const option.setWrapMode(QTextOption::NoWrap); layout.setTextOption(option); - layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_styledMsg.contentsFormatList(), length, messageLabel())); + UiStyle::setTextLayoutFormats(layout, QtUi::style()->toTextLayoutList(_styledMsg.contentsFormatList(), length, messageLabel())); layout.beginLayout(); QTextLine line = layout.createLine(); line.setNumColumns(length); @@ -224,7 +233,7 @@ void ChatLineModelItem::computeWrapList() const word.start = oldidx; int wordend = idx; for (; wordend > word.start; wordend--) { - if (!text.at(wordend-1).isSpace()) + if (!text.at(wordend - 1).isSpace()) break; }