Smart tab completion!

This prefers nicks that you addressed last, followed by nicks that last spoke in the channel.
This is a preliminary implementation; we'll modelify this soon and do more interesting things.
But for now, this gives you a feature many of you have waited a long time for :)

Fixes #65.

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 93a0fa4..311801a 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -1,22 +1,22 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+*   Copyright (C) 2005-09 by the Quassel Project                          *
+*   devel@quassel-irc.org                                                 *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) version 3.                                           *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 
 #include "tabcompleter.h"
 
@@ -31,6 +31,9 @@
 
 #include <QRegExp>
 
+const Network *TabCompleter::_currentNetwork;
+BufferId TabCompleter::_currentBufferId;
+
 TabCompleter::TabCompleter(InputLine *inputLine_)
   : QObject(inputLine_),
     inputLine(inputLine_),
@@ -47,29 +50,29 @@ void TabCompleter::buildCompletionList() {
 
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
-  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
+  _currentBufferId = currentIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
+  if(!_currentBufferId.isValid())
     return;
-  
+
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString bufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
 
-  const Network *network = Client::network(networkId);
-  if(!network)
+  _currentNetwork = Client::network(networkId);
+  if(!_currentNetwork)
     return;
 
-
   QString tabAbbrev = inputLine->text().left(inputLine->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 = network->ircChannel(bufferName);
+      IrcChannel *channel = _currentNetwork->ircChannel(bufferName);
       if(!channel)
-       return;
+        return;
       foreach(IrcUser *ircUser, channel->ircUsers()) {
-       if(regex.indexIn(ircUser->nick()) > -1)
-         completionMap[ircUser->nick().toLower()] = ircUser->nick();
+        if(regex.indexIn(ircUser->nick()) > -1)
+          completionMap[ircUser->nick().toLower()] = ircUser->nick();
       }
     }
     break;
@@ -77,44 +80,39 @@ void TabCompleter::buildCompletionList() {
     if(regex.indexIn(bufferName) > -1)
       completionMap[bufferName.toLower()] = bufferName;
   case BufferInfo::StatusBuffer:
-    if(!network->myNick().isEmpty() && regex.indexIn(network->myNick()) > -1)
-      completionMap[network->myNick().toLower()] = network->myNick();
+    if(!_currentNetwork->myNick().isEmpty() && regex.indexIn(_currentNetwork->myNick()) > -1)
+      completionMap[_currentNetwork->myNick().toLower()] = _currentNetwork->myNick();
     break;
   default:
     return;
   }
-  
+
   nextCompletion = completionMap.begin();
   lastCompletionLength = tabAbbrev.length();
 }
 
-void TabCompleter::ircUserJoinedOrParted(IrcUser *ircUser) {
-  Q_UNUSED(ircUser)
-  buildCompletionList();
-}
-
 void TabCompleter::complete() {
-  UiSettings uiSettings;
-  nickSuffix = uiSettings.value("CompletionSuffix", QString(": ")).toString();
-  
+  NickCompletionSettings s;
+  nickSuffix = s.completionSuffix();
+
   if(!enabled) {
     buildCompletionList();
     enabled = true;
   }
-  
+
   if (nextCompletion != completionMap.end()) {
     // clear previous completion
     for (int i = 0; i < lastCompletionLength; i++) {
       inputLine->backspace();
     }
-    
+
     // insert completion
     inputLine->insert(*nextCompletion);
-    
+
     // remember charcount to delete next time and advance to next completion
     lastCompletionLength = nextCompletion->length();
     nextCompletion++;
-    
+
     // we're completing the first word of the line
     if(inputLine->cursorPosition() == lastCompletionLength) {
       inputLine->insert(nickSuffix);
@@ -128,7 +126,6 @@ void TabCompleter::complete() {
       complete();
     }
   }
-  
 }
 
 void TabCompleter::reset() {
@@ -140,7 +137,7 @@ bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
     return QObject::eventFilter(obj, event);
 
   QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-  
+
   if(keyEvent->key() == Qt::Key_Tab) {
     complete();
     return true;
@@ -150,3 +147,24 @@ 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);
+  IrcUser *thatUser = _currentNetwork->ircUser(other.nick);
+  if(!thisUser || !thatUser)
+    return QString::localeAwareCompare(this->nick, other.nick) < 0;
+
+  QDateTime thisSpokenTo = thisUser->lastSpokenTo(_currentBufferId);
+  QDateTime thatSpokenTo = thatUser->lastSpokenTo(_currentBufferId);
+
+  if(thisSpokenTo.isValid() || thatSpokenTo.isValid())
+    return thisSpokenTo > thatSpokenTo;
+
+  QDateTime thisTime = thisUser->lastChannelActivity(_currentBufferId);
+  QDateTime thatTime = thatUser->lastChannelActivity(_currentBufferId);
+
+  if(thisTime.isValid() || thatTime.isValid())
+    return thisTime > thatTime;
+
+  return QString::localeAwareCompare(this->nick, other.nick) < 0;
+}

diff --git a/src/uisupport/tabcompleter.h b/src/uisupport/tabcompleter.h
index 586ee5d..eb066e7 100644 (file)
--- a/src/uisupport/tabcompleter.h
+++ b/src/uisupport/tabcompleter.h
@@ -1,61 +1,69 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _TABCOMPLETER_H_
-#define _TABCOMPLETER_H_
-
-#include <QObject>
+*   Copyright (C) 2005-09 by the Quassel Project                          *
+*   devel@quassel-irc.org                                                 *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) version 3.                                           *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+
+#ifndef TABCOMPLETER_H_
+#define TABCOMPLETER_H_
+
 #include <QPointer>
 #include <QString>
 #include <QMap>
 
+#include "types.h"
+
 class InputLine;
 class IrcUser;
+class Network;
 
 class TabCompleter : public QObject {
   Q_OBJECT
-  
+
 public:
   TabCompleter(InputLine *inputLine_);
-  
+
   void reset();
   void complete();
 
   virtual bool eventFilter(QObject *obj, QEvent *event);
 
-private slots:
-  void ircUserJoinedOrParted(IrcUser *ircUser);
-  
 private:
+  struct CompletionKey {
+    inline CompletionKey(const QString &n) { nick = n; }
+    bool operator<(const CompletionKey &other) const;
+    QString nick;
+  };
+
   QPointer<InputLine> inputLine;
   bool enabled;
   QString nickSuffix;
 
-  QMap<QString, QString> completionMap;
+  static const Network *_currentNetwork;
+  static BufferId _currentBufferId;
+
+  QMap<CompletionKey, QString> completionMap;
   // QStringList completionTemplates;
-  
-  QMap<QString, QString>::Iterator nextCompletion;
+
+  QMap<CompletionKey, QString>::Iterator nextCompletion;
   int lastCompletionLength;
-  
+
   void buildCompletionList();
-  
+
 };
 
 #endif