X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=550123f1d399bac086d3e72b1fc158d6b1bd2c72;hp=145185858a94f0fc97457a6c5154b3f66af7abbc;hb=HEAD;hpb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp index 14518585..6aad48a4 100644 --- a/src/qtui/chatlinemodelitem.cpp +++ b/src/qtui/chatlinemodelitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,34 +18,36 @@ * 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 -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; +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)); +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); @@ -60,8 +62,7 @@ ChatLineModelItem::ChatLineModelItem(const Message &msg) // 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: @@ -72,11 +73,10 @@ bool ChatLineModelItem::setData(int column, const QVariant &value, int role) } } - QVariant ChatLineModelItem::data(int column, int role) const { if (role == ChatLineModel::MsgLabelRole) - return QVariant::fromValue(messageLabel()); + return QVariant::fromValue(messageLabel()); QVariant variant; auto col = (MessageModel::ColumnType)column; @@ -98,7 +98,6 @@ QVariant ChatLineModelItem::data(int column, int role) const return variant; } - QVariant ChatLineModelItem::timestampData(int role) const { switch (role) { @@ -111,12 +110,12 @@ QVariant ChatLineModelItem::timestampData(int role) const case ChatLineModel::SelectedBackgroundRole: return backgroundBrush(UiStyle::FormatType::Timestamp, true); case ChatLineModel::FormatRole: - return QVariant::fromValue({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Timestamp, {}, {}})}); + return QVariant::fromValue(UiStyle::FormatList{ + std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Timestamp, {}, {}})}); } return QVariant(); } - QVariant ChatLineModelItem::senderData(int role) const { switch (role) { @@ -129,12 +128,12 @@ QVariant ChatLineModelItem::senderData(int role) const case ChatLineModel::SelectedBackgroundRole: return backgroundBrush(UiStyle::FormatType::Sender, true); case ChatLineModel::FormatRole: - return QVariant::fromValue({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Sender, {}, {}})}); + return QVariant::fromValue(UiStyle::FormatList{ + std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Sender, {}, {}})}); } return QVariant(); } - QVariant ChatLineModelItem::contentsData(int role) const { switch (role) { @@ -146,16 +145,15 @@ QVariant ChatLineModelItem::contentsData(int role) const case ChatLineModel::SelectedBackgroundRole: return backgroundBrush(UiStyle::FormatType::Contents, true); case ChatLineModel::FormatRole: - return QVariant::fromValue(_styledMsg.contentsFormatList()); + return QVariant::fromValue(_styledMsg.contentsFormatList()); case ChatLineModel::WrapListRole: if (_wrapList.isEmpty()) computeWrapList(); - return QVariant::fromValue(_wrapList); + return QVariant::fromValue(_wrapList); } return QVariant(); } - UiStyle::MessageLabel ChatLineModelItem::messageLabel() const { using MessageLabel = UiStyle::MessageLabel; @@ -168,17 +166,15 @@ UiStyle::MessageLabel ChatLineModelItem::messageLabel() const return label; } - QVariant ChatLineModelItem::backgroundBrush(UiStyle::FormatType subelement, bool selected) const { 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::fromValue(fmt.background()); return QVariant(); } - void ChatLineModelItem::computeWrapList() const { QString text = _styledMsg.plainContents(); @@ -186,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; @@ -201,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); @@ -234,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; }