i3/sway: fix multi monitor crash

Author: nydragon

src/x11/i3/ipc/connection.cpp

@@ -60,7 +60,7 @@ QByteArray I3Ipc::buildRequestMessage(EventCode cmd, const QByteArray& payload)
 	std::memcpy(lenBytes.data(), &len, 4);
 	std::memcpy(typeBytes.data(), &cmd, 4);
 
-	QByteArray data = QByteArray("i3-ipc") + lenBytes + typeBytes + payload;
+	QByteArray data = QByteArray(MAGIC) + lenBytes + typeBytes + payload;
 
 	return data;
 }
@@ -126,10 +126,10 @@ void I3Ipc::eventSocketReady() {
 
 QVector<Event> I3Ipc::parseResponse(QByteArray rawEvent) {
 	QVector<std::tuple<EventCode, QJsonDocument>> events;
+	int magicLen = 6;
+	int header = 8 + magicLen;
 
-	while (true) {
-		int magicLen = 6;
-
+	while (rawEvent.startsWith(MAGIC)) {
 		QDataStream ds(QByteArray(rawEvent.data() + magicLen, 8)); // NOLINT
 
 		ds.setByteOrder(static_cast<QDataStream::ByteOrder>(QSysInfo::ByteOrder));
@@ -140,21 +140,24 @@ QVector<Event> I3Ipc::parseResponse(QByteArray rawEvent) {
 		ds >> size;
 		ds >> type;
 
-		auto byteData = QByteArrayView(rawEvent.data() + magicLen + 8, size) // NOLINT
-		                    .trimmed();
+		if (I3IpcEvent::intToEvent(type) == EventCode::UNKNOWN) {
+			qWarning(logi3Ipc) << "Received unknown event" << rawEvent;
+			return events;
+		}
+
+		auto byteData = QByteArray(rawEvent.data() + header, size); // NOLINT
 
 		QJsonParseError e;
 
-		auto data = QJsonDocument::fromJson(byteData.toByteArray(), &e);
+		auto data = QJsonDocument::fromJson(byteData, &e);
 
 		if (e.error != QJsonParseError::NoError) {
-			qWarning(logi3Ipc) << "Invalid JSON value:" << e.errorString() << "\n\t" << rawEvent;
+			qWarning(logi3Ipc) << "Invalid JSON value:" << e.errorString() << "\n\t" << byteData;
 		} else {
 			events.push_back(std::tuple(I3IpcEvent::intToEvent(type), data));
 		}
 
-		rawEvent = rawEvent.sliced(magicLen + 8 + size);
-		if (!rawEvent.startsWith("i3-ipc")) break;
+		rawEvent = rawEvent.sliced(header + size);
 	}
 
 	return events;
@@ -329,7 +332,6 @@ void I3Ipc::refreshMonitors() {
 		monitor->updateFromObject(object);
 
 		if (monitor->focused()) {
-			// TODO: Set focused Monitor
 			this->setFocusedMonitor(monitor);
 		}
 
@@ -375,8 +377,9 @@ void I3Ipc::onEvent(I3IpcEvent* event) {
 void I3Ipc::handleWorkspaceEvent(I3IpcEvent* event) {
 	// If a workspace doesn't exist, and is being switch to, no focus change event is emited,
 	// only the init one, which does not contain the previously focused workspace
+	auto change = event->mData["change"];
 
-	if (event->mData["change"] == "init") {
+	if (change == "init") {
 		qCInfo(logi3IpcEvents) << "New workspace has been created";
 
 		auto workspaceData = event->mData["current"];
@@ -390,14 +393,7 @@ void I3Ipc::handleWorkspaceEvent(I3IpcEvent* event) {
 		this->mWorkspaces.insertObject(workspace);
 		qCInfo(logi3Ipc) << "Added workspace to list";
 
-		// Since we don't get a focus change event, we need to manually update the
-		// status of all workspaces to find out which has the focus, as "init"
-		// could also be caused by another action, which isn't a focus change
-		this->refreshWorkspaces();
-	}
-
-	if (event->mData["change"] == "focus") {
-
+	} else if (change == "focus") {
 		auto oldName = event->mData["old"]["name"].toString();
 		auto newName = event->mData["current"]["name"].toString();
 
@@ -415,9 +411,7 @@ void I3Ipc::handleWorkspaceEvent(I3IpcEvent* event) {
 		}
 
 		this->setFocusedWorkspace(newWorkspace);
-	}
-
-	if (event->mData["change"] == "empty") {
+	} else if (change == "empty") {
 		auto name = event->mData["current"]["name"].toString();
 
 		auto* oldWorkspace = I3Ipc::findWorkspaceByName(name);

src/x11/i3/ipc/connection.hpp

@@ -13,6 +13,7 @@
 #include "../../../core/model.hpp"
 
 namespace qs::i3::ipc {
+
 class I3Workspace;
 class I3Monitor;
 } // namespace qs::i3::ipc
@@ -22,6 +23,8 @@ Q_DECLARE_OPAQUE_POINTER(qs::i3::ipc::I3Monitor*);
 
 namespace qs::i3::ipc {
 
+constexpr std::string MAGIC = "i3-ipc";
+
 enum EventCode {
 	RUN_COMMAND = 0,    // NOLINT
 	GET_WORKSPACES = 1, // NOLINT