i3/sway: fix formatting, lint & avoid writing to socket if connection is not open

Author: nydragon

src/x11/i3/ipc/CMakeLists.txt

@@ -7,8 +7,8 @@ qt_add_library(quickshell-i3-ipc STATIC
 
 qt_add_qml_module(quickshell-i3-ipc
 	URI Quickshell.I3._Ipc
-    VERSION 0.1
-    DEPENDENCIES QtQml
+	VERSION 0.1
+	DEPENDENCIES QtQml
 )
 
 qs_add_module_deps_light(quickshell-i3-ipc Quickshell)

src/x11/i3/ipc/connection.cpp

@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <array>
+#include <cstring>
 #include <tuple>
 
 #include <bit>
@@ -33,6 +34,10 @@ Q_LOGGING_CATEGORY(logI3IpcEvents, "quickshell.I3.ipc.events", QtWarningMsg);
 namespace qs::i3::ipc {
 
 void I3Ipc::makeRequest(const QByteArray& request) {
+	if (!this->valid) {
+		qCWarning(logI3IpcEvents) << "IPC connection is not open, ignoring request.";
+		return;
+	}
 	this->liveEventSocket.write(request);
 	this->liveEventSocket.flush();
 }
@@ -85,15 +90,14 @@ void I3Ipc::subscribe() {
 	auto payload = QByteArray(R"(["workspace","output"])");
 	auto message = I3Ipc::buildRequestMessage(EventCode::Subscribe, payload);
 
-	this->liveEventSocket.write(message);
-	this->liveEventSocket.flush();
+	this->makeRequest(message);
 
 	this->refreshWorkspaces();
 	this->refreshMonitors();
 }
 
 void I3Ipc::eventSocketReady() {
-	for (auto& [type, data]: I3Ipc::parseResponse()) {
+	for (auto& [type, data]: this->parseResponse()) {
 		this->event.mCode = type;
 		this->event.mData = data;
 
@@ -366,7 +370,7 @@ void I3Ipc::onEvent(I3IpcEvent* event) {
 	case EventCode::Subscribe: qCInfo(logI3Ipc) << "Connected to IPC"; return;
 	case EventCode::GetOutputs: this->handleGetOutputsEvent(event); return;
 	case EventCode::GetWorkspaces: this->handleWorkspaceEvent(event); return;
-	case EventCode::RunCommand: this->handleRunCommand(event); return;
+	case EventCode::RunCommand: I3Ipc::handleRunCommand(event); return;
 	case EventCode::Unknown:
 		qCWarning(logI3Ipc) << "Unknown event:" << event->type() << event->data();
 		return;
@@ -377,10 +381,10 @@ void I3Ipc::onEvent(I3IpcEvent* event) {
 void I3Ipc::handleRunCommand(I3IpcEvent* event) {
 	for (auto r: event->mData.array()) {
 		auto obj = r.toObject();
-		bool success = obj["success"].toBool();
+		const bool success = obj["success"].toBool();
 
 		if (!success) {
-			QString error = obj["error"].toString();
+			const QString error = obj["error"].toString();
 			qCWarning(logI3Ipc) << "Error occured while running command:" << error;
 		}
 	}

src/x11/i3/ipc/connection.hpp

@@ -126,7 +126,7 @@ private slots:
 	void handleWorkspaceEvent(I3IpcEvent* event);
 	void handleGetWorkspacesEvent(I3IpcEvent* event);
 	void handleGetOutputsEvent(I3IpcEvent* event);
-	void handleRunCommand(I3IpcEvent* event);
+	static void handleRunCommand(I3IpcEvent* event);
 
 	void reconnectIPC();
 

src/x11/i3/ipc/qml.cpp

@@ -1,6 +1,5 @@
 #include "qml.hpp"
 
-#include <qjsonarray.h>
 #include <qobject.h>
 #include <qstring.h>