Allow the TabCompleter to complete channel names as well.

Any Tab-Completion starting with a # will now be treated as a channel,
and completed accordingly. All channels of the current network are
added to the tab completion list, and sorted by name, with the
exception that the current channel is always considered first.

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 88c2f0c..751385a 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -33,6 +33,7 @@
 
 const Network *TabCompleter::_currentNetwork;
 BufferId TabCompleter::_currentBufferId;
 
 const Network *TabCompleter::_currentNetwork;
 BufferId TabCompleter::_currentBufferId;

+QString TabCompleter::_currentBufferName;

 
 TabCompleter::TabCompleter(MultiLineEdit *_lineEdit)
   : QObject(_lineEdit),
 
 TabCompleter::TabCompleter(MultiLineEdit *_lineEdit)
   : QObject(_lineEdit),


@@ -55,36 +56,47 @@ void TabCompleter::buildCompletionList() {
     return;
 
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
     return;
 
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();

-  QString bufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
+  _currentBufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString();

 
   _currentNetwork = Client::network(networkId);
   if(!_currentNetwork)
     return;
 
 
   _currentNetwork = Client::network(networkId);
   if(!_currentNetwork)
     return;
 

-  QString tabAbbrev = _lineEdit->text().left(_lineEdit->cursorPosition()).section(QRegExp("[^\\w\\d-_\\[\\]{}|`^.\\\\]"),-1,-1);
+  QString tabAbbrev = _lineEdit->text().left(_lineEdit->cursorPosition()).section(QRegExp("[^#\\w\\d-_\\[\\]{}|`^.\\\\]"),-1,-1);

   QRegExp regex(QString("^[-_\\[\\]{}|`^.\\\\]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
 
   QRegExp regex(QString("^[-_\\[\\]{}|`^.\\\\]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
 

-  switch(static_cast<BufferInfo::Type>(currentIndex.data(NetworkModel::BufferTypeRole).toInt())) {
-  case BufferInfo::ChannelBuffer:
-    { // scope is needed for local var declaration
-      IrcChannel *channel = _currentNetwork->ircChannel(bufferName);
-      if(!channel)
-        return;
-      foreach(IrcUser *ircUser, channel->ircUsers()) {
-        if(regex.indexIn(ircUser->nick()) > -1)
-          _completionMap[ircUser->nick().toLower()] = ircUser->nick();
+  // channel completion - add all channels of the current network to the map
+  if(tabAbbrev.startsWith('#')) {
+    _completionType = ChannelTab;
+    foreach(IrcChannel *ircChannel, _currentNetwork->ircChannels()) {
+      if(regex.indexIn(ircChannel->name()) > -1)
+        _completionMap[CompletionKey(ircChannel->name(), ChannelTab)] = ircChannel->name();
+    }
+  } else {
+    // user completion
+    _completionType = UserTab;
+    switch(static_cast<BufferInfo::Type>(currentIndex.data(NetworkModel::BufferTypeRole).toInt())) {
+    case BufferInfo::ChannelBuffer:
+      { // scope is needed for local var declaration
+        IrcChannel *channel = _currentNetwork->ircChannel(_currentBufferName);
+        if(!channel)
+          return;
+        foreach(IrcUser *ircUser, channel->ircUsers()) {
+          if(regex.indexIn(ircUser->nick()) > -1)
+            _completionMap[CompletionKey(ircUser->nick().toLower(), UserTab)] = ircUser->nick();
+        }

       }
       }

+      break;
+    case BufferInfo::QueryBuffer:
+      if(regex.indexIn(_currentBufferName) > -1)
+        _completionMap[CompletionKey(_currentBufferName.toLower(), UserTab)] = _currentBufferName;
+    case BufferInfo::StatusBuffer:
+      if(!_currentNetwork->myNick().isEmpty() && regex.indexIn(_currentNetwork->myNick()) > -1)
+        _completionMap[CompletionKey(_currentNetwork->myNick().toLower(), UserTab)] = _currentNetwork->myNick();
+      break;
+    default:
+      return;

     }
     }

-    break;
-  case BufferInfo::QueryBuffer:
-    if(regex.indexIn(bufferName) > -1)
-      _completionMap[bufferName.toLower()] = bufferName;
-  case BufferInfo::StatusBuffer:
-    if(!_currentNetwork->myNick().isEmpty() && regex.indexIn(_currentNetwork->myNick()) > -1)
-      _completionMap[_currentNetwork->myNick().toLower()] = _currentNetwork->myNick();
-    break;
-  default:
-    return;

   }
 
   _nextCompletion = _completionMap.begin();
   }
 
   _nextCompletion = _completionMap.begin();


@@ -114,7 +126,7 @@ void TabCompleter::complete() {
     _nextCompletion++;
 
     // we're completing the first word of the line
     _nextCompletion++;
 
     // we're completing the first word of the line

-    if(_lineEdit->cursorPosition() == _lastCompletionLength) {
+    if(_completionType == UserTab && _lineEdit->cursorPosition() == _lastCompletionLength) {

       _lineEdit->insert(_nickSuffix);
       _lastCompletionLength += _nickSuffix.length();
     }
       _lineEdit->insert(_nickSuffix);
       _lastCompletionLength += _nickSuffix.length();
     }


@@ -149,28 +161,43 @@ bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
 
 // this determines the sort order
 bool TabCompleter::CompletionKey::operator<(const CompletionKey &other) const {
 
 // this determines the sort order
 bool TabCompleter::CompletionKey::operator<(const CompletionKey &other) const {

-  IrcUser *thisUser = _currentNetwork->ircUser(this->nick);
-  if(thisUser && _currentNetwork->isMe(thisUser))
-    return false;
+  switch(this->type) {
+    case UserTab:
+      {
+        IrcUser *thisUser = _currentNetwork->ircUser(this->contents);
+        if(thisUser && _currentNetwork->isMe(thisUser))
+          return false;

 
 

-  IrcUser *thatUser = _currentNetwork->ircUser(other.nick);
-  if(thatUser && _currentNetwork->isMe(thatUser))
-    return true;
+        IrcUser *thatUser = _currentNetwork->ircUser(other.contents);
+        if(thatUser && _currentNetwork->isMe(thatUser))
+          return true;

 
 

-  if(!thisUser || !thatUser)
-    return QString::localeAwareCompare(this->nick, other.nick) < 0;
+        if(!thisUser || !thatUser)
+          return QString::localeAwareCompare(this->contents, other.contents) < 0;

 
 

-  QDateTime thisSpokenTo = thisUser->lastSpokenTo(_currentBufferId);
-  QDateTime thatSpokenTo = thatUser->lastSpokenTo(_currentBufferId);
+        QDateTime thisSpokenTo = thisUser->lastSpokenTo(_currentBufferId);
+        QDateTime thatSpokenTo = thatUser->lastSpokenTo(_currentBufferId);

 
 

-  if(thisSpokenTo.isValid() || thatSpokenTo.isValid())
-    return thisSpokenTo > thatSpokenTo;
+        if(thisSpokenTo.isValid() || thatSpokenTo.isValid())
+          return thisSpokenTo > thatSpokenTo;

 
 

-  QDateTime thisTime = thisUser->lastChannelActivity(_currentBufferId);
-  QDateTime thatTime = thatUser->lastChannelActivity(_currentBufferId);
+        QDateTime thisTime = thisUser->lastChannelActivity(_currentBufferId);
+        QDateTime thatTime = thatUser->lastChannelActivity(_currentBufferId);

 
 

-  if(thisTime.isValid() || thatTime.isValid())
-    return thisTime > thatTime;
+        if(thisTime.isValid() || thatTime.isValid())
+          return thisTime > thatTime;
+      }
+      break;
+    case ChannelTab:
+      if(QString::compare(_currentBufferName, this->contents, Qt::CaseInsensitive) == 0)
+          return true;
+
+      if(QString::compare(_currentBufferName, other.contents, Qt::CaseInsensitive) == 0)
+          return false;
+      break;
+    default:
+      break;
+  }

 
 

-  return QString::localeAwareCompare(this->nick, other.nick) < 0;
+  return QString::localeAwareCompare(this->contents, other.contents) < 0;

 }
 }

diff --git a/src/uisupport/tabcompleter.h b/src/uisupport/tabcompleter.h
index d249943..bb5c0b3 100644 (file)
--- a/src/uisupport/tabcompleter.h
+++ b/src/uisupport/tabcompleter.h
@@ -43,10 +43,16 @@ public:
   virtual bool eventFilter(QObject *obj, QEvent *event);
 
 private:
   virtual bool eventFilter(QObject *obj, QEvent *event);
 
 private:

+  enum Type {
+    UserTab = 0x01,
+    ChannelTab = 0x02
+  };
+

   struct CompletionKey {
   struct CompletionKey {

-    inline CompletionKey(const QString &n) { nick = n; }
+    inline CompletionKey(const QString &n, const Type t) { contents = n; type = t; }

     bool operator<(const CompletionKey &other) const;
     bool operator<(const CompletionKey &other) const;

-    QString nick;
+    Type type;
+    QString contents;

   };
 
   QPointer<MultiLineEdit> _lineEdit;
   };
 
   QPointer<MultiLineEdit> _lineEdit;


@@ -55,10 +61,12 @@ private:
 
   static const Network *_currentNetwork;
   static BufferId _currentBufferId;
 
   static const Network *_currentNetwork;
   static BufferId _currentBufferId;

+  static QString _currentBufferName;

 
   QMap<CompletionKey, QString> _completionMap;
   // QStringList completionTemplates;
 
 
   QMap<CompletionKey, QString> _completionMap;
   // QStringList completionTemplates;
 

+  Type _completionType;

   QMap<CompletionKey, QString>::Iterator _nextCompletion;
   int _lastCompletionLength;
 
   QMap<CompletionKey, QString>::Iterator _nextCompletion;
   int _lastCompletionLength;