feat(examples): color the focused window's dot using the state file's column and row

commit: 32a3738649981b53be8df34af11b88de7892bc9b
author: brice · 17d ago · 2026-10-05 18:55 UTC
parent: 2f98a9a
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +24 -13

M examples/bundle/left.sh +24 -13

@@ -1,8 +1,9 @@
1	1		#!/bin/bash
2	2		# Left: the active workspace as an accent block that fades into the bar, then
3		-	# the workspaces with one dot per window. The active workspace shows only its
4		-	# dots. On NeferWL it also shows the stash. Without NeferWL's state file it
5		-	# shows nothing.
	3	+	# the workspaces with one dot per window, in layout order (left to right). The
	4	+	# active workspace shows only its dots, and the focused window's dot is in the
	5	+	# accent color. On NeferWL it also shows the stash. Without NeferWL's state file
	6	+	# it shows nothing.
6	7		. "$(dirname "$0")/lib.sh"
7	8
8	9		DOT=$ICON_DOT STASH=$ICON_STASH

@@ -13,16 +14,21 @@ DOT=$ICON_DOT STASH=$ICON_STASH
13	14
14	15		draw() {
15	16		# First line: "<active> <count>" of the focused output. Then one line per
16		-	# workspace: "<n> <windows> <stashed>".
17		-	local data active count n w s line pips
	17	+	# workspace: "<n> <windows> <stashed> <focused>", where <focused> is the
	18	+	# place (from 1) of the focused window in the workspace's layout order, or 0.
	19	+	# Windows are ordered by column, then row; floating ones (column 0) come last.
	20	+	local data active count n w s f line pips i color
18	21		data=$(jq -r '
19	22		.output as $o
20	23		\| (.outputs[] \| select(.name == $o)) as $out
21	24		\| [.windows[] \| select(.output == $o)] as $ws
	25	+	\| (if .window.output == $o then .window.id else null end) as $focus
22	26		\| "\($out.active) \($out.count)",
23	27		(range(1; $out.count + 1) as $n
24		-	\| [$ws[] \| select(.workspace == $n)] as $here
25		-	\| "\($n) \($here \| length) \([$here[] \| select(.stash_count > 0)] \| length)")' \
	28	+	\| [$ws[] \| select(.workspace == $n)]
	29	+	\| sort_by([(if (.column // 0) > 0 then .column else 1000000 end), (.row // 0), .id]) as $here
	30	+	\| (if $focus == null then null else ($here \| map(.id) \| index($focus)) end) as $at
	31	+	\| "\($n) \($here \| length) \([$here[] \| select(.stash_count > 0)] \| length) \(if $at == null then 0 else $at + 1 end)")' \
26	32		"$NEFERWL_STATE" 2>/dev/null) \|\| return
27	33		read -r active count <<<"$(head -1 <<<"$data")"
28	34		# The state file is data, not code: bash arithmetic runs command

@@ -30,18 +36,23 @@ draw() {
30	36		[[ $active =~ ^[0-9]+$ && $count =~ ^[0-9]+$ ]] \|\| return
31	37
32	38		line="$(bg "$ACCENT")$(fg "$(ink "$ACCENT")")$BOLD $active $RESET$(fade "$ACCENT" "$BAR")$(bg "$BAR")"
33		-	while read -r n w s; do
34		-	[[ $n =~ ^[0-9]+$ && $w =~ ^[0-9]+$ && $s =~ ^[0-9]+$ ]] \|\| continue
35		-	# One dot per window, at most 4.
	39	+	while read -r n w s f; do
	40	+	[[ $n =~ ^[0-9]+$ && $w =~ ^[0-9]+$ && $s =~ ^[0-9]+$ && $f =~ ^[0-9]+$ ]] \|\| continue
	41	+	# One dot per window, at most 4; a focused window past the 4th lights the 4th.
36	42		pips=""
37		-	((w > 0)) && printf -v pips "$DOT%.0s" $(seq 1 $((w > 4 ? 4 : w)))
	43	+	for ((i = 1; i <= (w > 4 ? 4 : w); i++)); do
	44	+	color=$DIM
	45	+	((n == active)) && color=$NEFERBAR_FOREGROUND
	46	+	((i == (f > 4 ? 4 : f))) && color=$ACCENT
	47	+	pips+="$(fg "$color")$DOT"
	48	+	done
38	49		if ((n == active)); then
39	50		# The number is already in the accent block on the left.
40		-	line+="$(fg "$NEFERBAR_FOREGROUND") $pips"
	51	+	line+=" $pips"
41	52		((s > 0)) && line+="$(fg "$NEFERBAR_COLOR2") $STASH$s"
42	53		line+=" "
43	54		elif ((w > 0)); then
44		-	line+="$(fg "$NEFERBAR_FOREGROUND") $n $(fg "$DIM")$pips "
	55	+	line+="$(fg "$NEFERBAR_FOREGROUND") $n $pips "
45	56		else
46	57		line+="$(fg "$DIM") $n "
47	58		fi

 #!/bin/bash
 # Left: the active workspace as an accent block that fades into the bar, then
-# the workspaces with one dot per window. The active workspace shows only its
+# the workspaces with one dot per window, in layout order (left to right). The
-# dots. On NeferWL it also shows the stash. Without NeferWL's state file it
+# active workspace shows only its dots, and the focused window's dot is in the
-# shows nothing.
+# accent color. On NeferWL it also shows the stash. Without NeferWL's state file
+# it shows nothing.
 . "$(dirname "$0")/lib.sh"
 DOT=$ICON_DOT STASH=$ICON_STASH
 draw() {
 	# First line: "<active> <count>" of the focused output. Then one line per
-	# workspace: "<n> <windows> <stashed>".
+	# workspace: "<n> <windows> <stashed> <focused>", where <focused> is the
-	local data active count n w s line pips
+	# place (from 1) of the focused window in the workspace's layout order, or 0.
+	# Windows are ordered by column, then row; floating ones (column 0) come last.
+	local data active count n w s f line pips i color
 	data=$(jq -r '
 		.output as $o
 		| (.outputs[] | select(.name == $o)) as $out
 		| [.windows[] | select(.output == $o)] as $ws
+		| (if .window.output == $o then .window.id else null end) as $focus
 		| "\($out.active) \($out.count)",
 		  (range(1; $out.count + 1) as $n
-		   | [$ws[] | select(.workspace == $n)] as $here
+		   | [$ws[] | select(.workspace == $n)]
-		   | "\($n) \($here | length) \([$here[] | select(.stash_count > 0)] | length)")' \
+		   | sort_by([(if (.column // 0) > 0 then .column else 1000000 end), (.row // 0), .id]) as $here
+		   | (if $focus == null then null else ($here | map(.id) | index($focus)) end) as $at
+		   | "\($n) \($here | length) \([$here[] | select(.stash_count > 0)] | length) \(if $at == null then 0 else $at + 1 end)")' \
 		"$NEFERWL_STATE" 2>/dev/null) || return
 	read -r active count <<<"$(head -1 <<<"$data")"
 	# The state file is data, not code: bash arithmetic runs command
 	[[ $active =~ ^[0-9]+$ && $count =~ ^[0-9]+$ ]] || return
 	line="$(bg "$ACCENT")$(fg "$(ink "$ACCENT")")$BOLD  $active $RESET$(fade "$ACCENT" "$BAR")$(bg "$BAR")"
-	while read -r n w s; do
+	while read -r n w s f; do
-		[[ $n =~ ^[0-9]+$ && $w =~ ^[0-9]+$ && $s =~ ^[0-9]+$ ]] || continue
+		[[ $n =~ ^[0-9]+$ && $w =~ ^[0-9]+$ && $s =~ ^[0-9]+$ && $f =~ ^[0-9]+$ ]] || continue
-		# One dot per window, at most 4.
+		# One dot per window, at most 4; a focused window past the 4th lights the 4th.
 		pips=""
-		((w > 0)) && printf -v pips "$DOT%.0s" $(seq 1 $((w > 4 ? 4 : w)))
+		for ((i = 1; i <= (w > 4 ? 4 : w); i++)); do
+			color=$DIM
+			((n == active)) && color=$NEFERBAR_FOREGROUND
+			((i == (f > 4 ? 4 : f))) && color=$ACCENT
+			pips+="$(fg "$color")$DOT"
+		done
 		if ((n == active)); then
 			# The number is already in the accent block on the left.
-			line+="$(fg "$NEFERBAR_FOREGROUND") $pips"
+			line+=" $pips"
 			((s > 0)) && line+="$(fg "$NEFERBAR_COLOR2") $STASH$s"
 			line+=" "
 		elif ((w > 0)); then
-			line+="$(fg "$NEFERBAR_FOREGROUND") $n $(fg "$DIM")$pips "
+			line+="$(fg "$NEFERBAR_FOREGROUND") $n $pips "
 		else
 			line+="$(fg "$DIM") $n "
 		fi