X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=46d8a8df5af5b152a0cd706556abec8a863554eb;hp=751385a1279f8f65833768e81fab0fea86ca9ddc;hb=45affd4fa815bb21d0b2e46ac80114bb9174f801;hpb=d316067d1daf6c7ea790ca9ac5e1ff947fe011ce diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp index 751385a1..46d8a8df 100644 --- a/src/uisupport/tabcompleter.cpp +++ b/src/uisupport/tabcompleter.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* 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. * -***************************************************************************/ + * Copyright (C) 2005-2016 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #include "tabcompleter.h" @@ -28,176 +28,208 @@ #include "network.h" #include "networkmodel.h" #include "uisettings.h" +#include "action.h" +#include "actioncollection.h" +#include "graphicalui.h" #include const Network *TabCompleter::_currentNetwork; BufferId TabCompleter::_currentBufferId; QString TabCompleter::_currentBufferName; +TabCompleter::Type TabCompleter::_completionType; TabCompleter::TabCompleter(MultiLineEdit *_lineEdit) - : QObject(_lineEdit), + : QObject(_lineEdit), _lineEdit(_lineEdit), _enabled(false), _nickSuffix(": ") { - _lineEdit->installEventFilter(this); + // This Action just serves as a container for the custom shortcut and isn't actually handled; + // apparently, using tab as an Action shortcut in an input widget is unreliable on some platforms (e.g. OS/2) + _lineEdit->installEventFilter(this); + ActionCollection *coll = GraphicalUi::actionCollection("General"); + QAction *a = coll->addAction("TabCompletionKey", new Action(tr("Tab completion"), coll, + this, SLOT(onTabCompletionKey()), QKeySequence(Qt::Key_Tab))); + a->setEnabled(false); // avoid catching the shortcut } -void TabCompleter::buildCompletionList() { - // ensure a safe state in case we return early. - _completionMap.clear(); - _nextCompletion = _completionMap.begin(); - - // this is the first time tab is pressed -> build up the completion list and it's iterator - QModelIndex currentIndex = Client::bufferModel()->currentIndex(); - _currentBufferId = currentIndex.data(NetworkModel::BufferIdRole).value(); - if(!_currentBufferId.isValid()) - return; - - NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value(); - _currentBufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString(); - - _currentNetwork = Client::network(networkId); - if(!_currentNetwork) - return; - - 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[CompletionKey(ircChannel->name(), ChannelTab)] = ircChannel->name(); + +void TabCompleter::onTabCompletionKey() +{ + // do nothing; we use the event filter instead +} + + +void TabCompleter::buildCompletionList() +{ + // ensure a safe state in case we return early. + _completionMap.clear(); + _nextCompletion = _completionMap.begin(); + + // this is the first time tab is pressed -> build up the completion list and it's iterator + QModelIndex currentIndex = Client::bufferModel()->currentIndex(); + _currentBufferId = currentIndex.data(NetworkModel::BufferIdRole).value(); + if (!_currentBufferId.isValid()) + return; + + NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value(); + _currentBufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString(); + + _currentNetwork = Client::network(networkId); + if (!_currentNetwork) + return; + + 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(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(); + else { + // user completion + _completionType = UserTab; + switch (static_cast(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; + [[fallthrough]]; + 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(_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; } - } - _nextCompletion = _completionMap.begin(); - _lastCompletionLength = tabAbbrev.length(); + _nextCompletion = _completionMap.begin(); + _lastCompletionLength = tabAbbrev.length(); } -void TabCompleter::complete() { - TabCompletionSettings s; - _nickSuffix = s.completionSuffix(); - if(!_enabled) { - buildCompletionList(); - _enabled = true; - } +void TabCompleter::complete() +{ + TabCompletionSettings s; + _nickSuffix = s.completionSuffix(); - if (_nextCompletion != _completionMap.end()) { - // clear previous completion - for (int i = 0; i < _lastCompletionLength; i++) { - _lineEdit->backspace(); + if (!_enabled) { + buildCompletionList(); + _enabled = true; } - // insert completion - _lineEdit->insert(*_nextCompletion); + if (_nextCompletion != _completionMap.end()) { + // clear previous completion + for (int i = 0; i < _lastCompletionLength; i++) { + _lineEdit->backspace(); + } - // remember charcount to delete next time and advance to next completion - _lastCompletionLength = _nextCompletion->length(); - _nextCompletion++; + // insert completion + _lineEdit->insert(*_nextCompletion); - // we're completing the first word of the line - if(_completionType == UserTab && _lineEdit->cursorPosition() == _lastCompletionLength) { - _lineEdit->insert(_nickSuffix); - _lastCompletionLength += _nickSuffix.length(); - } + // 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 (_completionType == UserTab && _lineEdit->cursorPosition() == _lastCompletionLength) { + _lineEdit->insert(_nickSuffix); + _lastCompletionLength += _nickSuffix.length(); + } + else if (s.addSpaceMidSentence()) { + _lineEdit->addCompletionSpace(); + _lastCompletionLength++; + } - // we're at the end of the list -> start over again - } else { - if(!_completionMap.isEmpty()) { - _nextCompletion = _completionMap.begin(); - complete(); + // we're at the end of the list -> start over again + } + else { + if (!_completionMap.isEmpty()) { + _nextCompletion = _completionMap.begin(); + complete(); + } } - } } -void TabCompleter::reset() { - _enabled = false; + +void TabCompleter::reset() +{ + _enabled = false; } -bool TabCompleter::eventFilter(QObject *obj, QEvent *event) { - if(obj != _lineEdit || event->type() != QEvent::KeyPress) - return QObject::eventFilter(obj, event); - QKeyEvent *keyEvent = static_cast(event); +bool TabCompleter::eventFilter(QObject *obj, QEvent *event) +{ + if (obj != _lineEdit || event->type() != QEvent::KeyPress) + return QObject::eventFilter(obj, event); + + QKeyEvent *keyEvent = static_cast(event); + + if (keyEvent->key() == GraphicalUi::actionCollection("General")->action("TabCompletionKey")->shortcut()[0]) + complete(); + else + reset(); - if(keyEvent->key() == Qt::Key_Tab) { - complete(); - return true; - } else { - reset(); return false; - } } + // this determines the sort order -bool TabCompleter::CompletionKey::operator<(const CompletionKey &other) const { - switch(this->type) { +bool TabCompleter::CompletionKey::operator<(const CompletionKey &other) const +{ + switch (_completionType) { case UserTab: - { + { IrcUser *thisUser = _currentNetwork->ircUser(this->contents); - if(thisUser && _currentNetwork->isMe(thisUser)) - return false; + if (thisUser && _currentNetwork->isMe(thisUser)) + return false; IrcUser *thatUser = _currentNetwork->ircUser(other.contents); - if(thatUser && _currentNetwork->isMe(thatUser)) - return true; + if (thatUser && _currentNetwork->isMe(thatUser)) + return true; - if(!thisUser || !thatUser) - return QString::localeAwareCompare(this->contents, other.contents) < 0; + if (!thisUser || !thatUser) + return QString::localeAwareCompare(this->contents, other.contents) < 0; 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); - if(thisTime.isValid() || thatTime.isValid()) - return thisTime > thatTime; - } - break; + 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, this->contents, Qt::CaseInsensitive) == 0) + return true; - if(QString::compare(_currentBufferName, other.contents, Qt::CaseInsensitive) == 0) - return false; - break; + if (QString::compare(_currentBufferName, other.contents, Qt::CaseInsensitive) == 0) + return false; + break; default: - break; - } + break; + } - return QString::localeAwareCompare(this->contents, other.contents) < 0; + return QString::localeAwareCompare(this->contents, other.contents) < 0; }