4 files changed, 22 insertions, 3 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index 54ac2d3c..e8bd6245 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -32,8 +32,14 @@ PanelWindow {
   implicitHeight: 21
   color: "transparent"
 
+  property bool haveScreenshare: Array.from(NiriService.casts).some(cast => cast.target.Output?.name == bar.screen.name)
+
   Rectangle {
-    color: bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75)
+    color: {
+      if (bar.haveScreenshare)
+        return bar.haveMaximizedWindow ? Qt.rgba(0.2, 0, 0, 1) : Qt.rgba(0.2, 0, 0, 0.75);
+      return bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75);
+    }
     anchors.fill: parent
     // bottomLeftRadius: 8
     // bottomRightRadius: 8
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
index fc2e1f9f..30fa68b5 100644
--- a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -35,8 +35,11 @@ Scope {
     target: Custom.Systemd
     function onSleep(before: bool) {
       console.log(`received prepare for sleep ${before}`);
-      if (before)
+      if (before) {
         lock.locked = true;
+        if (pam.active)
+          pam.abort();
+      }
     }
     function onLock() { lock.locked = true; }
     function onUnlock() { lock.locked = false; }
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index 6dbff134..cd4ed125 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -74,6 +74,10 @@ Singleton {
             eventWindowFocusTimestampChanged(event.WindowFocusTimestampChanged);
           else if (event.CastsChanged)
             root.casts = event.CastsChanged.casts
+          else if (event.CastStartedOrChanged)
+            eventCastStartedOrChanged(event.CastStartedOrChanged);
+          else if (event.CastStopped)
+            eventCastStopped(event.CastStopped);
           else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
           else if (event.OverviewOpenedOrClosed) {}
           else if (event.ConfigLoaded) {}
@@ -203,4 +207,10 @@ Singleton {
       return win;
     });
   }
+  function eventCastStartedOrChanged(data) {
+    root.casts = [...Array.from(root.casts).filter(cast => cast.stream_id !== data.cast.stream_id), data.cast];
+  }
+  function eventCastStopped(data) {
+    root.casts = Array.from(root.casts).filter(cast => cast.stream_id !== data.stream_id);
+  }
 }
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
index 3c524955..c71a9cca 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -4,5 +4,5 @@ Custom.FileSelector {
   id: root
 
   directory: @wallpapers@
-  epoch: 72000000
+  epoch: 79200000
 }