/***************************************************************************
- * 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 *
* 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
+#include "bufferinfo.h"
+#include "coreconnection.h"
+#include "types.h"
-class BufferInfo;
class Message;
class MessageModel;
+class AbstractMessageProcessor;
class Identity;
+class CertIdentity;
class Network;
class AbstractUi;
class NetworkModel;
class BufferModel;
class BufferSyncer;
+class BufferViewOverlay;
+class ClientAliasManager;
class ClientBacklogManager;
-class BufferViewManager;
+class ClientBufferViewManager;
+class ClientIgnoreListManager;
+class ClientIrcListHelper;
+class ClientUserInputHandler;
+class CoreAccountModel;
+class CoreConnection;
class IrcUser;
class IrcChannel;
+class NetworkConfig;
class SignalProxy;
struct NetworkInfo;
-class QTimer;
-
class Client : public QObject {
Q_OBJECT
public:
+ enum ClientMode {
+ LocalCore,
+ RemoteCore
+ };
+
+ static bool instanceExists();
static Client *instance();
static void destroy();
static void init(AbstractUi *);
-
- static QList<BufferInfo> allBufferInfos();
- static QList<Buffer *> buffers();
- static Buffer *buffer(BufferId bufferUid);
- static Buffer *buffer(BufferInfo);
- static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; }
+ static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
static const Network * network(NetworkId);
static QList<IdentityId> identityIds();
- static const Identity * identity(IdentityId);
+ static const Identity *identity(IdentityId);
//! Request creation of an identity with the given data.
/** The request will be sent to the core, and will be propagated back to all the clients
* with a new valid IdentityId.
* \param identity The identity template for the new identity. It does not need to have a valid ID.
*/
- static void createIdentity(const Identity &identity);
+ static void createIdentity(const CertIdentity &identity);
//! 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 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);
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 ClientAliasManager *aliasManager() { return instance()->_aliasManager; }
static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
- static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
-
- static AccountId currentCoreAccount();
+ static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
+ 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 AbstractUiMsg *layoutMsg(const Message &);
+ 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 bool internalCore();
- static void userInput(BufferInfo bufferInfo, QString message);
+ static void userInput(const BufferInfo &bufferInfo, const QString &message);
- enum ClientMode { LocalCore, RemoteCore };
-
- static void checkForHighlight(Message &msg);
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 showBuffer(Buffer *);
- void bufferUpdated(BufferInfo bufferInfo);
- void backlogReceived(Buffer *, QList<Message>);
- void requestBacklog(BufferInfo, QVariant, QVariant);
void requestNetworkStates();
- void messageReceived(const Message &msg);
void showConfigWizard(const QVariantMap &coredata);
void connected();
- void securedConnection();
void disconnected();
void coreConnectionStateChanged(bool);
void identityRemoved(IdentityId id);
//! 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 &);
+ void requestCreateIdentity(const Identity &, const QVariantMap &);
//! 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 requestUpdateNetwork(const NetworkInfo &info);
+ void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
void requestRemoveNetwork(NetworkId);
-public slots:
- //void selectBuffer(Buffer *);
+ void logUpdated(const QString &msg);
+public slots:
void disconnectFromCore();
- void setCoreConfiguration(const QVariantMap &settings);
-
void bufferRemoved(BufferId bufferId);
void bufferRenamed(BufferId bufferId, const QString &newName);
+ void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
private slots:
- //void coreSocketError(QAbstractSocket::SocketError);
-
- //void networkConnected(NetworkId);
- //void networkDisconnected(NetworkId);
+ void setSyncedToCore();
+ void setDisconnectedFromCore();
+ void connectionStateChanged(CoreConnection::ConnectionState);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
- void receiveBacklog(BufferId bufferId, const QVariantList &msgs);
- void updateBufferInfo(BufferInfo);
- void updateLastSeenMsg(BufferId id, const MsgId &msgId);
-
- void layoutMsg();
- void bufferDestroyed();
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();
+ void requestInitialBacklog();
+ void createDefaultBufferView();
+ void sendBufferedUserInput();
private:
Client(QObject *parent = 0);
void init();
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;
-
SignalProxy * _signalProxy;
- AbstractUi * mainUi;
+ AbstractUi * _mainUi;
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;
+ ClientMode clientMode;
- QHash<BufferId, Buffer *> _buffers;
- QHash<NetworkId, Buffer *> _statusBuffers; // fast lookup
QHash<NetworkId, Network *> _networks;
QHash<IdentityId, Identity *> _identities;
- Buffer *_monitorBuffer;
-
- QTimer *layoutTimer;
- QLinkedList<Buffer *> layoutQueue;
+ QString _debugLogBuffer;
+ QTextStream _debugLog;
- static AccountId _currentCoreAccount;
+ QList<QPair<BufferInfo, QString> > _userInputBuffer;
- friend class ClientSyncer;
+ friend class CoreConnection;
};
#endif
projects / quassel.git / blobdiff