X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=12832ec3739410ef5cddd63946e047310d11d161;hp=261182fa60e9eb8c008e3139c497016ad60e5223;hb=33fe0cafca3a17123e7b4a3f93910f688983c0b1;hpb=ceadbf1e4fe94d231778b9aa4bff8717489b0fd5 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 261182fa..12832ec3 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -57,7 +57,7 @@ QVariant ChatItem::data(int role) const { return model()->data(index, role); } -QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) { +QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const { QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); QTextOption option; @@ -71,10 +71,7 @@ QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignmen return layout; } -void ChatItem::updateLayout() { - if(!privateData()) { - setPrivateData(new ChatItemPrivate(createLayout())); - } +void ChatItem::doLayout() { QTextLayout *layout_ = layout(); layout_->beginLayout(); QTextLine line = layout_->createLine(); @@ -90,56 +87,56 @@ void ChatItem::clearLayout() { _data = 0; } +ChatItemPrivate *ChatItem::privateData() const { + if(!_data) { + ChatItem *that = const_cast(this); + that->_data = that->newPrivateData(); + that->doLayout(); + } + return _data; +} + // NOTE: This is not the most time-efficient implementation, but it saves space by not caching unnecessary data // This is a deliberate trade-off. (-> selectFmt creation, data() call) void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(option); Q_UNUSED(widget); - if(!hasLayout()) - updateLayout(); painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work - //if(_selectionMode == FullSelection) { - //painter->save(); - //painter->fillRect(boundingRect(), QApplication::palette().brush(QPalette::Highlight)); - //painter->restore(); - //} QVector formats = additionalFormats(); - if(_selectionMode != NoSelection) { - QTextLayout::FormatRange selectFmt; - selectFmt.format.setForeground(QApplication::palette().brush(QPalette::HighlightedText)); - selectFmt.format.setBackground(QApplication::palette().brush(QPalette::Highlight)); - if(_selectionMode == PartialSelection) { - selectFmt.start = qMin(_selectionStart, _selectionEnd); - selectFmt.length = qAbs(_selectionStart - _selectionEnd); - } else { // FullSelection - selectFmt.start = 0; - selectFmt.length = data(MessageModel::DisplayRole).toString().length(); - } - formats.append(selectFmt); - } + QTextLayout::FormatRange selectFmt = selectionFormat(); + if(selectFmt.format.isValid()) formats.append(selectFmt); layout()->draw(painter, QPointF(0,0), formats, boundingRect()); // Debuging Stuff - // uncomment the following lines to draw the bounding rect and the row number in alternating colors + // uncomment partially or all of the following stuff: + // + // 0) alternativ painter color for debug stuff // if(row() % 2) // painter->setPen(Qt::red); // else // painter->setPen(Qt::blue); -// QString rowString = QString::number(row()); -// QRect rowRect = painter->fontMetrics().boundingRect(rowString); -// QPointF topPoint = _boundingRect.topLeft(); -// topPoint.ry() += rowRect.height(); -// painter->drawText(topPoint, rowString); -// QPointF bottomPoint = _boundingRect.bottomRight(); -// bottomPoint.rx() -= rowRect.width(); -// painter->drawText(bottomPoint, rowString); + // 1) draw wordwrap points in the first line +// if(column() == 2) { +// ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); +// foreach(ChatLineModel::Word word, wrapList) { +// if(word.endX > width()) +// break; +// painter->drawLine(word.endX, 0, word.endX, height()); +// } +// } + // 2) draw MsgId over the time column +// if(column() == 0) { +// QString msgIdString = QString::number(data(MessageModel::MsgIdRole).value().toInt()); +// QPointF bottomPoint = boundingRect().bottomLeft(); +// bottomPoint.ry() -= 2; +// painter->drawText(bottomPoint, msgIdString); +// } + // 3) draw bounding rect // painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); } qint16 ChatItem::posToCursor(const QPointF &pos) { if(pos.y() > height()) return data(MessageModel::DisplayRole).toString().length(); if(pos.y() < 0) return 0; - if(!hasLayout()) - updateLayout(); for(int l = layout()->lineCount() - 1; l >= 0; l--) { QTextLine line = layout()->lineAt(l); if(pos.y() >= line.y()) { @@ -167,6 +164,25 @@ void ChatItem::continueSelecting(const QPointF &pos) { update(); } +QTextLayout::FormatRange ChatItem::selectionFormat() const { + QTextLayout::FormatRange selectFmt; + if(_selectionMode != NoSelection) { + selectFmt.format.setForeground(QApplication::palette().brush(QPalette::HighlightedText)); + selectFmt.format.setBackground(QApplication::palette().brush(QPalette::Highlight)); + if(_selectionMode == PartialSelection) { + selectFmt.start = qMin(_selectionStart, _selectionEnd); + selectFmt.length = qAbs(_selectionStart - _selectionEnd); + } else { // FullSelection + selectFmt.start = 0; + selectFmt.length = data(MessageModel::DisplayRole).toString().length(); + } + } else { + selectFmt.start = -1; + selectFmt.length = 0; + } + return selectFmt; +} + QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity caseSensitive) { QList resultList; const QAbstractItemModel *model_ = model(); @@ -181,9 +197,7 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive); } - bool hadLayout = hasLayout(); - if(!hadLayout) - updateLayout(); + bool hadPrivateData = hasPrivateData(); foreach(int idx, indexList) { QTextLine line = layout()->lineForTextPosition(idx); @@ -194,7 +208,7 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity resultList << QRectF(x, y, width, height); } - if(!hadLayout) + if(!hadPrivateData) clearLayout(); return resultList; } @@ -246,6 +260,51 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { // SenderChatItem // ************************************************************ +void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); Q_UNUSED(widget); + + //painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work + qreal layoutWidth = layout()->minimumWidth(); + qreal offset = 0; + if(chatScene()->senderCutoffMode() == ChatScene::CutoffLeft) + offset = qMin(width() - layoutWidth, (qreal)0); + else + offset = qMax(layoutWidth - width(), (qreal)0); + + QTextLayout::FormatRange selectFmt = selectionFormat(); + + if(layoutWidth > width()) { + // Draw a nice gradient for longer items + // Qt's text drawing with a gradient brush sucks, so we use an alpha-channeled pixmap instead + QPixmap pixmap(QSize(layout()->boundingRect().width(), layout()->boundingRect().height())); + pixmap.fill(Qt::transparent); + QPainter pixPainter(&pixmap); + layout()->draw(&pixPainter, QPointF(qMax(offset, (qreal)0), 0), QVector() << selectFmt); + pixPainter.end(); + + // Create alpha channel mask + QPixmap mask(pixmap.size()); + QPainter maskPainter(&mask); + QLinearGradient gradient; + if(offset < 0) { + gradient.setStart(0, 0); + gradient.setFinalStop(12, 0); + gradient.setColorAt(0, Qt::black); + gradient.setColorAt(1, Qt::white); + } else { + gradient.setStart(width()-10, 0); + gradient.setFinalStop(width(), 0); + gradient.setColorAt(0, Qt::white); + gradient.setColorAt(1, Qt::black); + } + maskPainter.fillRect(boundingRect(), gradient); + pixmap.setAlphaChannel(mask); + painter->drawPixmap(0, 0, pixmap); + } else { + layout()->draw(painter, QPointF(0,0), QVector() << selectFmt, boundingRect()); + } +} + // ************************************************************ // ContentsChatItem // ************************************************************ @@ -261,6 +320,7 @@ ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGrap qreal ContentsChatItem::setGeometryByWidth(qreal w) { if(w != width()) { + prepareGeometryChange(); setWidth(w); // compute height int lines = 1; @@ -272,15 +332,7 @@ qreal ContentsChatItem::setGeometryByWidth(qreal w) { return height(); } -void ContentsChatItem::updateLayout() { - if(!privateData()) { - ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), - findClickables()); - // data->clickables = findClickables(); - setPrivateData(data); - } - - // Now layout +void ContentsChatItem::doLayout() { ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); if(!wrapList.count()) return; // empty chatitem @@ -302,19 +354,19 @@ void ContentsChatItem::updateLayout() { // NOTE: This method is not threadsafe and not reentrant! // (RegExps are not constant while matching, and they are static here for efficiency) -QList ContentsChatItem::findClickables() { +QList ContentsChatItem::findClickables() const { // For matching URLs static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); - static QString urlChars("(?:[\\w\\-~@/?&=+$()!%#]|[,.;:]\\w)"); + static QString urlChars("(?:[,.;:]*[\\w\\-~@/?&=+$()!%#])"); static QRegExp regExp[] = { // URL // QRegExp(QString("((?:https?://|s?ftp://|irc://|mailto:|www\\.)%1+|%1+\\.[a-z]{2,4}(?:?=/%1+|\\b))%2").arg(urlChars, urlEnd)), - QRegExp(QString("((?:(?:https?://|s?ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd)), + QRegExp(QString("((?:(?:https?://|s?ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd), Qt::CaseInsensitive), // Channel name // We don't match for channel names starting with + or &, because that gives us a lot of false positives. - QRegExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b") + QRegExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b", Qt::CaseInsensitive) // TODO: Nicks, we'll need a filtering for only matching known nicknames further down if we do this }; @@ -378,9 +430,12 @@ QVector ContentsChatItem::additionalFormats() const { } void ContentsChatItem::endHoverMode() { - if(privateData()->currentClickable.isValid()) { - setCursor(Qt::ArrowCursor); - privateData()->currentClickable = Clickable(); + if(hasPrivateData()) { + if(privateData()->currentClickable.isValid()) { + setCursor(Qt::ArrowCursor); + privateData()->currentClickable = Clickable(); + } + clearWebPreview(); update(); } } @@ -398,6 +453,8 @@ void ContentsChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { QString str = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); switch(click.type) { case Clickable::Url: + if(!str.contains("://")) + str = "http://" + str; QDesktopServices::openUrl(str); break; case Clickable::Channel: @@ -415,7 +472,7 @@ void ContentsChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // mouse move events always mean we're not hovering anymore... endHoverMode(); // also, check if we have dragged the mouse - if(!privateData()->hasDragged && event->buttons() & Qt::LeftButton + if(hasPrivateData() && !privateData()->hasDragged && event->buttons() & Qt::LeftButton && (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength() >= QApplication::startDragDistance()) privateData()->hasDragged = true; ChatItem::mouseMoveEvent(event); @@ -432,9 +489,10 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { for(int i = 0; i < privateData()->clickables.count(); i++) { Clickable click = privateData()->clickables.at(i); if(idx >= click.start && idx < click.start + click.length) { - if(click.type == Clickable::Url) + if(click.type == Clickable::Url) { onClickable = true; - else if(click.type == Clickable::Channel) { + showWebPreview(click); + } else if(click.type == Clickable::Channel) { // TODO: don't make clickable if it's our own name //onClickable = true; //FIXME disabled for now } @@ -450,6 +508,30 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { event->accept(); } +void ContentsChatItem::showWebPreview(const Clickable &click) { +#ifdef HAVE_WEBKIT + QTextLine line = layout()->lineForTextPosition(click.start); + qreal x = line.cursorToX(click.start); + qreal width = line.cursorToX(click.start + click.length) - x; + qreal height = line.height(); + qreal y = height * line.lineNumber(); + + QPointF topLeft = scenePos() + QPointF(x, y); + QRectF urlRect = QRectF(topLeft.x(), topLeft.y(), width, height); + + QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); + if(!url.contains("://")) + url = "http://" + url; + chatScene()->loadWebPreview(this, url, urlRect); +#endif +} + +void ContentsChatItem::clearWebPreview() { +#ifdef HAVE_WEBKIT + chatScene()->clearWebPreview(this); +#endif +} + /*************************************************************************************************/ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) @@ -459,9 +541,6 @@ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) wordidx(0), lineCount(0), choppedTrailing(0) -// lastwrapcol(0), -// lastwrappos(0), -// width(0) { } @@ -508,7 +587,7 @@ qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() { } qint16 pivot = (end + start) / 2; - if(wrapList.at(pivot).endX > targetWidth && wordidx != pivot) { + if(wrapList.at(pivot).endX > targetWidth) { end = pivot; } else { start = pivot;