/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QPointer>
#include "buffer.h" // needed for activity lvl
+
class BufferInfo;
class Message;
+class MessageModel;
+class AbstractMessageProcessor;
class Identity;
-class NetworkInfo;
-
+class Network;
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
+class BufferModel;
+class BufferSyncer;
+class ClientBacklogManager;
+class ClientIrcListHelper;
+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<NetworkInfo *> networkInfos();
- static NetworkInfo *networkInfo(uint networkid);
-
static QList<BufferInfo> allBufferInfos();
static QList<Buffer *> buffers();
- static Buffer *buffer(uint bufferUid);
+ // static Buffer *buffer(BufferId bufferUid);
static Buffer *buffer(BufferInfo);
- static BufferInfo statusBufferInfo(QString net);
- static BufferInfo bufferInfo(QString net, QString buf);
+
+ static QList<NetworkId> networkIds();
+ static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
static const Identity * identity(IdentityId);
//! 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 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 bool isConnected();
+ 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 void fakeInput(uint bufferUid, QString message);
- static void fakeInput(BufferInfo bufferInfo, QString message);
+ static bool isConnected();
+ static bool isSynced();
- static void storeSessionData(const QString &key, const QVariant &data);
- static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
- static QStringList sessionDataKeys();
+ static void userInput(BufferInfo bufferInfo, QString message);
- enum ClientMode { LocalCore, RemoteCore };
+ static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
+ static void removeBuffer(BufferId id);
signals:
void sendInput(BufferInfo, QString message);
void showBuffer(Buffer *);
- void bufferSelected(Buffer *);
- void bufferUpdated(Buffer *);
- void bufferActivity(Buffer::ActivityLevel, 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.
*/
//! 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);
+
public slots:
//void selectBuffer(Buffer *);
- //void connectToLocalCore();
- void connectToCore(const QVariantMap &);
+
void disconnectFromCore();
void setCoreConfiguration(const QVariantMap &settings);
-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 bufferRemoved(BufferId bufferId);
+ void bufferRenamed(BufferId bufferId, const QString &newName);
- void userInput(BufferInfo, QString);
+private slots:
+ //void coreSocketError(QAbstractSocket::SocketError);
- void networkConnected(uint);
- void networkDisconnected(uint);
+ //void networkConnected(NetworkId);
+ //void networkDisconnected(NetworkId);
- void updateCoreConnectionProgress();
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
- void recvBacklogData(BufferInfo, QVariantList, bool);
+ void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
void updateBufferInfo(BufferInfo);
- void layoutMsg();
-
void bufferDestroyed();
- void networkInfoDestroyed();
- void ircChannelAdded(QString);
+ void networkDestroyed();
void coreIdentityCreated(const Identity &);
void coreIdentityRemoved(IdentityId);
+ void coreNetworkCreated(NetworkId);
+ void coreNetworkRemoved(NetworkId);
+
+ void setConnectedToCore(QIODevice *socket, AccountId id);
+ void setSyncedToCore();
+ 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; }
+
+ Buffer *statusBuffer(const NetworkId &networkid) const;
static QPointer<Client> instanceptr;
QPointer<QIODevice> socket;
- QPointer<SignalProxy> _signalProxy;
- QPointer<AbstractUi> mainUi;
- QPointer<NetworkModel> _networkModel;
+
+ 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, NetworkInfo *> _networkInfo;
+ QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
+ QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
- QTimer *layoutTimer;
- QList<Buffer *> layoutQueue;
-
- QVariantMap sessionData;
-
+ static AccountId _currentCoreAccount;
+ friend class ClientSyncer;
};
#endif