Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
falbru committed Apr 27, 2024
1 parent 6980cf7 commit f3592e9
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 27 deletions.
7 changes: 4 additions & 3 deletions src/kakounecli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
KakouneCli::KakouneCli()
{
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString session_id = env.value("KAKQT_SESSION_ID") ;
QString session_id = env.value("KAKQT_SESSION_ID");

m_socket = new QLocalSocket();
m_socket->connectToServer("KakouneQt." + session_id);
if (!m_socket->waitForConnected()) {
if (!m_socket->waitForConnected())
{
qDebug() << "Failed to connect to server:" << m_socket->errorString();
return;
}
}

KakouneCli::~KakouneCli()
{
m_socket->disconnectFromServer();
m_socket->disconnectFromServer();
}

int KakouneCli::run(QStringList command)
Expand Down
2 changes: 1 addition & 1 deletion src/kakounecli.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define KAKOUNECLI_HPP

#include <QList>
#include <QString>
#include <QLocalSocket>
#include <QString>

class KakouneCli
{
Expand Down
33 changes: 18 additions & 15 deletions src/kakouneserver.cpp
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#include "kakouneserver.hpp"
#include <QLocalSocket>
#include <QJsonDocument>
#include <QJsonObject>
#include <QLocalSocket>

KakouneServer::KakouneServer(const QString& session_id)
KakouneServer::KakouneServer(const QString &session_id)
{
m_server = new QLocalServer(this);

if (!m_server->listen(session_id))
{
qDebug() << "Unable to start the server: " << m_server->errorString();
m_server->close();
return;
qDebug() << "Unable to start the server: " << m_server->errorString();
m_server->close();
return;
}

connect(m_server, &QLocalServer::newConnection, this, &KakouneServer::handleConnection);
Expand All @@ -24,20 +24,20 @@ KakouneServer::~KakouneServer()
delete m_server;
}

void KakouneServer::bind(MainWindow* main_window)
void KakouneServer::bind(MainWindow *main_window)
{
connect(this, &KakouneServer::newClient, main_window, &MainWindow::newClient);
connect(this, &KakouneServer::focusWindow , main_window, &MainWindow::focusWindow);
connect(this, &KakouneServer::focusWindow, main_window, &MainWindow::focusWindow);
}

void KakouneServer::handleConnection()
{
QLocalSocket *client_socket = m_server->nextPendingConnection();

connect(client_socket, &QLocalSocket::disconnected,
client_socket, &QLocalSocket::deleteLater);
connect(client_socket, &QLocalSocket::disconnected, client_socket, &QLocalSocket::deleteLater);

if (client_socket->waitForReadyRead()) {
if (client_socket->waitForReadyRead())
{
QByteArray request = client_socket->readAll();
QJsonObject request_json = QJsonDocument::fromJson(request).object();

Expand All @@ -51,10 +51,13 @@ void KakouneServer::handleCommand(QJsonObject request)
{
const QString method = request["method"].toString();
qDebug() << method;
if (method == "newClient") {
emit newClient(request["args"].isString() ? request["args"].toString() : "");
}else if (method == "focusWindow") {
qDebug() << request["client_name"].toString();
emit focusWindow(request["client_name"].toString());
if (method == "newClient")
{
emit newClient(request["args"].isString() ? request["args"].toString() : "");
}
else if (method == "focusWindow")
{
qDebug() << request["client_name"].toString();
emit focusWindow(request["client_name"].toString());
}
}
15 changes: 8 additions & 7 deletions src/kakouneserver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@
#define KAKOUNESERVER_HPP

#include "mainwindow.hpp"
#include <QObject>
#include <QLocalServer>
#include <QObject>

class KakouneServer : public QObject
{
Q_OBJECT
Q_OBJECT
public:
KakouneServer(const QString& session_id);
KakouneServer(const QString &session_id);
~KakouneServer();

void bind(MainWindow* main_window);
void bind(MainWindow *main_window);
signals:
void newClient(const QString& arguments);
void focusWindow(const QString& client_name);
void newClient(const QString &arguments);
void focusWindow(const QString &client_name);

protected:
void handleConnection();
void handleCommand(QJsonObject request);

private:
QLocalServer *m_server;

};

#endif
3 changes: 2 additions & 1 deletion src/kakounewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ KakouneWidget::KakouneWidget(const QString &session_id, DrawOptions *draw_option
m_id = QUuid::createUuid();
m_draw_options = draw_options;

m_client = new KakouneClient(session_id, client_arguments, {{"KAKQT_SESSION_ID", session_id}, {"KAKQT_WINDOW_ID", m_id.toString()}});
m_client = new KakouneClient(session_id, client_arguments,
{{"KAKQT_SESSION_ID", session_id}, {"KAKQT_WINDOW_ID", m_id.toString()}});
connect(m_client, &KakouneClient::refresh, this, &KakouneWidget::clientRefreshed);
connect(m_client, &KakouneClient::finished, this, &KakouneWidget::finished);
connect(m_client, &KakouneClient::setUIOptions, this, &KakouneWidget::setUIOptions);
Expand Down

0 comments on commit f3592e9

Please sign in to comment.