X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=f8134ccfeddf250b5fae8f521c07b8e3913ca1a2;hp=54af24ede946166308b10b508e67acd65e876e6d;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=2039f5e28eeb431e394f1c2468a26218bd926538 diff --git a/src/core/coresession.h b/src/core/coresession.h index 54af24ed..f8134ccf 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development 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 * @@ -21,75 +21,167 @@ #ifndef _CORESESSION_H_ #define _CORESESSION_H_ -#include #include #include -#include "coreproxy.h" +#include "message.h" -class Server; -class Storage; +class BufferSyncer; +class Identity; +class NetworkConnection; +class Network; +struct NetworkInfo; +class SignalProxy; + +class QScriptEngine; class CoreSession : public QObject { Q_OBJECT - public: - CoreSession(UserId, Storage *); - ~CoreSession(); +public: + CoreSession(UserId, bool restoreState, QObject *parent = 0); + ~CoreSession(); + + QList buffers() const; + UserId user() const; + Network *network(NetworkId) const; + NetworkConnection *networkConnection(NetworkId) const; + Identity *identity(IdentityId) const; + + QVariant sessionState(); + + SignalProxy *signalProxy() const; + + void attachNetworkConnection(NetworkConnection *conn); + + //! Return necessary data for restoring the session after restarting the core + void saveSessionState() const; + void restoreSessionState(); + +public slots: + void networkStateRequested(); + + void addClient(QObject *socket); + +// void connectToNetwork(QString, const QVariant &previousState = QVariant()); + void connectToNetwork(NetworkId); + void disconnectFromNetwork(NetworkId id); + + //void processSignal(ClientSignal, QVariant, QVariant, QVariant); + void sendBacklog(BufferInfo, QVariant, QVariant); + void msgFromClient(BufferInfo, QString message); + + //! Create an identity and propagate the changes to the clients. + /** \param identity The identity to be created. + */ + void createIdentity(const Identity &identity); + + //! Update an identity and propagate the changes to the clients. + /** \param identity The identity to be updated. + */ + void updateIdentity(const Identity &identity); - QList buffers() const; - UserId userId() const; - QVariant sessionState(); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); - public slots: - //! Store a piece session-wide data and distribute it to connected clients. - void storeSessionData(const QString &key, const QVariant &data); + //! Create a network and propagate the changes to the clients. + /** \param info The network's settings. + */ + void createNetwork(const NetworkInfo &info); - public: - //! Retrieve a piece of session-wide data. - QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant()); + //! Update a network and propagate the changes to the clients. + /** \param info The updated network settings. + */ + void updateNetwork(const NetworkInfo &info); - CoreProxy *proxy(); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeNetwork(NetworkId network); - public slots: - void connectToIrc(QStringList); - void processSignal(ClientSignal, QVariant, QVariant, QVariant); - void sendBacklog(BufferId, QVariant, QVariant); - void msgFromGui(BufferId, QString message); - void sendServerStates(); + //! Remove a buffer and it's backlog permanently + /** \param bufferId The id of the buffer to be removed. + * emits bufferRemoved(bufferId) on success. + */ + void removeBufferRequested(BufferId bufferId); - signals: - void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); + //! Rename a Buffer for a given network + /* \param networkId The id of the network the buffer belongs to + * \param newName The new name of the buffer + * \param oldName The old name of the buffer + * emits bufferRenamed(bufferId, newName) on success. + */ + void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); + +signals: + void initialized(); - void msgFromGui(QString net, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); + //void msgFromGui(uint netid, QString buf, QString message); + void displayMsg(Message message); + void displayStatusMsg(QString, QString); - void connectToIrc(QString net); - void disconnectFromIrc(QString net); - void serverStateRequested(); + //void connectToIrc(QString net); + //void disconnectFromIrc(QString net); - void backlogData(BufferId, QList, bool done); + void backlogData(BufferInfo, QVariantList, bool done); - void bufferIdUpdated(BufferId); - void sessionDataChanged(const QString &key); - void sessionDataChanged(const QString &key, const QVariant &data); + void bufferInfoUpdated(BufferInfo); - private slots: - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); - void serverConnected(QString net); - void serverDisconnected(QString net); + void scriptResult(QString result); - private: - UserId user; + //! Identity has been created. + /** This signal is propagated to the clients to tell them that the given identity has been created. + * \param identity The new identity. + */ + void identityCreated(const Identity &identity); - CoreProxy *coreProxy; - Storage *storage; - QHash servers; + //! Identity has been removed. + /** This signal is propagated to the clients to inform them about the removal of the given identity. + * \param identity The identity that has been removed. + */ + void identityRemoved(IdentityId identity); + + void networkCreated(NetworkId); + void networkRemoved(NetworkId); + void bufferRemoved(BufferId); + void bufferRenamed(BufferId, QString); - VarMap sessionData; - QMutex mutex; +private slots: + void recvStatusMsgFromServer(QString msg); + void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); + void networkConnected(NetworkId networkid); + void networkDisconnected(NetworkId networkid); + + void destroyNetwork(NetworkId); + + //! Called when storage updated a BufferInfo. + /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers. + * \param user The buffer's owner (not necessarily us) + * \param bufferInfo The updated BufferInfo + */ + void updateBufferInfo(UserId user, const BufferInfo &bufferInfo); + + void storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen); + + void scriptRequest(QString script); + +private: + void loadSettings(); + void initScriptEngine(); + + UserId _user; + + SignalProxy *_signalProxy; + QHash _connections; + QHash _networks; + QHash _networksToRemove; + QHash _identities; + + BufferSyncer *_bufferSyncer; + + QScriptEngine *scriptEngine; };