1 files changed, 12 insertions, 8 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index 914152e1..af522ec4 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -13,10 +13,6 @@ Singleton {
   property var windows: []
   readonly property string socketPath: Quickshell.env("NIRI_SOCKET")
 
-  onKeyboardLayoutsChanged: {
-    console.log(JSON.stringify(keyboardLayouts));
-  }
-
   function refreshOutputs() {
     commandSocket.sendCommand("Outputs", data => {
       outputs = data.Ok.Outputs;
@@ -32,9 +28,12 @@ Singleton {
     path: root.socketPath
     connected: true
 
+    property bool acked: false
+
     onConnectionStateChanged: {
       if (connected) {
-        write('"EventStream"\n')
+        acked = false;
+        write('"EventStream"\n');
       }
     }
 
@@ -70,6 +69,11 @@ Singleton {
             eventWindowUrgencyChanged(event.WindowUrgencyChanged);
           else if (event.WindowLayoutsChanged)
             eventWindowLayoutsChanged(event.WindowLayoutsChanged);
+          else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
+          else if (event.OverviewOpenedOrClosed) {}
+          else if (event.ConfigLoaded) {}
+          else
+            console.log(JSON.stringify(event));
         } catch (e) {
           console.warn("NiriService: Failed to parse event:", line, e)
         }
@@ -157,10 +161,10 @@ Singleton {
   }
   function eventWindowOpenedOrChanged(data) {
     root.windows = Array.from(root.windows).map(win => {
-      if (win.id === data.window.id)
-        return data.window;
+      if (data.window.is_focused)
+        win.is_focused = false;
       return win;
-    });
+    }).filter(win => win.id !== data.window.id).concat([data.window]);
   }
   function eventWindowClosed(data) {
     root.windows = Array.from(root.windows).filter(win => win.id !== data.id);