i3/sway: handle broken messages by forwarding to the next magic sequence

Author: nydragon

src/x11/i3/ipc/connection.cpp

@@ -138,20 +138,33 @@ QVector<Event> I3Ipc::parseResponse(QByteArray rawEvent) {
 	const int magicLen = 6;
 	const int header = 8 + magicLen;
 
-	while (rawEvent.startsWith(MAGIC)) {
+	while (true) {
+		auto magicSeqInd = rawEvent.indexOf(MAGIC);
+
+		if (magicSeqInd < 0) {
+			qCWarning(logI3Ipc) << "No magic sequence found in string.";
+			break;
+		};
+
+		if (magicSeqInd > 0) {
+			rawEvent = rawEvent.sliced(magicSeqInd);
+		}
+
 		auto eventLength = rawEvent.length();
 
 		if (eventLength < header) {
 			qCWarning(logI3Ipc) << "Event isn't long enough to hold the header data (14 bytes).";
 			break;
 		};
 
-		QDataStream ds(QByteArray(rawEvent.data() + magicLen, 8)); // NOLINT
+		rawEvent = rawEvent.sliced(magicLen);
+
+		QDataStream ds(rawEvent);
 
 		ds.setByteOrder(static_cast<QDataStream::ByteOrder>(QSysInfo::ByteOrder));
 
-		quint32 size = 0;
-		quint32 type = 0;
+		qint32 size = 0;
+		qint32 type = EventCode::UNKNOWN;
 
 		ds >> size;
 		ds >> type;
@@ -169,19 +182,17 @@ QVector<Event> I3Ipc::parseResponse(QByteArray rawEvent) {
 			break;
 		}
 
-		auto byteData = QByteArray(rawEvent.data() + header, size); // NOLINT
+		rawEvent = rawEvent.sliced(8);
 
 		QJsonParseError e;
 
-		auto data = QJsonDocument::fromJson(byteData, &e);
+		auto data = QJsonDocument::fromJson(rawEvent.sliced(0, size), &e);
 
 		if (e.error != QJsonParseError::NoError) {
-			qCWarning(logI3Ipc) << "Invalid JSON value:" << e.errorString() << "\n\t" << byteData;
+			qCWarning(logI3Ipc) << "Invalid JSON value:" << e.errorString() << "\n\t" << rawEvent;
 		} else {
 			events.push_back(std::tuple(I3IpcEvent::intToEvent(type), data));
 		}
-
-		rawEvent = rawEvent.sliced(header + size);
 	}
 
 	return events;

src/x11/i3/ipc/monitor.cpp

@@ -32,7 +32,7 @@ void I3Monitor::updateFromObject(const QVariantMap& obj) {
 	auto width = rect.value("width").value<qint32>();
 	auto height = rect.value("height").value<qint32>();
 	auto scale = obj.value("scale").value<qreal>();
-	auto focused = obj.value("focus").value<bool>();
+	auto focused = obj.value("active").value<bool>();
 
 	if (id != this->mId) {
 		this->mId = id;