X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=8c707f343039bec6e4aeaf21b65ffa7216437d3e;hp=6cd8420aca1016c1f84451be8cd0c454cadaf1b5;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=32b5e6447458a8e6e8074c40988b2d06f327094f diff --git a/src/client/client.h b/src/client/client.h index 6cd8420a..8c707f34 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-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,24 +15,27 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _CLIENT_H_ -#define _CLIENT_H_ +#ifndef CLIENT_H_ +#define CLIENT_H_ -#include -#include #include #include -#include "buffer.h" // needed for activity lvl +#include "bufferinfo.h" +#include "coreaccount.h" +#include "coreconnection.h" +#include "quassel.h" +#include "types.h" -class BufferInfo; class Message; class MessageModel; +class AbstractMessageProcessor; class Identity; +class CertIdentity; class Network; class AbstractUi; @@ -40,201 +43,227 @@ class AbstractUiMsg; class NetworkModel; class BufferModel; class BufferSyncer; +class BufferViewOverlay; +class ClientAliasManager; class ClientBacklogManager; -class BufferViewManager; +class ClientBufferViewManager; +class ClientIgnoreListManager; +class ClientIrcListHelper; +class ClientTransferManager; +class ClientUserInputHandler; +class CoreAccountModel; +class CoreConnection; class IrcUser; class IrcChannel; +class NetworkConfig; class SignalProxy; -struct NetworkInfo; -class QTimer; +struct NetworkInfo; -class Client : public QObject { - Q_OBJECT +class Client : public QObject +{ + Q_OBJECT public: - static Client *instance(); - static void destroy(); - static void init(AbstractUi *); - - static QList allBufferInfos(); - static QList buffers(); - static Buffer *buffer(BufferId bufferUid); - static Buffer *buffer(BufferInfo); - static inline Buffer *monitorBuffer() { return instance()->_monitorBuffer; } - - static QList networkIds(); - static const Network * network(NetworkId); - - static QList identityIds(); - 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); - - //! 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. - */ - static void updateIdentity(const Identity &identity); + enum ClientMode { + LocalCore, + RemoteCore + }; + + static bool instanceExists(); + static Client *instance(); + static void destroy(); + static void init(AbstractUi *); + static AbstractUi *mainUi(); + + static QList networkIds(); + static const Network *network(NetworkId); + + static QList identityIds(); + 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 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 id The identity to be updated. + * \param serializedData The identity's content (cf. SyncableObject::toVariantMap()) + */ + 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, 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 ClientTransferManager *transferManager() { return instance()->_transferManager; } + + 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 void setCoreFeatures(Quassel::Features features); + + static bool isConnected(); + static bool internalCore(); + + 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 setMarkerLine(BufferId id, const MsgId &msgId); // this is synced to core and other clients + static MsgId markerLine(BufferId id); + + static void removeBuffer(BufferId id); + static void renameBuffer(BufferId bufferId, const QString &newName); + static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); + static void purgeKnownBufferIds(); + +#if QT_VERSION < 0x050000 + static void logMessage(QtMsgType type, const char *msg); +#else + static void logMessage(QtMsgType, const QMessageLogContext&, const QString&); +#endif + static inline const QString &debugLog() { return instance()->_debugLogBuffer; } - //! 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); +signals: + void requestNetworkStates(); - static void createNetwork(const NetworkInfo &info); - static void updateNetwork(const NetworkInfo &info); - static void removeNetwork(NetworkId id); + void showConfigWizard(const QVariantMap &coredata); - static inline NetworkModel *networkModel() { return instance()->_networkModel; } - static inline BufferModel *bufferModel() { return instance()->_bufferModel; } - static inline MessageModel *messageModel() { return instance()->_messageModel; } - static inline SignalProxy *signalProxy() { return instance()->_signalProxy; } + void connected(); + void disconnected(); + void coreConnectionStateChanged(bool); - static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } - static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } - - static AccountId currentCoreAccount(); + //! The identity with the given ID has been newly created in core and client. + /** \param id The ID of the newly created identity. + */ + void identityCreated(IdentityId id); - static AbstractUiMsg *layoutMsg(const Message &); + //! The identity with the given ID has been removed. + /** Upon emitting this signal, the identity is already gone from the core, and it will + * be deleted from the client immediately afterwards, so connected slots need to clean + * up their stuff. + * \param id The ID of the identity about to be removed. + */ + void identityRemoved(IdentityId id); - static bool isConnected(); - static bool isSynced(); + //! Sent to the core when an identity shall be created. Should not be used elsewhere. + void requestCreateIdentity(const Identity &, const QVariantMap &); + //! Sent to the core when an identity shall be removed. Should not be used elsewhere. + void requestRemoveIdentity(IdentityId); - static void userInput(BufferInfo bufferInfo, QString message); + void networkCreated(NetworkId id); + void networkRemoved(NetworkId id); - enum ClientMode { LocalCore, RemoteCore }; + void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); + void requestRemoveNetwork(NetworkId); - 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); + void logUpdated(const QString &msg); -signals: - void sendInput(BufferInfo, QString message); - void showBuffer(Buffer *); - void bufferUpdated(BufferInfo bufferInfo); - void backlogReceived(Buffer *, QList); - 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); - - //! The identity with the given ID has been newly created in core and client. - /** \param id The ID of the newly created identity. - */ - void identityCreated(IdentityId id); - - //! The identity with the given ID has been removed. - /** Upon emitting this signal, the identity is already gone from the core, and it will - * be deleted from the client immediately afterwards, so connected slots need to clean - * up their stuff. - * \param id The ID of the identity about to be removed. - */ - 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 &); - //! 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 requestRemoveNetwork(NetworkId); + //! 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); public slots: - //void selectBuffer(Buffer *); + void disconnectFromCore(); - void disconnectFromCore(); + void bufferRemoved(BufferId bufferId); + void bufferRenamed(BufferId bufferId, const QString &newName); + void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2); - void setCoreConfiguration(const QVariantMap &settings); - - void bufferRemoved(BufferId bufferId); - void bufferRenamed(BufferId bufferId, const QString &newName); + void markBufferAsRead(BufferId id); 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 recvMessage(const Message &message); + void recvStatusMsg(QString network, QString message); - void layoutMsg(); + void networkDestroyed(); + void coreIdentityCreated(const Identity &); + void coreIdentityRemoved(IdentityId); + void coreNetworkCreated(NetworkId); + void coreNetworkRemoved(NetworkId); - 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 sendBufferedUserInput(); private: - Client(QObject *parent = 0); - virtual ~Client(); - void init(); - - static void addNetwork(Network *); - static void setCurrentCoreAccount(AccountId); - static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } + Client(QObject *parent = 0); + virtual ~Client(); + void init(); - Buffer *statusBuffer(const NetworkId &networkid) const; + static void addNetwork(Network *); + static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } - static QPointer instanceptr; + static QPointer instanceptr; - QPointer socket; + 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; + ClientTransferManager *_transferManager; - SignalProxy * _signalProxy; - AbstractUi * mainUi; - NetworkModel * _networkModel; - BufferModel * _bufferModel; - BufferSyncer * _bufferSyncer; - ClientBacklogManager *_backlogManager; - BufferViewManager *_bufferViewManager; + MessageModel *_messageModel; + AbstractMessageProcessor *_messageProcessor; - MessageModel *_messageModel; + CoreAccountModel *_coreAccountModel; + CoreConnection *_coreConnection; - ClientMode clientMode; + ClientMode clientMode; - bool _connectedToCore, _syncedToCore; + QHash _networks; + QHash _identities; - QHash _buffers; - QHash _statusBuffers; // fast lookup - QHash _networks; - QHash _identities; + bool _connected; + static Quassel::Features _coreFeatures; - Buffer *_monitorBuffer; + QString _debugLogBuffer; + QTextStream _debugLog; - QTimer *layoutTimer; - QList layoutQueue; + QList > _userInputBuffer; - static AccountId _currentCoreAccount; - - friend class ClientSyncer; + friend class CoreConnection; }; + #endif