/***************************************************************************
- * 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 *
#ifndef _CORESESSION_H_
#define _CORESESSION_H_
-#include <QObject>
#include <QString>
#include <QVariant>
#include "message.h"
-class Server;
+class Identity;
+class NetworkConnection; // FIXME get rid of
+class Network;
class SignalProxy;
-class Storage;
+
+class QScriptEngine;
class CoreSession : public QObject {
Q_OBJECT
public:
- CoreSession(UserId, Storage *, QObject *parent = 0);
- virtual ~CoreSession();
+ CoreSession(UserId, bool restoreState, QObject *parent = 0);
+ ~CoreSession();
- NetworkId getNetworkId(const QString &network) const;
QList<BufferInfo> buffers() const;
- UserId userId() const;
+ UserId user() const;
+ Network *network(NetworkId) const;
+ NetworkConnection *networkConnection(NetworkId) const;
+ Identity *identity(IdentityId) const;
+
QVariant sessionState();
//! Retrieve a piece of session-wide data.
SignalProxy *signalProxy() const;
- void attachServer(Server *server);
+ void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
- QVariant state() const;
- void restoreState(const QVariant &previousState);
+ void saveSessionState() const;
+ void restoreSessionState();
public slots:
//! Store a piece session-wide data and distribute it to connected clients.
void storeSessionData(const QString &key, const QVariant &data);
- void serverStateRequested();
+ void networkStateRequested();
- void addClient(QIODevice *connection);
+ void addClient(QObject *socket);
void connectToNetwork(QString, const QVariant &previousState = QVariant());
- //void connectToNetwork(NetworkId);
+ void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+ void disconnectFromNetwork(NetworkId id);
//void processSignal(ClientSignal, QVariant, QVariant, QVariant);
void sendBacklog(BufferInfo, QVariant, QVariant);
- void msgFromGui(BufferInfo, QString message);
+ 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);
+
+ //! Remove identity and propagate that fact to the clients.
+ /** \param identity The identity to be removed.
+ */
+ void removeIdentity(IdentityId identity);
signals:
- void msgFromGui(uint netid, QString buf, QString message);
+ void initialized();
+
+ //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 connectToIrc(QString net);
+ //void disconnectFromIrc(QString net);
void backlogData(BufferInfo, QVariantList, bool done);
void sessionDataChanged(const QString &key);
void sessionDataChanged(const QString &key, const QVariant &data);
+ void scriptResult(QString result);
+
+ //! 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);
+
+ //! 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);
+
private slots:
void recvStatusMsgFromServer(QString msg);
void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
- void serverConnected(uint networkid);
- void serverDisconnected(uint networkid);
+ void networkConnected(NetworkId networkid);
+ void networkDisconnected(NetworkId 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 scriptRequest(QString script);
private:
- UserId user;
-
+ void initScriptEngine();
+
+ UserId _user;
+
SignalProxy *_signalProxy;
- Storage *storage;
- QHash<NetworkId, Server *> servers;
-
+ QHash<NetworkId, NetworkConnection *> _connections;
+ QHash<NetworkId, Network *> _networks;
+ QHash<IdentityId, Identity *> _identities;
+
QVariantMap sessionData;
- QMutex mutex;
+
+ QScriptEngine *scriptEngine;
+
};
#endif