X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=aa614f2acf5db245e1c50eac102d4b5d9f414ed9;hp=c320a4187128f07a9cd099cd82271a71f0a8c1f4;hb=ed178d5c517ad031444fc64f1f85f9ea7a926e15;hpb=7a44d67d565fe4f627e64b158a91a5978591c743

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index c320a418..aa614f2a 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -18,46 +18,29 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <QDateTime>
+#include "clientuserinputhandler.h"
 
+#include "buffermodel.h"
 #include "client.h"
-#include "clientuserinputhandler.h"
+#include "clientaliasmanager.h"
 #include "clientsettings.h"
+#include "execwrapper.h"
 #include "ircuser.h"
 #include "network.h"
+#include "types.h"
+#include "bufferinfo.h"
+#include "clientbufferviewconfig.h"
+#include "clientbufferviewmanager.h"
+#include "messagemodel.h"
+
+#include <QDateTime>
 
 ClientUserInputHandler::ClientUserInputHandler(QObject *parent)
-: QObject(parent),
-  _initialized(false)
+: BasicHandler(parent)
 {
   TabCompletionSettings s;
   s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant)));
   completionSuffixChanged(s.completionSuffix());
-
-  // we need this signal for future connects to reset the data;
-  connect(Client::instance(), SIGNAL(connected()), SLOT(clientConnected()));
-  connect(Client::instance(), SIGNAL(disconnected()), SLOT(clientDisconnected()));
-  if(Client::isConnected())
-    clientConnected();
-}
-
-void ClientUserInputHandler::clientConnected() {
-  _aliasManager = ClientAliasManager();
-  Client::signalProxy()->synchronize(&_aliasManager);
-  connect(&_aliasManager, SIGNAL(initDone()), SLOT(initDone()));
-}
-
-void ClientUserInputHandler::clientDisconnected() {
-  // clear alias manager
-  _aliasManager = ClientAliasManager();
-  _initialized = false;
-}
-
-void ClientUserInputHandler::initDone() {
-  _initialized = true;
-  for(int i = 0; i < _inputBuffer.count(); i++)
-    handleUserInput(_inputBuffer.at(i).first, _inputBuffer.at(i).second);
-  _inputBuffer.clear();
 }
 
 void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) {
@@ -69,10 +52,8 @@ void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) {
 
 // this would be the place for a client-side hook
 void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) {
-  if(!_initialized) { // aliases not yet synced
-    _inputBuffer.append(qMakePair(bufferInfo, msg));
+  if(msg.isEmpty())
     return;
-  }
 
   if(!msg.startsWith('/')) {
     if(_nickRx.indexIn(msg) == 0) {
@@ -83,8 +64,64 @@ void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const
     }
   }
 
-  AliasManager::CommandList clist = _aliasManager.processInput(bufferInfo, msg);
+  AliasManager::CommandList clist = Client::aliasManager()->processInput(bufferInfo, msg);
+
+  for(int i = 0; i < clist.count(); i++) {
+    QString cmd = clist.at(i).second.section(' ', 0, 0).remove(0, 1).toUpper();
+    QString payload = clist.at(i).second.section(' ', 1);
+    handle(cmd, Q_ARG(BufferInfo, clist.at(i).first), Q_ARG(QString, payload));
+  }
+}
 
-  for(int i = 0; i < clist.count(); i++)
-    emit sendInput(clist.at(i).first, clist.at(i).second);
+void ClientUserInputHandler::defaultHandler(const QString &cmd, const BufferInfo &bufferInfo, const QString &text) {
+  QString command = QString("/%1 %2").arg(cmd, text);
+  emit sendInput(bufferInfo, command);
+}
+
+void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QString &execString) {
+  ExecWrapper *exec = new ExecWrapper(this); // gets suicidal when it's done
+  exec->start(bufferInfo, execString);
+}
+
+void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel"));
+    return;
+  }
+  switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
+  // send to core
+  defaultHandler("JOIN", bufferInfo, text);
+}
+
+void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/QUERY expects at least a nick"));
+    return;
+  }
+  switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
+  // send to core
+  defaultHandler("QUERY", bufferInfo, text);
+}
+
+void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QString &bufferName) {
+  BufferId newBufId = Client::networkModel()->bufferId(networkId, bufferName);
+  if(!newBufId.isValid()) {
+    Client::bufferModel()->switchToBufferAfterCreation(networkId, bufferName);
+  }
+  else {
+    Client::bufferModel()->switchToBuffer(newBufId);
+    // unhide the buffer
+    ClientBufferViewManager *clientBufferViewManager = Client::bufferViewManager();
+    QList<ClientBufferViewConfig*> bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs();
+    foreach (ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) {
+      if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) {
+        bufferViewConfig->addBuffer(newBufId, bufferViewConfig->bufferList().length());
+        //if (bufferViewConfig->sortAlphabetically()) {
+          // TODO we need to trigger a sort here, but can't reach the model required
+          // to get a bufferviewfilter, as the bufferviewmanager only managers configs
+          //BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+        //}
+      }
+    }
+  }
 }