X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=30ef2d9f1d8a4237d0f88ded95eeaec2e5967b6f;hp=52133b68b4c7037e3ace2ad06eddb5fc34338f09;hb=7582ce11d6fb8b5123f7ac4794c57e981a634e93;hpb=034708a59ca1ee3195263a90941a2b145c520fef diff --git a/src/client/client.h b/src/client/client.h index 52133b68..30ef2d9f 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-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,12 +21,12 @@ #ifndef CLIENT_H_ #define CLIENT_H_ -#include -#include #include #include #include "bufferinfo.h" +#include "coreconnection.h" +#include "quassel.h" #include "types.h" class Message; @@ -34,6 +34,7 @@ class MessageModel; class AbstractMessageProcessor; class Identity; +class CertIdentity; class Network; class AbstractUi; @@ -41,12 +42,18 @@ class AbstractUiMsg; class NetworkModel; class BufferModel; class BufferSyncer; +class BufferViewOverlay; +class ClientAliasManager; class ClientBacklogManager; +class ClientBufferViewManager; +class ClientIgnoreListManager; class ClientIrcListHelper; -class ClientSyncer; -class BufferViewManager; +class ClientUserInputHandler; +class CoreAccountModel; +class CoreConnection; class IrcUser; class IrcChannel; +class NetworkConfig; class SignalProxy; struct NetworkInfo; @@ -59,22 +66,24 @@ public: 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); + 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. @@ -88,7 +97,7 @@ public: */ 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); @@ -98,31 +107,41 @@ public: 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 BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } + 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 AccountId currentCoreAccount(); + 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 isSynced(); + static bool internalCore(); - static void userInput(BufferInfo bufferInfo, QString message); + 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 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(); static void logMessage(QtMsgType type, const char *msg); static inline const QString &debugLog() { return instance()->_debugLogBuffer; } signals: - void sendInput(BufferInfo, QString message); void requestNetworkStates(); void showConfigWizard(const QVariantMap &coredata); void connected(); - void securedConnection(); void disconnected(); void coreConnectionStateChanged(bool); @@ -140,30 +159,38 @@ signals: void identityRemoved(IdentityId id); //! Sent to the core when an identity shall be created. Should not be used elsewhere. - void requestCreateIdentity(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 requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); void requestRemoveNetwork(NetworkId); - void newClientSyncer(ClientSyncer *); + void logUpdated(const QString &msg); - void logUpdated(); + //! 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 bufferRemoved(BufferId bufferId); void bufferRenamed(BufferId bufferId, const QString &newName); + void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2); + + void markBufferAsRead(BufferId id); private slots: - void disconnectedFromCore(); + void setSyncedToCore(); + void setDisconnectedFromCore(); + void connectionStateChanged(CoreConnection::ConnectionState); void recvMessage(const Message &message); void recvStatusMsg(QString network, QString message); @@ -174,11 +201,10 @@ private slots: void coreNetworkCreated(NetworkId); void coreNetworkRemoved(NetworkId); - void setConnectedToCore(QIODevice *socket, AccountId id); - void setConnectedToInternalCore(); - void setSyncedToCore(); - void setSecuredConnection(); + void requestInitialBacklog(); + void createDefaultBufferView(); + void sendBufferedUserInput(); private: Client(QObject *parent = 0); @@ -186,36 +212,45 @@ private: void init(); static void addNetwork(Network *); - static void setCurrentCoreAccount(AccountId); + static void setCoreFeatures(Quassel::Features); static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } static QPointer instanceptr; 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 _networks; QHash _identities; - static AccountId _currentCoreAccount; + bool _connected; + static Quassel::Features _coreFeatures; QString _debugLogBuffer; QTextStream _debugLog; - friend class ClientSyncer; + QList > _userInputBuffer; + + friend class CoreConnection; }; #endif