Fix off-by-one error in computeWrapList()

[quassel.git] / src / qtui / chatlinemodelitem.cpp

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 009d535..9529412 100644 (file)
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -18,12 +18,15 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

+#include <QFontMetrics>
+#include <QTextBoundaryFinder>
+

 #include "chatlinemodelitem.h"
 #include "chatlinemodel.h"
 #include "qtui.h"
 #include "uistyle.h"
 
 #include "chatlinemodelitem.h"
 #include "chatlinemodel.h"
 #include "qtui.h"
 #include "uistyle.h"
 

-ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg) {
+ChatLineModelItem::ChatLineModelItem(const Message &msg) : MessageModelItem(msg) {

   QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg);
 
   _timestamp.plainText = m.timestamp.plainText;
   QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg);
 
   _timestamp.plainText = m.timestamp.plainText;


@@ -34,27 +37,73 @@ ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg)
   _sender.formatList = m.sender.formatList;
   _contents.formatList = m.contents.formatList;
 
   _sender.formatList = m.sender.formatList;
   _contents.formatList = m.contents.formatList;
 

+  computeWrapList();

 }
 
 
 }
 
 

-QVariant ChatlineModelItem::data(int column, int role) const {
-  const ChatlinePart *part;
+QVariant ChatLineModelItem::data(int column, int role) const {
+  const ChatLinePart *part;

 
   switch(column) {
 
   switch(column) {

-    case ChatlineModel::TimestampColumn: part = &_timestamp; break;
-    case ChatlineModel::SenderColumn:    part = &_sender; break;
-    case ChatlineModel::TextColumn:      part = &_contents; break;
+    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) {
     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::DisplayRole:
+      return part->plainText;
+    case ChatLineModel::FormatRole:
+      return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
+    case ChatLineModel::WrapListRole:
+      if(column != ChatLineModel::ContentsColumn) return QVariant();
+      QVariantList wrapList;
+      typedef QPair<quint16, quint16> WrapPoint;  // foreach can't parse templated params
+      foreach(WrapPoint pair, _wrapList) wrapList << pair.first << pair.second;
+      return wrapList;

   }
 
   return MessageModelItem::data(column, role);
 }
 
   }
 
   return MessageModelItem::data(column, role);
 }
 

-bool ChatlineModelItem::setData(int column, const QVariant &value, int role) {
+bool ChatLineModelItem::setData(int column, const QVariant &value, int role) {

   return false;
 }
   return false;
 }

+
+void ChatLineModelItem::computeWrapList() {
+  WrapList wplist;  // use a temp list which we'll later copy into a QVector for efficiency
+  QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText);
+  int idx;
+  int flistidx = -1;
+  int fmtend = -1;
+  QFontMetricsF *metrics;
+  QPair<quint16, quint16> wp(0, 0);
+  do {
+    idx = finder.toNextBoundary();
+    if(idx < 0) idx = _contents.plainText.length();
+    else if(finder.boundaryReasons() != QTextBoundaryFinder::StartWord) continue;
+    int start = wp.first;
+    while(start < idx) {
+      if(fmtend <= start) {
+        flistidx++;
+        fmtend = _contents.formatList.count() > flistidx+1 ? _contents.formatList[flistidx+1].first
+                                                           : _contents.plainText.length();
+        metrics = QtUi::style()->fontMetrics(_contents.formatList[flistidx].second);
+        Q_ASSERT(fmtend > start);
+      }
+      int i = qMin(idx, fmtend);
+      wp.second += metrics->width(_contents.plainText.mid(start, i - start));
+      start = i;
+    }
+    wplist.append(wp);
+    wp.first = idx;
+  } while(finder.isAtBoundary());
+
+  // A QVector needs less space than a QList
+  _wrapList.resize(wplist.count());
+  for(int i = 0; i < wplist.count(); i++) {
+    _wrapList[i] = wplist.at(i);
+  }
+}
+