sends and receives messages - gui updates

client.cpp

@@ -5,92 +5,104 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include <thread>
+#include <functional>
 #include <cstring>
 #include <QDebug>
 #include <QByteArray>
 #include <string>
 #include <iostream>
 
-void input_loop(char buffer[]) {
-    qDebug() << "Enter message: ";
-    for (;;) {
-        std::cin >> buffer;
-        if (buffer[0] != 0) {
-            return;
-        }
-    }
+/**
+ * @brief Client::createMessageHandler
+ * @param cb
+ * @return
+ */
+Client::MessageHandler Client::createMessageHandler(
+    std::function<void()> cb) {
+  return MessageHandler(cb);
 }
-//hostCombo(new QComboBox),
-//    portLineEdit(new QLineEdit),
-//    getFortuneButton(new QPushButton(tr("Get Fortune"))),
-//    tcpSocket(new QTcpSocket(this)) {
-//    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-//    in.setDevice(tcpSocket);
-//    in.setVersion(QDataStream::Qt_4_0);
-
-//    QPushButton *button = new QPushButton("Push");
-//    parent->layout()->addWidget(button);
-//    connect(button, &QPushButton::clicked, this, &Client::clicked);
-//    connect(tcpSocket, &QIODevice::readyRead, this, &Client::readFortune);
-//}
-
 
+/**
+ * @brief Client::Client
+ * @constructor
+ * @param parent
+ * @param count
+ * @param arguments
+ */
 Client::Client(QWidget *parent, int count, char** arguments) : QDialog(parent), argc(count), argv(arguments), m_client_socket_fd(-1) {}
 
-    void Client::handleMessages() {
-        char receive_buffer[2048];
-        for (;;) {
-            memset(receive_buffer, 0, 2048);
-            int bytes_received = 0;
-            bytes_received = recv(m_client_socket_fd, receive_buffer, 2048 - 2, 0);
-            receive_buffer[2047] = 0;
-            if (bytes_received == 0) {
-                break;
-            }
-            emit Client::messageReceived(QString::fromUtf8(receive_buffer, 2048));
-        }
+/**
+ * @brief Client::~Client
+ * @destructor
+ */
+Client::~Client() {
+    closeConnection();
+}
+
+ /**
+ * @brief Client::handleMessages
+ */
+void Client::handleMessages() {
+    char receive_buffer[2048];
+    for (;;) {
         memset(receive_buffer, 0, 2048);
-        ::close(m_client_socket_fd);
+        int bytes_received = 0;
+        bytes_received = recv(m_client_socket_fd, receive_buffer, 2048 - 2, 0);
+        receive_buffer[2047] = 0;
+        if (bytes_received == 0) {
+            break;
+        }
+        emit Client::messageReceived(QString::fromUtf8(receive_buffer, 2048));
     }
+    memset(receive_buffer, 0, 2048);
+    ::close(m_client_socket_fd);
+}
+
+/**
+ * @brief Client::start
+ * @return A meaningless integer
+ */
+void Client::start() {
+    m_client_socket_fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (m_client_socket_fd != -1) {
+        sockaddr_in server_socket;
+        char* end;
+        server_socket.sin_family = AF_INET;
+        auto port_value = strtol(argv[2], &end, 10);
+        if (port_value < 0 || end == argv[2]) {
+            return;
+        }
+
+        int socket_option = 1;
+        // Free up the port to begin listening again
+        setsockopt(m_client_socket_fd, SOL_SOCKET, SO_REUSEADDR, &socket_option,
+                   sizeof(socket_option));
 
-    int Client::start() {
-        m_client_socket_fd = socket(AF_INET, SOCK_STREAM, 0);
-        if (m_client_socket_fd != -1) {
-            sockaddr_in server_socket;
-            char* end;
-            server_socket.sin_family = AF_INET;
-            auto port_value = strtol(argv[2], &end, 10);
-            if (port_value < 0 || end == argv[2]) {
-                return 1;
-            }
+        server_socket.sin_port = htons(port_value);
+        inet_pton(AF_INET, argv[1], &server_socket.sin_addr.s_addr);
 
-            int socket_option = 1;
-            // Free up the port to begin listening again
-            setsockopt(m_client_socket_fd, SOL_SOCKET, SO_REUSEADDR, &socket_option,
-                       sizeof(socket_option));
+        if (::connect(m_client_socket_fd, (sockaddr*)&server_socket,
+                    sizeof(server_socket)) != -1) {
 
-            server_socket.sin_port = htons(port_value);
-            inet_pton(AF_INET, argv[1], &server_socket.sin_addr.s_addr);
+            std::function<void()> message_send_fn = [this]() {
+                this->handleMessages();
+            };
+            MessageHandler message_handler = createMessageHandler(message_send_fn);
+            // Handle received messages on separate thread
+            std::thread m_message_handling_thread(message_handler);
+            m_message_handling_thread.detach();
 
-            if (::connect(m_client_socket_fd, (sockaddr*)&server_socket,
-                        sizeof(server_socket)) != -1) {
-//                std::thread t(handleMessages);
-            } else {
-                qDebug() << errno;
-                ::close(m_client_socket_fd);
-            }
-            return 0;
+        } else {
+            qDebug() << errno;
+            ::close(m_client_socket_fd);
         }
     }
-
-void Client::requestNewFortune() {
-    QMessageBox::information(this, tr("Jigga Client"),
-                             tr("Gibs me dat fortune, punk!"));
 }
 
+/**
+ * @brief Client::sendMessage
+ * @param s[in] <const QString&> The message to send
+ */
 void Client::sendMessage(const QString& s) {
     if (m_client_socket_fd != -1) {
         QByteArray byte_array = s.toLocal8Bit();
@@ -99,3 +111,9 @@ void Client::sendMessage(const QString& s) {
         qDebug() << "You must first open a connection";
     }
 }
+
+void Client::closeConnection() {
+    if (m_client_socket_fd != -1) {
+        ::close(m_client_socket_fd);
+    }
+}

client.hpp

@@ -6,16 +6,32 @@
 #include <QTimer>
 #include <QLabel>
 #include <QString>
+#include <QThread>
+#include <thread>
 
 class Client : public QDialog
 {
     Q_OBJECT
+    QThread workerThread;
 
 public:
+
+    class MessageHandler {
+    public:
+        MessageHandler(std::function<void()> cb) : m_cb(cb) {}
+
+        void operator()() { m_cb(); }
+
+    private:
+        std::function<void()> m_cb;
+    };
+
     Client(QWidget *parent = nullptr);
     Client(QWidget *parent, int count, char** arguments);
-    void requestNewFortune();
-    int start();
+    ~Client();
+    void start();
+    void closeConnection();
+    MessageHandler createMessageHandler(std::function<void()> cb);
 
 public slots:
     void sendMessage(const QString& s);
@@ -28,4 +44,5 @@ private:
     int argc;
     char** argv;
     int m_client_socket_fd;
+    std::thread m_message_handling_thread;
 };

mainwindow.cpp

@@ -1,56 +1,71 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QCommandLinkButton>
-#include <QProcess>
 #include <QDebug>
 #include <QLabel>
 #include <QTextStream>
 #include <QString>
-#include <QVector>
 #include <QLayout>
 #include <client.hpp>
 #include <vector>
 
+/**
+ * @brief MainWindow::MainWindow
+ * @param argc
+ * @param argv
+ * @param parent
+ */
 MainWindow::MainWindow(int argc, char** argv, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     cli_argc(argc),
     cli_argv(argv) {
-    this->process = new QProcess(this);
     ui->setupUi(this);
-    ui->inputText->setText("KSupStyle YO?");
-    this->connectUi();
+    QCommandLinkButton *button = this->findChild<QCommandLinkButton*>("connect");
+    connect(button, &QCommandLinkButton::clicked, this, &MainWindow::connectClient);
+}
+
+/**
+ * @brief MainWindow::~MainWindow
+ */
+MainWindow::~MainWindow()
+{
+    delete ui;
 }
 
 /**
  * @brief MainWindow::buttonClicked
  */
 void MainWindow::connectClient() {
-    qDebug() << "You clicked the button!!";
+    qDebug() << "Connecting to KServer";
 
     Client* q_client = new Client(this, cli_argc, cli_argv);
     QObject::connect(q_client, &Client::messageReceived, this, &MainWindow::updateMessages);
+
     q_client->start();
-    QTextEdit* send_message_box = this->findChild<QTextEdit*>("inputText");
 
+    QTextEdit* send_message_box = this->findChild<QTextEdit*>("inputText");
     QPushButton* send_message_button = this->findChild<QPushButton*>("sendMessage");
-    QObject::connect(send_message_button, &QPushButton::clicked, this, [&q_client, &send_message_box]() {
+    // Handle mouse
+    QObject::connect(send_message_button, &QPushButton::clicked, this, [q_client, send_message_box]() {
         q_client->sendMessage(send_message_box->toPlainText());
+        send_message_box->clear();
     });
+    // TODO: Handle enter key
+//    QObject::connect(send_message_box, &QTextEdit::keyReleaseEvent, this, [q_client, send_message_box]() {
+//        q_client->sendMessage(send_message_box->toPlainText());
+//        send_message_box->clear();
+//    });
+
+    QPushButton* disconnect_button = this->findChild<QPushButton*>("disconnect");
+    QObject::connect(disconnect_button, &QPushButton::clicked, q_client, &Client::closeConnection);
 }
 
+/**
+ * @brief MainWindow::updateMessages
+ * @param s
+ */
 void MainWindow::updateMessages(const QString& s) {
     QLabel* message_display = this->findChild<QLabel*>("messages");
-    message_display->setText(s);
-}
-
-void MainWindow::connectUi() {
-    QCommandLinkButton *button = this->findChild<QCommandLinkButton*>("connect");
-    connect(button, &QCommandLinkButton::clicked, this, &MainWindow::connectClient);
-}
-
-
-MainWindow::~MainWindow()
-{
-    delete ui;
+    message_display->setText(message_display->text() + "\n" + s);
 }

mainwindow.h

@@ -2,7 +2,6 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QProcess>
 #include <QString>
 
 namespace Ui {
@@ -18,7 +17,6 @@ public:
     ~MainWindow();
 private:
     Ui::MainWindow *ui;
-    QProcess* process;
     void connectUi();
     void runApp();
     int cli_argc;

mainwindow.ui

@@ -69,7 +69,7 @@
      <number>0</number>
     </property>
    </widget>
-   <widget class="QPushButton" name="pushButton">
+   <widget class="QPushButton" name="disconnect">
     <property name="geometry">
      <rect>
       <x>190</x>