X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=4d1bad6c1342f252464d29fa65995afbc92692a8;hp=66ea75f8d0a927d9c362e7de6ceefee606939e51;hb=d1192c9aeef46d5d995c728812740b765cb98b28;hpb=7795adca52f35204f8c354da6fcc5d8e8ee35531 diff --git a/src/client/client.h b/src/client/client.h index 66ea75f8..4d1bad6c 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,11 +1,11 @@ /*************************************************************************** - * 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 * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -27,16 +27,23 @@ #include #include "buffer.h" // needed for activity lvl + class BufferInfo; class Message; -class NetworkInfo; +class Identity; +class Network; class AbstractUi; class AbstractUiMsg; -class BufferTreeModel; +class NetworkModel; +class BufferModel; +class BufferSyncer; +class IrcUser; +class IrcChannel; class SignalProxy; +struct NetworkInfo; class QTimer; @@ -49,120 +56,172 @@ public: static void destroy(); static void init(AbstractUi *); - static QList networkInfos(); - static NetworkInfo *networkInfo(uint networkid); - static QList allBufferInfos(); static QList 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 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); - static BufferTreeModel *bufferModel(); - static SignalProxy *signalProxy(); + //! 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 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 SignalProxy *signalProxy() { return instance()->_signalProxy; } + + static AccountId currentCoreAccount(); static AbstractUiMsg *layoutMsg(const Message &); static bool isConnected(); + static bool isSynced(); - static void fakeInput(uint bufferUid, QString message); - static void fakeInput(BufferInfo bufferInfo, 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 userInput(BufferInfo bufferInfo, QString message); enum ClientMode { LocalCore, RemoteCore }; + static void checkForHighlight(Message &msg); + static void setBufferLastSeen(BufferId id, const QDateTime &seen); // 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); 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 sessionDataChanged(const QString &key); - void sessionDataChanged(const QString &key, const QVariant &data); - void sendSessionData(const QString &key, const QVariant &data); + 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); 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 updateBufferInfo(BufferInfo); + void updateLastSeen(BufferId id, const QDateTime &lastSeen); void layoutMsg(); -private slots: 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(); 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 instanceptr; QPointer socket; - QPointer _signalProxy; - QPointer mainUi; - QPointer _bufferModel; + + SignalProxy * _signalProxy; + AbstractUi * mainUi; + NetworkModel * _networkModel; + BufferModel * _bufferModel; + BufferSyncer * _bufferSyncer; ClientMode clientMode; - quint32 blockSize; - bool connectedToCore; + bool _connectedToCore, _syncedToCore; - QVariantMap coreConnectionInfo; - QHash _buffers; - QHash _networkInfo; + QHash _buffers; + QHash _statusBuffers; // fast lookup + QHash _networks; + QHash _identities; + + Buffer *_monitorBuffer; QTimer *layoutTimer; QList layoutQueue; - QVariantMap sessionData; - + static AccountId _currentCoreAccount; + friend class ClientSyncer; }; #endif