Ignore leading non-alphabetical characters. Fixes BR205

[quassel.git] / src / uisupport / tabcompleter.cpp

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index befedc6..87a745a 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005/06 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,57 +20,103 @@
 
 #include "tabcompleter.h"
 
-TabCompleter::TabCompleter(QLineEdit *l, QObject *parent) : QObject(parent) {
-  lineEdit = l;
-  enabled = false;
-  startOfLineSuffix = QString(": "); // TODO make start of line suffix configurable
-}
+#include "inputline.h"
+#include "client.h"
+#include "buffermodel.h"
+#include "networkmodel.h"
+#include "network.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "uisettings.h"
 
-void TabCompleter::updateNickList(QStringList l) {
-  nickList = l;
-}
+#include <QRegExp>
 
-void TabCompleter::updateChannelList(QStringList l) {
-  channelList = l;
+TabCompleter::TabCompleter(InputLine *inputLine_)
+  : QObject(inputLine_),
+    inputLine(inputLine_),
+    enabled(false),
+    nickSuffix(": ")
+{
+  inputLine->installEventFilter(this);
 }
 
 void TabCompleter::buildCompletionList() {
+  completionList.clear();
+  nextCompletion = completionList.begin();
   // this is the first time tab is pressed -> build up the completion list and it's iterator
-  QString tabAbbrev = lineEdit->text().left(lineEdit->cursorPosition()).section(' ',-1,-1);
+  QModelIndex currentIndex = Client::bufferModel()->currentIndex();
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
+    return;
+  
+  NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
+
+  const Network *network = Client::network(networkId);
+  if(!network)
+    return;
+
+  IrcChannel *channel = network->ircChannel(channelName);
+  if(!channel)
+    return;
+
+  // FIXME commented for debugging
+  /*
+  disconnect(this, SLOT(ircUserJoinedOrParted(IrcUser *)));
+  connect(channel, SIGNAL(ircUserJoined(IrcUser *)),
+         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
+  connect(channel, SIGNAL(ircUserParted(IrcUser *)),
+         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
+  */
+
+  completionList.clear();
+  QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
   completionList.clear();
-  foreach(QString nick, nickList) {
-    if(nick.toLower().startsWith(tabAbbrev.toLower())) {
-      completionList << nick;
+  QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
+  QMap<QString, QString> sortMap;
+
+  foreach(IrcUser *ircUser, channel->ircUsers()) {
+    if(regex.indexIn(ircUser->nick()) > -1) {
+      sortMap[ircUser->nick().toLower()] = ircUser->nick();
     }
   }
-  completionList.sort();
+  foreach (QString str, sortMap)
+    completionList << str;
+
   nextCompletion = completionList.begin();
   lastCompletionLength = tabAbbrev.length();
 }
 
+void TabCompleter::ircUserJoinedOrParted(IrcUser *ircUser) {
+  Q_UNUSED(ircUser)
+  buildCompletionList();
+}
+
 void TabCompleter::complete() {
-  if (! enabled) {
+  UiSettings uiSettings;
+  nickSuffix = uiSettings.value("CompletionSuffix", QString(": ")).toString();
+  
+  if(!enabled) {
     buildCompletionList();
-    enabled = true;  
+    enabled = true;
   }
   
   if (nextCompletion != completionList.end()) {
     // clear previous completion
     for (int i = 0; i < lastCompletionLength; i++) {
-      lineEdit->backspace();
+      inputLine->backspace();
     }
     
     // insert completion
-    lineEdit->insert(*nextCompletion);
+    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(lineEdit->text().length() == lastCompletionLength) {
-      lineEdit->insert(startOfLineSuffix);
-      lastCompletionLength += 2;
+    if(inputLine->text().length() == lastCompletionLength) {
+      inputLine->insert(nickSuffix);
+      lastCompletionLength += nickSuffix.length();
     }
 
   // we're at the end of the list -> start over again
@@ -80,7 +126,22 @@ void TabCompleter::complete() {
   
 }
 
-void TabCompleter::disable() {
+void TabCompleter::reset() {
   enabled = false;
 }
 
+bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
+  if(obj != inputLine || event->type() != QEvent::KeyPress)
+    return QObject::eventFilter(obj, event);
+
+  QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+  
+  if(keyEvent->key() == Qt::Key_Tab) {
+    complete();
+    return true;
+  } else {
+    reset();
+    return false;
+  }
+}
+