Regenerated

Droidnix/README.org

@@ -3029,45 +3029,42 @@ These are  config files for waybar
 #+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/hyprscroll-overflow.sh :noweb yes :mkdirp yes :eval never
 #!/usr/bin/env bash
 set -euo pipefail
-# Fallback JSON (hidden)
+
 fallback='{"text":" ","class":"hidden"}'
+
 # Get active workspace ID
-active_ws=$(hyprctl activeworkspace -j 2>/dev/null | jq -r '.id') || {
-    echo "$fallback"
-    exit 0
-}
-# Get all clients on the active workspace
-clients=$(hyprctl clients -j 2>/dev/null | jq "[.[] | select(.workspace.id==$active_ws)]") || {
-    echo "$fallback"
-    exit 0
-}
-# Count total windows
-count=$(echo "$clients" | jq 'length')
-# Get monitor geometry for active workspace
-monitor=$(hyprctl monitors -j 2>/dev/null | jq -r ".[] | select(.activeWorkspace==$active_ws)")
-if [[ -z "$monitor" ]]; then
-    echo "$fallback"
-    exit 0
-fi
-mon_width=$(echo "$monitor" | jq '.width')
-mon_height=$(echo "$monitor" | jq '.height')
-# Calculate number of windows that are actually visible on screen
-# Assume a window is visible if its top-left corner is inside monitor bounds
-visible_count=$(echo "$clients" | jq --argjson mw "$mon_width" --argjson mh "$mon_height" '
-    map(select(
-        .at[0] >= 0 and .at[0] < $mw and
-        .at[1] >= 0 and .at[1] < $mh
-    )) | length
+active_ws=$(hyprctl activeworkspace -j | jq '.id') || { echo "$fallback"; exit 0; }
+
+# Get all clients on this workspace
+ws_clients=$(hyprctl clients -j | jq "[.[] | select(.workspace.id==$active_ws)]")
+total_clients=$(echo "$ws_clients" | jq 'length')
+(( total_clients == 0 )) && { echo "$fallback"; exit 0; }
+
+# Get all monitors
+monitors=$(hyprctl monitors -j)
+
+# Count windows that are fully inside any monitor
+visible_count=$(jq -n --argjson clients "$ws_clients" --argjson monitors "$monitors" '
+  ($clients[] | select(
+    ($monitors[] |
+       .x <= .at[0] and (.at[0] + .size[0]) <= (.x + .width) and
+       .y <= .at[1] and (.at[1] + .size[1]) <= (.y + .height)
+    )
+  )) | length
 ')
-# Show fallback if all windows are already visible
-if (( count <= visible_count )); then
+
+# Show fallback if all windows fit
+if (( total_clients <= visible_count )); then
     echo "$fallback"
     exit 0
 fi
-# Build tooltip from window titles (escaped)
-tooltip=$(echo "$clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g')
-# Output JSON for Waybar
-echo "{\"text\":\"★ $count\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"
+
+# Build tooltip
+tooltip=$(echo "$ws_clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g')
+
+# Output JSON
+echo "{\"text\":\"★ $total_clients\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"
+
 #+END_SRC
 
 ** =.config/waybar/scripts/hyprscroll-menu.sh=

Droidnix/generated/.config/waybar/scripts/hyprscroll-overflow.sh

@@ -1,41 +1,37 @@
 #!/usr/bin/env bash
 set -euo pipefail
-# Fallback JSON (hidden)
+
 fallback='{"text":" ","class":"hidden"}'
+
 # Get active workspace ID
-active_ws=$(hyprctl activeworkspace -j 2>/dev/null | jq -r '.id') || {
-    echo "$fallback"
-    exit 0
-}
-# Get all clients on the active workspace
-clients=$(hyprctl clients -j 2>/dev/null | jq "[.[] | select(.workspace.id==$active_ws)]") || {
-    echo "$fallback"
-    exit 0
-}
-# Count total windows
-count=$(echo "$clients" | jq 'length')
-# Get monitor geometry for active workspace
-monitor=$(hyprctl monitors -j 2>/dev/null | jq -r ".[] | select(.activeWorkspace==$active_ws)")
-if [[ -z "$monitor" ]]; then
-    echo "$fallback"
-    exit 0
-fi
-mon_width=$(echo "$monitor" | jq '.width')
-mon_height=$(echo "$monitor" | jq '.height')
-# Calculate number of windows that are actually visible on screen
-# Assume a window is visible if its top-left corner is inside monitor bounds
-visible_count=$(echo "$clients" | jq --argjson mw "$mon_width" --argjson mh "$mon_height" '
-    map(select(
-        .at[0] >= 0 and .at[0] < $mw and
-        .at[1] >= 0 and .at[1] < $mh
-    )) | length
+active_ws=$(hyprctl activeworkspace -j | jq '.id') || { echo "$fallback"; exit 0; }
+
+# Get all clients on this workspace
+ws_clients=$(hyprctl clients -j | jq "[.[] | select(.workspace.id==$active_ws)]")
+total_clients=$(echo "$ws_clients" | jq 'length')
+(( total_clients == 0 )) && { echo "$fallback"; exit 0; }
+
+# Get all monitors
+monitors=$(hyprctl monitors -j)
+
+# Count windows that are fully inside any monitor
+visible_count=$(jq -n --argjson clients "$ws_clients" --argjson monitors "$monitors" '
+  ($clients[] | select(
+    ($monitors[] |
+       .x <= .at[0] and (.at[0] + .size[0]) <= (.x + .width) and
+       .y <= .at[1] and (.at[1] + .size[1]) <= (.y + .height)
+    )
+  )) | length
 ')
-# Show fallback if all windows are already visible
-if (( count <= visible_count )); then
+
+# Show fallback if all windows fit
+if (( total_clients <= visible_count )); then
     echo "$fallback"
     exit 0
 fi
-# Build tooltip from window titles (escaped)
-tooltip=$(echo "$clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g')
-# Output JSON for Waybar
-echo "{\"text\":\"★ $count\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"
+
+# Build tooltip
+tooltip=$(echo "$ws_clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g')
+
+# Output JSON
+echo "{\"text\":\"★ $total_clients\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"