First steps in supporting on-hover

We now analyze ChatLines (lazily) for interesting stuff like URLs and channel names,
and when hovering on them, underline them (and later also change the mouse cursor, I guess).
Still missing: action on click, also we still have some visual glitches while selecting.
Also I think we'll provide a context menu on right click later.

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index aea98db..e458055 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -116,7 +116,7 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     //painter->fillRect(boundingRect(), QApplication::palette().brush(QPalette::Highlight));
     //painter->restore();
   //}
     //painter->fillRect(boundingRect(), QApplication::palette().brush(QPalette::Highlight));
     //painter->restore();
   //}

-  QVector<QTextLayout::FormatRange> formats;
+  QVector<QTextLayout::FormatRange> formats = additionalFormats();

   if(_selectionMode != NoSelection) {
     QTextLayout::FormatRange selectFmt;
     selectFmt.format.setForeground(QApplication::palette().brush(QPalette::HighlightedText));
   if(_selectionMode != NoSelection) {
     QTextLayout::FormatRange selectFmt;
     selectFmt.format.setForeground(QApplication::palette().brush(QPalette::HighlightedText));


@@ -264,8 +264,12 @@ qreal ContentsChatItem::computeHeight() {
 }
 
 void ContentsChatItem::setLayout(QTextLayout *layout) {
 }
 
 void ContentsChatItem::setLayout(QTextLayout *layout) {

-  if(!_layoutData)
+  if(!_layoutData) {

     _layoutData = new LayoutData;
     _layoutData = new LayoutData;

+    _layoutData->clickables = findClickables();
+  } else {
+    delete _layoutData->layout;
+  }

   _layoutData->layout = layout;
 }
 
   _layoutData->layout = layout;
 }
 


@@ -295,28 +299,79 @@ void ContentsChatItem::updateLayout() {
     h += line.height() + fontMetrics()->leading();
   }
   layout()->endLayout();
     h += line.height() + fontMetrics()->leading();
   }
   layout()->endLayout();

-
-  analyze();

 }
 
 }
 

-void ContentsChatItem::analyze() {
-  // Match an URL
+// NOTE: This method is not threadsafe and not reentrant!
+//       (RegExps are not constant while matching, and they are static here for efficiency)
+QList<ContentsChatItem::Clickable> ContentsChatItem::findClickables() {
+  // For matching URLs

   static QString urlEnd("(?:>|[,.;:]?\\s|\\b)");
   static QString urlChars("(?:[\\w\\-~@/?&=+$()!%#]|[,.;:]\\w)");
   static QString urlEnd("(?:>|[,.;:]?\\s|\\b)");
   static QString urlChars("(?:[\\w\\-~@/?&=+$()!%#]|[,.;:]\\w)");

-  static QRegExp urlExp(QString("((?:(?:https?://|ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd));

 
 

-  // Match a channel name
-  // We don't match for channel names starting with + or &, because that gives us a lot of false positives.
-  static QRegExp chanExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b");
+  static QRegExp regExp[] = {
+    // URL
+    QRegExp(QString("((?:(?:https?://|s?ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd)),
+
+    // 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")
+
+    // TODO: Nicks, we'll need a filtering for only matching known nicknames further down if we do this
+  };
+
+  static const int regExpCount = 2;  // number of regexps in the array above
+
+  qint16 matches[] = { 0, 0, 0 };
+  qint16 matchEnd[] = { 0, 0, 0 };
+

   QString str = data(ChatLineModel::DisplayRole).toString();
   QString str = data(ChatLineModel::DisplayRole).toString();

-  quint16 idx = 0;
-  // first, we split on characters that might be URL separators
-  int i = str.indexOf(chanExp);
-  if(i >= 0) {
-    qDebug() << i << chanExp.cap(1);
-  }

 
 

+  QList<Clickable> result;
+  qint16 idx = 0;
+  qint16 minidx;
+  int type = -1;
+
+  do {
+    type = -1;
+    minidx = str.length();
+    for(int i = 0; i < regExpCount; i++) {
+      if(matches[i] < 0 || idx < matchEnd[i] || matchEnd[i] >= str.length()) continue;
+      matches[i] = str.indexOf(regExp[i], qMax(matchEnd[i], idx));
+      if(matches[i] >= 0) {
+        matchEnd[i] = matches[i] + regExp[i].cap(1).length();
+        if(matches[i] < minidx) {
+          minidx = matches[i];
+          type = i;
+        }
+      }
+    }
+    if(type >= 0) {
+      idx = matchEnd[type];
+      result.append(Clickable((Clickable::Type)type, matches[type], matchEnd[type] - matches[type]));
+    }
+  } while(type >= 0);

 
 

+  /* testing
+  if(!result.isEmpty()) qDebug() << str;
+  foreach(Clickable click, result) {
+    qDebug() << str.mid(click.start, click.length);
+  }
+  */
+  return result;
+}
+
+QVector<QTextLayout::FormatRange> ContentsChatItem::additionalFormats() const {
+  // mark a clickable if hovered upon
+  QVector<QTextLayout::FormatRange> fmt;
+  if(layoutData()->currentClickable.isValid()) {
+    Clickable click = layoutData()->currentClickable;
+    QTextLayout::FormatRange f;
+    f.start = click.start;
+    f.length = click.length;
+    f.format.setFontUnderline(true);
+    fmt.append(f);
+  }
+  return fmt;

 }
 
 void ContentsChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ContentsChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {


@@ -338,19 +393,38 @@ void ContentsChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
   event->accept();
 }
 
   event->accept();
 }
 

+void ContentsChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+  // mouse move events always mean we're not hovering anymore...
+  if(layoutData()->currentClickable.isValid()) {
+    layoutData()->currentClickable = Clickable();
+    update();
+  }
+  ChatItem::mouseMoveEvent(event);
+}
+

 void ContentsChatItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) {
 void ContentsChatItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) {

-  //qDebug() << (void*)this << "entering";
-  event->ignore();
+  //layoutData()->currentClickable = event->pos();
+  event->accept();

 }
 
 void ContentsChatItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {
 }
 
 void ContentsChatItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {

-  //qDebug() << (void*)this << "leaving";
-  event->ignore();
+  if(layoutData()->currentClickable.isValid()) {
+    layoutData()->currentClickable = Clickable();
+    update();
+  }
+  event->accept();

 }
 
 void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
 }
 
 void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {

-  //qDebug() << (void*)this << event->pos();
-  event->ignore();
+  qint16 idx = posToCursor(event->pos());
+  for(int i = 0; i < layoutData()->clickables.count(); i++) {
+    Clickable click = layoutData()->clickables.at(i);
+    if(idx >= click.start && idx < click.start + click.length) {
+      layoutData()->currentClickable = click;
+      update();
+    }
+  }
+  event->accept();

 }
 
 /*************************************************************************************************/
 }
 
 /*************************************************************************************************/

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 116041c..340050a 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -73,6 +73,7 @@ protected:
 
   virtual inline QTextLayout *layout() const { return _layout; }
   virtual inline void setLayout(QTextLayout *l) { _layout = l; }
 
   virtual inline QTextLayout *layout() const { return _layout; }
   virtual inline void setLayout(QTextLayout *l) { _layout = l; }

