X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=40086acc9e6a3c24cfaa52182b29ac940ba8e75c;hp=333479202300ef874c2c11a6abee2eea58b2a304;hb=f7e987956ef7e469a493a669e2f0c0901f5a7ead;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/client.h b/src/client/client.h
index 33347920..40086acc 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -18,46 +18,53 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CLIENT_H_
-#define _CLIENT_H_
+#ifndef CLIENT_H_
+#define CLIENT_H_
 
 #include <QAbstractSocket>
 #include <QTcpSocket>
 #include <QList>
 #include <QPointer>
 
-#include "buffer.h" // needed for activity lvl
-class BufferInfo;
+#include "bufferinfo.h"
+#include "types.h"
+
 class Message;
+class MessageModel;
+class AbstractMessageProcessor;
 
 class Identity;
 class Network;
 
-
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class BufferSyncer;
+class ClientBacklogManager;
+class ClientIrcListHelper;
+class ClientSyncer;
+class BufferViewManager;
+class IrcUser;
+class IrcChannel;
 class SignalProxy;
-
-class QTimer;
-
+struct NetworkInfo;
 
 class Client : public QObject {
   Q_OBJECT
 
 public:
+  enum ClientMode {
+    LocalCore,
+    RemoteCore
+  };
+
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<Network *> networks();
-  static Network *network(uint networkid);
-
-  static QList<BufferInfo> allBufferInfos();
-  static QList<Buffer *> buffers();
-  static Buffer *buffer(uint bufferUid);
-  static Buffer *buffer(BufferInfo);
+  static QList<NetworkId> networkIds();
+  static const Network * network(NetworkId);
 
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
@@ -71,55 +78,54 @@ public:
 
   //! Request update of an identity with the given data.
   /** The request will be sent to the core, and will be propagated back to all the clients.
-   *  \param identity The identity to be updated.
+   *  \param id The identity to be updated.
+   *  \param serializedData The identity's content (cf. SyncableObject::toVariantMap())
    */
-  static void updateIdentity(const Identity &identity);
+  static void updateIdentity(IdentityId id, const QVariantMap &serializedData);
 
   //! Request removal of the identity with the given ID from the core (and all the clients, of course).
   /** \param id The ID of the identity to be removed.
    */
   static void removeIdentity(IdentityId id);
 
-  static NetworkModel *networkModel();
-  static BufferModel *bufferModel();
-  static SignalProxy *signalProxy();
+  static void createNetwork(const NetworkInfo &info);
+  static void updateNetwork(const NetworkInfo &info);
+  static void removeNetwork(NetworkId id);
 
-  static AbstractUiMsg *layoutMsg(const Message &);
+  static inline NetworkModel *networkModel() { return instance()->_networkModel; }
+  static inline BufferModel *bufferModel() { return instance()->_bufferModel; }
+  static inline MessageModel *messageModel() { return instance()->_messageModel; }
+  static inline AbstractMessageProcessor *messageProcessor() { return instance()->_messageProcessor; }
+  static inline SignalProxy *signalProxy() { return instance()->_signalProxy; }
+
+  static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
+  static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+  static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+
+  static AccountId currentCoreAccount();
 
   static bool isConnected();
+  static bool isSynced();
 
-  static void fakeInput(uint bufferUid, QString message);
-  static void fakeInput(BufferInfo bufferInfo, QString message);
+  static void userInput(BufferInfo bufferInfo, QString message);
 
-  static void storeSessionData(const QString &key, const QVariant &data);
-  static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
-  static QStringList sessionDataKeys();
+  static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
+  static void removeBuffer(BufferId id);
 
-  enum ClientMode { LocalCore, RemoteCore };
+  static void logMessage(QtMsgType type, const char *msg);
+  static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
 signals:
   void sendInput(BufferInfo, QString message);
-  void showBuffer(Buffer *);
-  void bufferUpdated(BufferInfo bufferInfo);
-  void backlogReceived(Buffer *, QList<Message>);
-  void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
 
-  void recvPartialItem(uint avail, uint size);
-  void coreConnectionError(QString errorMsg);
-  void coreConnectionMsg(const QString &msg);
-  void coreConnectionProgress(uint part, uint total);
-
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
+  void securedConnection();
   void disconnected();
   void coreConnectionStateChanged(bool);
 
-  void sessionDataChanged(const QString &key);
-  void sessionDataChanged(const QString &key, const QVariant &data);
-  void sendSessionData(const QString &key, const QVariant &data);
-
   //! The identity with the given ID has been newly created in core and client.
   /** \param id The ID of the newly created identity.
    */
@@ -135,77 +141,81 @@ signals:
 
   //! Sent to the core when an identity shall be created. Should not be used elsewhere.
   void requestCreateIdentity(const Identity &);
-  //! Sent to the core when an identity shall be updated. Should not be used elsewhere.
-  void requestUpdateIdentity(const Identity &);
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
+  void networkCreated(NetworkId id);
+  void networkRemoved(NetworkId id);
+
+  void requestCreateNetwork(const NetworkInfo &info);
+  void requestRemoveNetwork(NetworkId);
+
+  void newClientSyncer(ClientSyncer *);
+
+  void logUpdated(const QString &msg);
+
 public slots:
   //void selectBuffer(Buffer *);
-  //void connectToLocalCore();
-  void connectToCore(const QVariantMap &);
+
   void disconnectFromCore();
 
-  void setCoreConfiguration(const QVariantMap &settings);
+  void bufferRemoved(BufferId bufferId);
+  void bufferRenamed(BufferId bufferId, const QString &newName);
 
 private slots:
-  void recvCoreState(const QVariant &state);
-  void recvSessionData(const QString &key, const QVariant &data);
-
-  void coreSocketError(QAbstractSocket::SocketError);
-  void coreHasData();
-  void coreSocketConnected();
-  void coreSocketDisconnected();
-
-  void userInput(BufferInfo, QString);
-
-  void networkConnected(uint);
-  void networkDisconnected(uint);
+  void disconnectedFromCore();
 
-  void updateCoreConnectionProgress();
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
-  void recvBacklogData(BufferInfo, QVariantList, bool);
-  void updateBufferInfo(BufferInfo);
 
-  void layoutMsg();
-
-  void bufferDestroyed();
   void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
+  void coreNetworkCreated(NetworkId);
+  void coreNetworkRemoved(NetworkId);
+
+  void setConnectedToCore(AccountId id, QIODevice *socket = 0);
+  void setSyncedToCore();
+  void requestInitialBacklog();
+  void setSecuredConnection();
+
 
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
   void init();
 
-  void syncToCore(const QVariant &coreState);
+  static void addNetwork(Network *);
+  static void setCurrentCoreAccount(AccountId);
+  static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; }
 
   static QPointer<Client> instanceptr;
 
