X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=7426ed4de3dd616e41ab7454762eb4cd74e49f96;hp=b9b6eb1414352d4ecc746bcf8cc374796e06ccd3;hb=49813fa53b34ffa35837d30fd022e2fc72f57eb5;hpb=f047a4f7add72ef7e32ad33f884e62a5773ecc72

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index b9b6eb14..7426ed4d 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -33,6 +33,8 @@
 
 const Network *TabCompleter::_currentNetwork;
 BufferId TabCompleter::_currentBufferId;
+QString TabCompleter::_currentBufferName;
+TabCompleter::Type TabCompleter::_completionType;
 
 TabCompleter::TabCompleter(MultiLineEdit *_lineEdit)
   : QObject(_lineEdit),
@@ -55,36 +57,47 @@ void TabCompleter::buildCompletionList() {
     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;
 
-  QString tabAbbrev = _lineEdit->text().left(_lineEdit->cursorPosition()).section(' ',-1,-1);
-  QRegExp regex(QString("^[^a-zA-Z]*").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();
+  QString tabAbbrev = _lineEdit->text().left(_lineEdit->cursorPosition()).section(QRegExp("[^#\\w\\d-_\\[\\]{}|`^.\\\\]"),-1,-1);
+  QRegExp regex(QString("^[-_\\[\\]{}|`^.\\\\]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
+
+  // 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[ircChannel->name()] = 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[ircUser->nick().toLower()] = ircUser->nick();
+        }
       }
+      break;
+    case BufferInfo::QueryBuffer:
+      if(regex.indexIn(_currentBufferName) > -1)
+        _completionMap[_currentBufferName.toLower()] = _currentBufferName;
+    case BufferInfo::StatusBuffer:
+      if(!_currentNetwork->myNick().isEmpty() && regex.indexIn(_currentNetwork->myNick()) > -1)
+        _completionMap[_currentNetwork->myNick().toLower()] = _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();
@@ -114,7 +127,7 @@ void TabCompleter::complete() {
     _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();
     }
@@ -149,28 +162,43 @@ bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
 
 // 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(_completionType) {
+    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;
 }