+  virtual inline QVector<QTextLayout::FormatRange> additionalFormats() const { return QVector<QTextLayout::FormatRange>(); }

   qint16 posToCursor(const QPointF &pos);
 
   virtual qreal computeHeight();
   qint16 posToCursor(const QPointF &pos);
 
   virtual qreal computeHeight();


@@ -132,39 +133,50 @@ public:
 
 protected:
   virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
 
 protected:
   virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);

+  virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);

   virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
   virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
   virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
 
   virtual inline QTextLayout *layout() const;
   virtual void setLayout(QTextLayout *l);
   virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
   virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
   virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
 
   virtual inline QTextLayout *layout() const;
   virtual void setLayout(QTextLayout *l);

+  virtual QVector<QTextLayout::FormatRange> additionalFormats() const;

 
 private:
   struct LayoutData;
   struct Clickable;
   class WrapColumnFinder;
 
 
 private:
   struct LayoutData;
   struct Clickable;
   class WrapColumnFinder;
 

+  inline LayoutData *layoutData() const;
+

   qreal computeHeight();
   qreal computeHeight();

-  void analyze();
+  QList<Clickable> findClickables();

 
   LayoutData *_layoutData;
 };
 
 struct ContentsChatItem::Clickable {
 
   LayoutData *_layoutData;
 };
 
 struct ContentsChatItem::Clickable {

+  // Don't change these enums without also changing the regexps in analyze()!

   enum Type {
   enum Type {

-    Url,
-    Channel,
-    Nick
+    Invalid = -1,
+    Url = 0,
+    Channel = 1,
+    Nick = 2

   };
 
   };
 

+  Type type;

   quint16 start;
   quint16 length;
   quint16 start;
   quint16 length;

-  Type type;
+
+  inline Clickable() : type(Invalid) {};
+  inline Clickable(Type type_, quint16 start_, quint16 length_) : type(type_), start(start_), length(length_) {};
+  inline bool isValid() const { return type != Invalid; }

 };
 
 struct ContentsChatItem::LayoutData {
   QTextLayout *layout;
   QList<Clickable> clickables;
 };
 
 struct ContentsChatItem::LayoutData {
   QTextLayout *layout;
   QList<Clickable> clickables;

+  Clickable currentClickable;

 
   LayoutData() { layout = 0; }
   ~LayoutData() { delete layout; }
 
   LayoutData() { layout = 0; }
   ~LayoutData() { delete layout; }


@@ -193,6 +205,8 @@ private:
 // Avoid circular include deps
 #include "chatline.h"
 int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }
 // Avoid circular include deps
 #include "chatline.h"
 int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }

+

 QTextLayout *ContentsChatItem::layout() const { return _layoutData->layout; }
 QTextLayout *ContentsChatItem::layout() const { return _layoutData->layout; }

+ContentsChatItem::LayoutData *ContentsChatItem::layoutData() const { Q_ASSERT(_layoutData); return _layoutData; }

 
 #endif
 
 #endif