X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=a516e2521e099464a299e18e8d16f923877171b1;hp=fb5247d8cc9918b294d906941506c96fd06cda00;hb=fa00b68a21c777682d9feb37ade6b3904fc19d92;hpb=9bb1e377323247ce65e70f2506f096098969d19e

diff --git a/src/client/client.h b/src/client/client.h
index fb5247d8..a516e252 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,12 +21,11 @@
 #ifndef CLIENT_H_
 #define CLIENT_H_
 
-#include <QAbstractSocket>
-#include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
 #include "bufferinfo.h"
+#include "coreconnection.h"
 #include "types.h"
 
 class Message;
@@ -42,12 +41,18 @@ class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
+class BufferViewOverlay;
+class ClientAliasManager;
 class ClientBacklogManager;
+class ClientBufferViewManager;
+class ClientIgnoreListManager;
 class ClientIrcListHelper;
-class ClientSyncer;
-class BufferViewManager;
+class ClientUserInputHandler;
+class CoreAccountModel;
+class CoreConnection;
 class IrcUser;
 class IrcChannel;
+class NetworkConfig;
 class SignalProxy;
 struct NetworkInfo;
 
@@ -60,6 +65,7 @@ public:
     RemoteCore
   };
 
+  static bool instanceExists();
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
@@ -90,7 +96,7 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
-  static void createNetwork(const NetworkInfo &info);
+  static void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
@@ -100,34 +106,40 @@ public:
   static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
   static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
 
+  static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; }
   static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
   static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
-  static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; }
+  static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
+  static inline NetworkConfig *networkConfig() { return instance()->_networkConfig; }
+  static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; }
 
-  static AccountId currentCoreAccount();
+  static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; }
+  static inline CoreConnection *coreConnection() { return instance()->_coreConnection; }
+  static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); }
 
   static bool isConnected();
   static bool isSynced();
-  static inline bool internalCore() { return instance()->_internalCore; }
+  static bool internalCore();
 
-  static void userInput(BufferInfo bufferInfo, QString message);
+  static void userInput(const BufferInfo &bufferInfo, const QString &message);
 
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
   static void renameBuffer(BufferId bufferId, const QString &newName);
   static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
+  static void purgeKnownBufferIds();
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
 signals:
-  void sendInput(BufferInfo, QString message);
   void requestNetworkStates();
 
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
-  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
@@ -152,16 +164,12 @@ signals:
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 
-  void requestCreateNetwork(const NetworkInfo &info);
+  void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
   void requestRemoveNetwork(NetworkId);
 
-  void newClientSyncer(ClientSyncer *);
-
   void logUpdated(const QString &msg);
 
 public slots:
-  //void selectBuffer(Buffer *);
-
   void disconnectFromCore();
 
   void bufferRemoved(BufferId bufferId);
@@ -169,7 +177,9 @@ public slots:
   void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
-  void disconnectedFromCore();
+  void setSyncedToCore();
+  void setDisconnectedFromCore();
+  void connectionStateChanged(CoreConnection::ConnectionState);
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
@@ -180,11 +190,10 @@ private slots:
   void coreNetworkCreated(NetworkId);
   void coreNetworkRemoved(NetworkId);
 
-  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
-  void setSyncedToCore();
   void requestInitialBacklog();
-  void setSecuredConnection();
+  void createDefaultBufferView();
 
+  void sendBufferedUserInput();
 
 private:
   Client(QObject *parent = 0);
@@ -192,7 +201,6 @@ private:
   void init();
 
   static void addNetwork(Network *);
-  static void setCurrentCoreAccount(AccountId);
   static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
@@ -202,27 +210,32 @@ private:
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
+  ClientAliasManager *_aliasManager;
   ClientBacklogManager *_backlogManager;
-  BufferViewManager *_bufferViewManager;
+  ClientBufferViewManager *_bufferViewManager;
+  BufferViewOverlay *_bufferViewOverlay;
   ClientIrcListHelper *_ircListHelper;
+  ClientUserInputHandler *_inputHandler;
+  NetworkConfig *_networkConfig;
+  ClientIgnoreListManager *_ignoreListManager;
 
   MessageModel *_messageModel;
   AbstractMessageProcessor *_messageProcessor;
 
-  ClientMode clientMode;
+  CoreAccountModel *_coreAccountModel;
+  CoreConnection *_coreConnection;
 
-  bool _connectedToCore, _syncedToCore;
-  bool _internalCore;
+  ClientMode clientMode;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
-  static AccountId _currentCoreAccount;
-
   QString _debugLogBuffer;
   QTextStream _debugLog;
 
-  friend class ClientSyncer;
+  QList<QPair<BufferInfo, QString> > _userInputBuffer;
+
+  friend class CoreConnection;
 };
 
 #endif