-  QPointer<QIODevice> socket;
-  QPointer<SignalProxy> _signalProxy;
-  QPointer<AbstractUi> mainUi;
-  QPointer<NetworkModel> _networkModel;
-  QPointer<BufferModel> _bufferModel;
+  SignalProxy * _signalProxy;
+  AbstractUi * mainUi;
+  NetworkModel * _networkModel;
+  BufferModel * _bufferModel;
+  BufferSyncer * _bufferSyncer;
+  ClientBacklogManager *_backlogManager;
+  BufferViewManager *_bufferViewManager;
+  ClientIrcListHelper *_ircListHelper;
+
+  MessageModel *_messageModel;
+  AbstractMessageProcessor *_messageProcessor;
 
   ClientMode clientMode;
 
-  quint32 blockSize;
-  bool connectedToCore;
+  bool _connectedToCore, _syncedToCore;
 
-  QVariantMap coreConnectionInfo;
-  QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, Network *> _network;
+  QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
-  QTimer *layoutTimer;
-  QList<Buffer *> layoutQueue;
-
-  QVariantMap sessionData;
+  static AccountId _currentCoreAccount;
 
+  QString _debugLogBuffer;
+  QTextStream _debugLog;
 
+  friend class ClientSyncer;
 };
 
 #endif