X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=33b09d77a63fbcd12082e6ac55adf31a87c1b3a3;hp=66e273546bc20f838947ff1ffb744d2c18321696;hb=f6f6f3e368543f0a4dce1dae772f161d7e357064;hpb=48151f63e7f953bf07828be39ba314095c472c74

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 66e27354..33b09d77 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-07 by the Quassel IRC Team                         *
  *   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        *
@@ -31,66 +31,83 @@ class Server;
 class SignalProxy;
 class Storage;
 
+class QScriptEngine;
+
 class CoreSession : public QObject {
   Q_OBJECT
 
-  public:
-    CoreSession(UserId, Storage *, QObject *parent = 0);
-    ~CoreSession();
+public:
+  CoreSession(UserId, Storage *, QObject *parent = 0);
+  virtual ~CoreSession();
+
+  NetworkId getNetworkId(const QString &network) const;
+  QList<BufferInfo> buffers() const;
+  UserId userId() const;
+  QVariant sessionState();
+
+  //! Retrieve a piece of session-wide data.
+  QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+
+  SignalProxy *signalProxy() const;
 
-    QList<BufferId> buffers() const;
-    UserId userId() const;
-    QVariant sessionState();
+  void attachServer(Server *server);
 
-  public slots:
-    //! Store a piece session-wide data and distribute it to connected clients.
-    void storeSessionData(const QString &key, const QVariant &data);
+  //! Return necessary data for restoring the session after restarting the core
+  QVariant state() const;
+  void restoreState(const QVariant &previousState);
 
-    void addClient(QIODevice *connection);
+public slots:
+  //! Store a piece session-wide data and distribute it to connected clients.
+  void storeSessionData(const QString &key, const QVariant &data);
 
-  public:
-    //! Retrieve a piece of session-wide data.
-    QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+  void serverStateRequested();
 
-    SignalProxy *signalProxy() const;
+  void addClient(QIODevice *connection);
 
-  public slots:
-    void connectToNetwork(QString);
-    //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
-    void sendBacklog(BufferId, QVariant, QVariant);
-    void msgFromGui(BufferId, QString message);
-    void sendServerStates();
+  void connectToNetwork(QString, const QVariant &previousState = QVariant());
+  //void connectToNetwork(NetworkId);
 
-  signals:
-    void msgFromGui(QString net, QString buf, QString message);
-    void displayMsg(Message message);
-    void displayStatusMsg(QString, QString);
+  //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
+  void sendBacklog(BufferInfo, QVariant, QVariant);
+  void msgFromGui(BufferInfo, QString message);
 
-    void connectToIrc(QString net);
-    void disconnectFromIrc(QString net);
-    void serverStateRequested();
+signals:
+  void msgFromGui(uint netid, QString buf, QString message);
+  void displayMsg(Message message);
+  void displayStatusMsg(QString, QString);
 
-    void backlogData(BufferId, QVariantList, bool done);
+  void connectToIrc(QString net);
+  void disconnectFromIrc(QString net);
 
-    void bufferIdUpdated(BufferId);
-    void sessionDataChanged(const QString &key);
-    void sessionDataChanged(const QString &key, const QVariant &data);
+  void backlogData(BufferInfo, QVariantList, bool done);
 
-  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 bufferInfoUpdated(BufferInfo);
+  void sessionDataChanged(const QString &key);
+  void sessionDataChanged(const QString &key, const QVariant &data);
 
-  private:
-    UserId user;
+  void scriptResult(QString result);
+				   
+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);
 
-   SignalProxy *_signalProxy;
-    Storage *storage;
-    QHash<QString, Server *> servers;
+  void scriptRequest(QString script);
+  
+private:
+  void initScriptEngine();
+  
+  UserId user;
+  
+  SignalProxy *_signalProxy;
+  Storage *storage;
+  QHash<NetworkId, Server *> servers;
+  
+  QVariantMap sessionData;
+  QMutex mutex;
 
-    QVariantMap sessionData;
-    QMutex mutex;
+  QScriptEngine *scriptEngine;
 };
 
 #endif