X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=30ef2d9f1d8a4237d0f88ded95eeaec2e5967b6f;hp=60aa7c1fdd83b83b2ab7e152c9cdf45b62f99795;hb=7582ce11d6fb8b5123f7ac4794c57e981a634e93;hpb=c6bc07febff322910675a1eb60c44f6be209a934 diff --git a/src/client/client.h b/src/client/client.h index 60aa7c1f..30ef2d9f 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,110 +18,133 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CLIENT_H_ -#define _CLIENT_H_ +#ifndef CLIENT_H_ +#define CLIENT_H_ -#include -#include #include #include -#include "buffer.h" // needed for activity lvl -class BufferInfo; +#include "bufferinfo.h" +#include "coreconnection.h" +#include "quassel.h" +#include "types.h" + class Message; +class MessageModel; +class AbstractMessageProcessor; class Identity; -class NetworkInfo; - +class CertIdentity; +class Network; class AbstractUi; class AbstractUiMsg; class NetworkModel; +class BufferModel; +class BufferSyncer; +class BufferViewOverlay; +class ClientAliasManager; +class ClientBacklogManager; +class ClientBufferViewManager; +class ClientIgnoreListManager; +class ClientIrcListHelper; +class ClientUserInputHandler; +class CoreAccountModel; +class CoreConnection; +class IrcUser; +class IrcChannel; +class NetworkConfig; class SignalProxy; - -class QTimer; - +struct NetworkInfo; 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 AbstractUi *mainUi(); - static QList networkInfos(); - static NetworkInfo *networkInfo(uint networkid); - - static QList allBufferInfos(); - static QList buffers(); - static Buffer *buffer(uint bufferUid); - static Buffer *buffer(BufferInfo); - static BufferInfo statusBufferInfo(QString net); - static BufferInfo bufferInfo(QString net, QString buf); + static QList networkIds(); + static const Network * network(NetworkId); static QList 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 NetworkModel *networkModel(); - static SignalProxy *signalProxy(); - - static AbstractUiMsg *layoutMsg(const Message &); + 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 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 inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; } + static inline CoreConnection *coreConnection() { return instance()->_coreConnection; } + static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); } + static inline Quassel::Features coreFeatures() { return _coreFeatures; } static bool isConnected(); + static bool internalCore(); - static void fakeInput(uint bufferUid, QString message); - static void fakeInput(BufferInfo bufferInfo, QString message); + static void userInput(const BufferInfo &bufferInfo, const 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 setBufferMarkerLine(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(); - 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 bufferSelected(Buffer *); - void bufferUpdated(Buffer *); - void bufferActivity(Buffer::ActivityLevel, Buffer *); - void backlogReceived(Buffer *, QList); - 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 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. */ @@ -136,78 +159,98 @@ signals: 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); -public slots: - //void selectBuffer(Buffer *); - //void connectToLocalCore(); - void connectToCore(const QVariantMap &); - void disconnectFromCore(); + void networkCreated(NetworkId id); + void networkRemoved(NetworkId id); - void setCoreConfiguration(const QVariantMap &settings); + void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); + void requestRemoveNetwork(NetworkId); -private slots: - void recvCoreState(const QVariant &state); - void recvSessionData(const QString &key, const QVariant &data); + void logUpdated(const QString &msg); + + //! Emitted when a buffer has been marked as read + /** This is currently triggered by setting lastSeenMsg, either local or remote, + * or by bringing the window to front. + * \param id The buffer that has been marked as read + */ + void bufferMarkedAsRead(BufferId id); - void coreSocketError(QAbstractSocket::SocketError); - void coreHasData(); - void coreSocketConnected(); - void coreSocketDisconnected(); +public slots: + void disconnectFromCore(); - void userInput(BufferInfo, QString); + void bufferRemoved(BufferId bufferId); + void bufferRenamed(BufferId bufferId, const QString &newName); + void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2); - void networkConnected(uint); - void networkDisconnected(uint); + void markBufferAsRead(BufferId id); + +private slots: + void setSyncedToCore(); + void setDisconnectedFromCore(); + void connectionStateChanged(CoreConnection::ConnectionState); - 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 networkInfoDestroyed(); - void ircChannelAdded(QString); + void networkDestroyed(); void coreIdentityCreated(const Identity &); void coreIdentityRemoved(IdentityId); + void coreNetworkCreated(NetworkId); + void coreNetworkRemoved(NetworkId); + + void requestInitialBacklog(); + void createDefaultBufferView(); + + void sendBufferedUserInput(); private: Client(QObject *parent = 0); virtual ~Client(); void init(); - void syncToCore(const QVariant &coreState); + static void addNetwork(Network *); + static void setCoreFeatures(Quassel::Features); + static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } static QPointer instanceptr; - QPointer socket; - QPointer _signalProxy; - QPointer mainUi; - QPointer _networkModel; + SignalProxy * _signalProxy; + AbstractUi * _mainUi; + NetworkModel * _networkModel; + BufferModel * _bufferModel; + BufferSyncer * _bufferSyncer; + ClientAliasManager *_aliasManager; + ClientBacklogManager *_backlogManager; + ClientBufferViewManager *_bufferViewManager; + BufferViewOverlay *_bufferViewOverlay; + ClientIrcListHelper *_ircListHelper; + ClientUserInputHandler *_inputHandler; + NetworkConfig *_networkConfig; + ClientIgnoreListManager *_ignoreListManager; + + MessageModel *_messageModel; + AbstractMessageProcessor *_messageProcessor; + + CoreAccountModel *_coreAccountModel; + CoreConnection *_coreConnection; ClientMode clientMode; - quint32 blockSize; - bool connectedToCore; - - QVariantMap coreConnectionInfo; - QHash _buffers; - QHash _networkInfo; + QHash _networks; QHash _identities; - QTimer *layoutTimer; - QList layoutQueue; + bool _connected; + static Quassel::Features _coreFeatures; - QVariantMap sessionData; + QString _debugLogBuffer; + QTextStream _debugLog; + QList > _userInputBuffer; + friend class CoreConnection; }; #endif