X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=9b9e71c2c75ebaff1d0eaf4539c2aee7bf719df7;hb=3e85aa859e7533ec910f8b2efe4a8abd801d3a47;hp=38663bb02301bcee2339d90f26b6b5d94dc506ff;hpb=3197b8b309f09ac1f4db54fa8fa819e33b87383e;p=quassel.git

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 38663bb0..9b9e71c2 100644
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -26,7 +26,23 @@
 #include "qtui.h"
 #include "uistyle.h"
 
-ChatLineModelItem::ChatLineModelItem(const Message &msg) : MessageModelItem(msg) {
+// 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));
+int ChatLineModelItem::TextBoundaryFinderBufferSize = 512 * (sizeof(HB_CharAttributes_Dummy) / sizeof(unsigned char));
+
+ChatLineModelItem::ChatLineModelItem(const Message &msg)
+  : MessageModelItem(msg)
+{
   QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg);
 
   _timestamp.plainText = m.timestamp.plainText;
@@ -42,88 +58,99 @@ ChatLineModelItem::ChatLineModelItem(const Message &msg) : MessageModelItem(msg)
 
 
 QVariant ChatLineModelItem::data(int column, int role) const {
-  const ChatLinePart *part;
+  const ChatLinePart *part = 0;
 
   switch(column) {
-    case ChatLineModel::TimestampColumn: part = &_timestamp; break;
-    case ChatLineModel::SenderColumn:    part = &_sender; break;
-    case ChatLineModel::ContentsColumn:      part = &_contents; break;
-    default: return MessageModelItem::data(column, role);
+  case ChatLineModel::TimestampColumn:
+    part = &_timestamp;
+    break;
+  case ChatLineModel::SenderColumn:
+    part = &_sender;
+    break;
+  case ChatLineModel::ContentsColumn:
+    part = &_contents;
+    break;
+  default:
+    return MessageModelItem::data(column, role);
   }
 
   switch(role) {
-    case ChatLineModel::DisplayRole:
-      return part->plainText;
-    case ChatLineModel::FormatRole:
-      return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
-    case ChatLineModel::WrapListRole:
-      if(column != ChatLineModel::ContentsColumn) return QVariant();
-      return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
+  case ChatLineModel::DisplayRole:
+    return part->plainText;
+  case ChatLineModel::FormatRole:
+    return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
+  case ChatLineModel::WrapListRole:
+    if(column != ChatLineModel::ContentsColumn)
+      return QVariant();
+    return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
   }
-
   return MessageModelItem::data(column, role);
 }
 
-bool ChatLineModelItem::setData(int column, const QVariant &value, int role) {
-  return false;
-}
-
-// compute the width of a text snippet
-qreal ChatLineModelItem::snippetWidth(int start, int end, QFontMetricsF *&metrics, int &formatListIdx, int &formatEnd) {
-  qreal width = 0;
-  while(start < end) {
-    if(formatEnd <= start) {
-      formatListIdx++;
-      formatEnd = _contents.formatList.count() > formatListIdx+1 ? _contents.formatList[formatListIdx+1].first
-                                                                 : _contents.plainText.length();
-      metrics = QtUi::style()->fontMetrics(_contents.formatList[formatListIdx].second);
-      Q_ASSERT(formatEnd > start);
-    }
-    int i = qMin(end, formatEnd);
-    width += metrics->width(_contents.plainText.mid(start, i - start));
-    start = i;
-  }
-  return width;
-}
-
 void ChatLineModelItem::computeWrapList() {
+  if(_contents.plainText.isEmpty())
+    return;
+
   enum Mode { SearchStart, SearchEnd };
 
   QList<ChatLineModel::Word> wplist;  // use a temp list which we'll later copy into a QVector for efficiency
-  QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText);
-  int idx, oldidx;
-  qreal pxpos = 0;
-  int flistidx = -1;
-  int fmtend = -1;
-  bool wordStart = false; bool wordEnd = false;
-  QFontMetricsF *metrics = 0;
+  // QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText);
+  QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText.unicode(), _contents.plainText.length(), TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize);
+
+  int idx;
+  int oldidx = 0;
+  bool wordStart = false;
+  bool wordEnd = false;
   Mode mode = SearchEnd;
   ChatLineModel::Word word;
   word.start = 0;
+  int wordstartx = 0;
+
+  QTextLayout layout(_contents.plainText);
+  QTextOption option;
+  option.setWrapMode(QTextOption::NoWrap);
+  layout.setTextOption(option);
+
+  layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_contents.formatList, _contents.plainText.length()));
+  layout.beginLayout();
+  QTextLine line = layout.createLine();
+  line.setNumColumns(_contents.plainText.length());
+  layout.endLayout();
+
   do {
     idx = finder.toNextBoundary();
-    if(idx < 0) idx = _contents.plainText.length();
-    wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
-    wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+    if(idx < 0) {
+      idx = _contents.plainText.length();
+      wordStart = false;
+      wordEnd = false;
+      mode = SearchStart;
+    } else {
+      wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
+      wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+    }
 
-    //qDebug() << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
+    //if(flg) qDebug() << idx << mode << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
 
-    if(mode == SearchEnd || !wordStart && wordEnd) {
+    if(mode == SearchEnd || (!wordStart && wordEnd)) {
       if(wordStart || !wordEnd) continue;
       oldidx = idx;
       mode = SearchStart;
       continue;
     }
-    // mode == SearchStart
-    word.width = snippetWidth(word.start, oldidx, metrics, flistidx, fmtend);
-    word.trailing = snippetWidth(oldidx, idx, metrics, flistidx, fmtend);
+    int wordendx = line.cursorToX(oldidx);
+    int trailingendx = line.cursorToX(idx);
+    word.width = wordendx - wordstartx;
+    word.trailing = trailingendx - wordendx;
+    wordstartx = trailingendx;
     wplist.append(word);
 
     if(wordStart) {
       word.start = idx;
       mode = SearchEnd;
     }
-  } while(finder.isAtBoundary());
+    // 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()));
 
   // A QVector needs less space than a QList
   _wrapList.resize(wplist.count());