Another big update today.

[quassel.git] / network / server.h

diff --git a/network/server.h b/network/server.h
index b213111..dff974b 100644 (file)
--- a/network/server.h
+++ b/network/server.h
@@ -22,15 +22,19 @@
 #define _SERVER_H_
 
 #include <QtCore>
+#include <QTimer>
 #include <QtNetwork>
 
-#include "message.h"
+#include "global.h"
+#include "buffer.h"
 
 #define DEFAULT_PORT 6667
 
-/**
+/*! \file */
+
+/*! \class Server
  * This is a server object, managing a single connection to an IRC server, handling the associated channels and so on.
- * We have this run in its own thread mainly to not block other server objects or the core if something goes wrong,
+ * We have this running in its own thread mainly to not block other server objects or the core if something goes wrong,
  * e.g. if some scripts starts running wild...
  */
 
@@ -38,72 +42,62 @@ class Server : public QThread {
   Q_OBJECT
 
   public:
-    Server();
+    Server(QString network);
     ~Server();
-    static void init();
-
-    void run();
 
     // serverState state();
+    bool isConnected() { return socket.state() == QAbstractSocket::ConnectedState; }
+    QString getNetwork() { return network; }
 
   public slots:
     // void setServerOptions();
-    void connectToIrc(const QString &host, quint16 port = DEFAULT_PORT);
-    void disconnectFromIrc();
+    void connectToIrc(QString net);
+    void disconnectFromIrc(QString net);
+    void userInput(QString net, QString buffer, QString msg);
 
-    void putRawLine(const QString &input /*, Buffer *source = 0 */);
+    void putRawLine(QString input);
+    void putCmd(QString cmd, QStringList params, QString prefix = 0);
 
-  signals:
-    //void outputLine(const QString & /*, Buffer *target = 0 */);
+    //void exitThread();
 
+  signals:
     void recvRawServerMsg(QString);
-    void recvLine(QString); // temp, should send a message to the GUI
+    void sendStatusMsg(QString);
+    void sendMessage(QString buffer, QString msg);
+    void disconnected();
 
   private slots:
+    void run();
     void socketHasData();
     void socketError(QAbstractSocket::SocketError);
     void socketConnected();
     void socketDisconnected();
     void socketStateChanged(QAbstractSocket::SocketState);
 
-  private:
-    QTcpSocket *socket;
-    QTextStream stream;
-
-    void handleServerMsg(Message *);
-    void handleUserMsg(Message *);
-    static inline void dispatchServerMsg(Message *msg) { msg->getServer()->handleServerMsg(msg); }
-    static inline void dispatchUserMsg(Message *msg)   { msg->getServer()->handleUserMsg(msg); }
+    /* Message Handlers */
+    /* handleXxxxFromServer(QString prefix, QStringList params); */
+    void handleNoticeFromServer(QString, QStringList);
+    void handlePingFromServer(QString, QStringList);
 
-};
-
-class Buffer {};
-
-/*
-class TcpConnection : public QThread {
-  Q_OBJECT
+    void defaultHandlerForServer(QString cmd, QString prefix, QStringList params);
 
+  private:
+    QString network;
+    QTcpSocket socket;
+    QHash<QString, Buffer*> buffers;
 
-  public:
-    void run();
-    QAbstractSocket::SocketState state() const;
+    void handleServerMsg(QString rawMsg);
+    void handleUserMsg(QString usrMsg);
 
-  public slots:
-    void connectToHost(const QString &host, quint16 port = DEFAULT_PORT);
-    void disconnectFromHost();
-    void sendLine(const QString &);
+    class ParseError : public Exception {
+      public:
+        ParseError(QString cmd, QString prefix, QStringList params);
+    };
 
-  signals:
-    void recvLine(QString);
-    void error(QAbstractSocket::SocketError);
-    void connected();
-    void disconnected();
-    void stateChanged(QAbstractSocket::SocketState);
-
-  private:
-    QTcpSocket socket;
-    QTextStream stream;
+    class UnknownCmdError : public Exception {
+      public:
+        UnknownCmdError(QString cmd, QString prefix, QStringList params);
+    };
 };
-*/
 
 #endif