#14 test: fix flaky syncobj and capture keyboard tests

state: merged · 37f59a2 · merge commit
branch: fix/flaky-capture-syncobj → main
opened: bnema · 36h ago
updated: 36h ago

What

Fixes two tests that failed intermittently on CI (make race).

TestSyncobjProtocolErrors/surface destroyed (run 132): the first set_acquire_point already raises no_surface and the server closes the connection; the second request of setPoints could then hit EPIPE and t.Fatal. The subtest now sends only the erroring request.
TestCaptureExclusionKeyboardClamp (run 127): the test drained r.commands after sending LayerChanged, so it could drop the FocusWindow{11} the core emits for that change and then time out. drainCommands now runs before the send; TestCaptureExclusionKeyboardNone uses the same helper.

Checks

The core race reproduced on the old code (-race -count=300 -cpu 1,4 under load, capture_test.go:381: timed out); fixed, -count=500 -cpu 1,2,4 passes. The wayland EPIPE did not reproduce locally; the fix follows the CI trace.
make check, make race, make mocks-check, staticcheck ./... pass.

Commit	Subject	Author	Date	Signature	Status
0b0d373	test(core): drain capture commands before the layer change	brice	36h ago	GPG Verified
0e8d58d	test(wayland): send a single request to trigger the no_surface error	brice	36h ago	GPG Verified

Checks 1

check success

8 files · +34 -142

1/1

M docs/config.md +1 -1


@@ -54,7 +54,7 @@ See [examples/config](../examples/config) for every key with its default.
54	54		\| `animations.speed` \| `normal` \| `slow`, `normal`, `fast`, or a factor from `0.1` to `10` \|
55	55		\| `focus.follow-move` \| `off` \| Follow a column moved to another workspace \|
56	56		\| `focus.position-hint` \| `on` \| Show workspace/band dots near the output bottom for 600ms after a position change, then fade for 150ms (no fade with animations off); hidden in overview, fullscreen and session lock; never captured \|
57		-	\| `focus.flash` \| `on` \| Briefly draw an inner border, inside the window border, on the window, column or output an action changed \|
	57	+	\| `focus.flash` \| `on` \| Briefly draw an inner border on the window, column or output an action changed \|
58	58		\| `focus.flash-width` \| `2` \| Flash border width in logical pixels, `1` to `8` \|
59	59		\| `focus.flash-opacity` \| `0.6` \| Starting opacity of the flash, `0.1` to `1` \|
60	60		\| `focus.flash-duration` \| `200ms` \| Fade duration, `50ms` to `1s`; not scaled by `animations.speed` \|


@@ -54,7 +54,7 @@ See [examples/config](../examples/config) for every key with its default.
54		\| `animations.speed` \| `normal` \| `slow`, `normal`, `fast`, or a factor from `0.1` to `10` \|	54		\| `animations.speed` \| `normal` \| `slow`, `normal`, `fast`, or a factor from `0.1` to `10` \|
55		\| `focus.follow-move` \| `off` \| Follow a column moved to another workspace \|	55		\| `focus.follow-move` \| `off` \| Follow a column moved to another workspace \|
56		\| `focus.position-hint` \| `on` \| Show workspace/band dots near the output bottom for 600ms after a position change, then fade for 150ms (no fade with animations off); hidden in overview, fullscreen and session lock; never captured \|	56		\| `focus.position-hint` \| `on` \| Show workspace/band dots near the output bottom for 600ms after a position change, then fade for 150ms (no fade with animations off); hidden in overview, fullscreen and session lock; never captured \|
57	-	\| `focus.flash` \| `on` \| Briefly draw an inner border, inside the window border, on the window, column or output an action changed \|	57	+	\| `focus.flash` \| `on` \| Briefly draw an inner border on the window, column or output an action changed \|
58		\| `focus.flash-width` \| `2` \| Flash border width in logical pixels, `1` to `8` \|	58		\| `focus.flash-width` \| `2` \| Flash border width in logical pixels, `1` to `8` \|
59		\| `focus.flash-opacity` \| `0.6` \| Starting opacity of the flash, `0.1` to `1` \|	59		\| `focus.flash-opacity` \| `0.6` \| Starting opacity of the flash, `0.1` to `1` \|
60		\| `focus.flash-duration` \| `200ms` \| Fade duration, `50ms` to `1s`; not scaled by `animations.speed` \|	60		\| `focus.flash-duration` \| `200ms` \| Fade duration, `50ms` to `1s`; not scaled by `animations.speed` \|

M internal/adapters/vulkan/focus_flash_test.go +0 -28


@@ -4,7 +4,6 @@ import (
4	4		"github.com/bnema/neferwl/internal/ports"
5	5		"github.com/stretchr/testify/require"
6	6		"image"
7		-	"math"
8	7		"testing"
9	8		)
10	9

@@ -44,30 +43,3 @@ func TestFocusFlashAbsentEmptyAndThin(t *testing.T) {
44	43		require.Equal(t, [4]int32{2, 3, 3, 13}, ds[0].pc.rect)
45	44		}
46	45		}
47		-
48		-	func TestFocusFlashRoundedRing(t *testing.T) {
49		-	for _, scale := range []int{1, 2} {
50		-	r := &Renderer{width: 128, height: 128}
51		-	s := ports.Scene{Scale: float64(scale),
52		-	Flash: &ports.FocusFlash{Rect: ports.Rect{X: 8, Y: 4, W: 40, H: 30}, Width: 3, Radius: 11, Color: "#ff0000", Alpha: 0.5}}
53		-	ds := r.draws(s, nil, newDamage(&target{}, s, image.Rect(0, 0, 128, 128)))
54		-	require.Len(t, ds, 1)
55		-	d := ds[0]
56		-	require.Equal(t, uint32(flagRounded\|flagRing), d.pc.misc[1]&(flagRounded\|flagRing))
57		-	require.Equal(t, [4]int32{8 * int32(scale), 4 * int32(scale), 48 * int32(scale), 34 * int32(scale)}, d.pc.rect)
58		-	require.Equal(t, float32(0.5), d.pc.color[3])
59		-	require.Equal(t, math.Float32bits(float32(11*scale)), d.radii[0])
60		-	require.Equal(t, math.Float32bits(float32(8*scale)), d.radii[1])
61		-	require.Equal(t, roundRect(image.Rect(11scale, 7scale, 45scale, 31scale)), d.roundInner)
62		-	}
63		-	}
64		-
65		-	func TestFocusFlashZeroRadiusStaysSquare(t *testing.T) {
66		-	r := &Renderer{width: 64, height: 64}
67		-	s := ports.Scene{Scale: 1, Flash: &ports.FocusFlash{Rect: ports.Rect{X: 8, Y: 4, W: 16, H: 8}, Width: 2, Color: "#ff0000", Alpha: 1}}
68		-	ds := r.draws(s, nil, newDamage(&target{}, s, image.Rect(0, 0, 64, 64)))
69		-	require.Len(t, ds, 4)
70		-	for _, d := range ds {
71		-	require.Zero(t, d.pc.misc[1]&(flagRounded\|flagRing))
72		-	}
73		-	}


@@ -4,7 +4,6 @@ import (
4		"github.com/bnema/neferwl/internal/ports"	4	"github.com/bnema/neferwl/internal/ports"
5		"github.com/stretchr/testify/require"	5	"github.com/stretchr/testify/require"
6		"image"	6	"image"
7	-	"math"
8		"testing"	7	"testing"
9		)	8	)
10			9

@@ -44,30 +43,3 @@ func TestFocusFlashAbsentEmptyAndThin(t *testing.T) {
44		require.Equal(t, [4]int32{2, 3, 3, 13}, ds[0].pc.rect)	43	require.Equal(t, [4]int32{2, 3, 3, 13}, ds[0].pc.rect)
45		}	44	}
46		}	45	}
47	-
48	-	func TestFocusFlashRoundedRing(t *testing.T) {
49	-	for _, scale := range []int{1, 2} {
50	-	r := &Renderer{width: 128, height: 128}
51	-	s := ports.Scene{Scale: float64(scale),
52	-	Flash: &ports.FocusFlash{Rect: ports.Rect{X: 8, Y: 4, W: 40, H: 30}, Width: 3, Radius: 11, Color: "#ff0000", Alpha: 0.5}}
53	-	ds := r.draws(s, nil, newDamage(&target{}, s, image.Rect(0, 0, 128, 128)))
54	-	require.Len(t, ds, 1)
55	-	d := ds[0]
56	-	require.Equal(t, uint32(flagRounded\|flagRing), d.pc.misc[1]&(flagRounded\|flagRing))
57	-	require.Equal(t, [4]int32{8 * int32(scale), 4 * int32(scale), 48 * int32(scale), 34 * int32(scale)}, d.pc.rect)
58	-	require.Equal(t, float32(0.5), d.pc.color[3])
59	-	require.Equal(t, math.Float32bits(float32(11*scale)), d.radii[0])
60	-	require.Equal(t, math.Float32bits(float32(8*scale)), d.radii[1])
61	-	require.Equal(t, roundRect(image.Rect(11scale, 7scale, 45scale, 31scale)), d.roundInner)
62	-	}
63	-	}
64	-
65	-	func TestFocusFlashZeroRadiusStaysSquare(t *testing.T) {
66	-	r := &Renderer{width: 64, height: 64}
67	-	s := ports.Scene{Scale: 1, Flash: &ports.FocusFlash{Rect: ports.Rect{X: 8, Y: 4, W: 16, H: 8}, Width: 2, Color: "#ff0000", Alpha: 1}}
68	-	ds := r.draws(s, nil, newDamage(&target{}, s, image.Rect(0, 0, 64, 64)))
69	-	require.Len(t, ds, 4)
70	-	for _, d := range ds {
71	-	require.Zero(t, d.pc.misc[1]&(flagRounded\|flagRing))
72	-	}
73	-	}

M internal/adapters/vulkan/scene.go +1 -25


@@ -79,34 +79,10 @@ func (w *sceneWalk) focusFlash() {
79	79		}
80	80		alpha := w.alpha
81	81		w.alpha = float32(f.Alpha)
82		-	b := min(f.Width, f.Rect.W/2, f.Rect.H/2)
83		-	if f.Radius > 0 && b > 0 {
84		-	w.roundedInnerBorder(f.Rect, b, f.Radius, parseColor(f.Color))
85		-	} else {
86		-	w.innerBorder(f.Rect, b, parseColor(f.Color))
87		-	}
	82	+	w.innerBorder(f.Rect, min(f.Width, f.Rect.W/2, f.Rect.H/2), parseColor(f.Color))
88	83		w.alpha = alpha
89	84		}
90	85
91		-	// roundedInnerBorder draws the flash as one rounded ring: the target rect with
92		-	// radius, minus a hole inset by b with radius max(radius-b, 0).
93		-	func (w *sceneWalk) roundedInnerBorder(t ports.Rect, b, radius int, col [3]uint8) {
94		-	outer := w.physRect(t.X, t.Y, t.W, t.H)
95		-	n := len(w.draws)
96		-	w.fill(outer, col)
97		-	if len(w.draws) == n {
98		-	return
99		-	}
100		-	r := float32(math.Round(float64(radius) * w.scale))
101		-	dr := &w.draws[n]
102		-	roundedDraw(dr, outer, r)
103		-	dr.pc.misc[1] \|= flagRing
104		-	hole := w.physRect(t.X+b, t.Y+b, t.W-2b, t.H-2b)
105		-	bPhys := min(hole.Min.X-outer.Min.X, hole.Min.Y-outer.Min.Y, outer.Max.X-hole.Max.X, outer.Max.Y-hole.Max.Y)
106		-	dr.roundInner = roundRect(hole)
107		-	dr.radii[1] = math.Float32bits(max(r-float32(max(bPhys, 0)), 0))
108		-	}
109		-
110	86		// innerBorder draws four non-overlapping strips, or fills a thin target.
111	87		func (w *sceneWalk) innerBorder(t ports.Rect, b int, col [3]uint8) {
112	88		if b <= 0 {


@@ -79,34 +79,10 @@ func (w *sceneWalk) focusFlash() {
79		}	79		}
80		alpha := w.alpha	80		alpha := w.alpha
81		w.alpha = float32(f.Alpha)	81		w.alpha = float32(f.Alpha)
82	-	b := min(f.Width, f.Rect.W/2, f.Rect.H/2)	82	+	w.innerBorder(f.Rect, min(f.Width, f.Rect.W/2, f.Rect.H/2), parseColor(f.Color))
83	-	if f.Radius > 0 && b > 0 {
84	-	w.roundedInnerBorder(f.Rect, b, f.Radius, parseColor(f.Color))
85	-	} else {
86	-	w.innerBorder(f.Rect, b, parseColor(f.Color))
87	-	}
88		w.alpha = alpha	83		w.alpha = alpha
89		}	84		}
90			85
91	-	// roundedInnerBorder draws the flash as one rounded ring: the target rect with
92	-	// radius, minus a hole inset by b with radius max(radius-b, 0).
93	-	func (w *sceneWalk) roundedInnerBorder(t ports.Rect, b, radius int, col [3]uint8) {
94	-	outer := w.physRect(t.X, t.Y, t.W, t.H)
95	-	n := len(w.draws)
96	-	w.fill(outer, col)
97	-	if len(w.draws) == n {
98	-	return
99	-	}
100	-	r := float32(math.Round(float64(radius) * w.scale))
101	-	dr := &w.draws[n]
102	-	roundedDraw(dr, outer, r)
103	-	dr.pc.misc[1] \|= flagRing
104	-	hole := w.physRect(t.X+b, t.Y+b, t.W-2b, t.H-2b)
105	-	bPhys := min(hole.Min.X-outer.Min.X, hole.Min.Y-outer.Min.Y, outer.Max.X-hole.Max.X, outer.Max.Y-hole.Max.Y)
106	-	dr.roundInner = roundRect(hole)
107	-	dr.radii[1] = math.Float32bits(max(r-float32(max(bPhys, 0)), 0))
108	-	}
109	-
110		// innerBorder draws four non-overlapping strips, or fills a thin target.	86		// innerBorder draws four non-overlapping strips, or fills a thin target.
111		func (w *sceneWalk) innerBorder(t ports.Rect, b int, col [3]uint8) {	87		func (w *sceneWalk) innerBorder(t ports.Rect, b int, col [3]uint8) {
112		if b <= 0 {	88		if b <= 0 {

M internal/adapters/wayland/syncobj_test.go +3 -1


@@ -443,7 +443,9 @@ func TestSyncobjProtocolErrors(t *testing.T) {
443	443		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorUnsupportedBuffer)},
444	444		{"surface destroyed", func(h *syncHarness) {
445	445		requestProtocol(t, h.c, h.surf, wayland.SurfaceRequestDestroy)
446		-	h.setPoints(1, 2)
	446	+	// The first request already raises the error and the server
	447	+	// then closes the connection: a second write could hit EPIPE.
	448	+	requestProtocol(t, h.c, h.syncSurf, linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1RequestSetAcquirePoint, h.timeline, uint32(0), uint32(1))
447	449		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorNoSurface)},
448	450		{"surface exists", func(h *syncHarness) {
449	451		mgr := bindProtocol(t, h.c, "wp_linux_drm_syncobj_manager_v1")

 		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorUnsupportedBuffer)},
 		{"surface destroyed", func(h *syncHarness) {
 			requestProtocol(t, h.c, h.surf, wayland.SurfaceRequestDestroy)
-			h.setPoints(1, 2)
+			// The first request already raises the error and the server
+			// then closes the connection: a second write could hit EPIPE.
+			requestProtocol(t, h.c, h.syncSurf, linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1RequestSetAcquirePoint, h.timeline, uint32(0), uint32(1))
 		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorNoSurface)},
 		{"surface exists", func(h *syncHarness) {
 			mgr := bindProtocol(t, h.c, "wp_linux_drm_syncobj_manager_v1")

M internal/core/capture_test.go +12 -6


@@ -68,6 +68,16 @@ func (r *captureRig) layer(id ports.WindowID, layer ports.Layer, keyboard uint32
68	68		return ports.LayerSurface{ID: id, Layer: layer, Anchor: ports.AnchorTop \| ports.AnchorLeft, Width: 10, Height: 10, Output: "OUT-1", Keyboard: keyboard}
69	69		}
70	70
	71	+	// drainCommands drops the commands already queued. Call it only once the
	72	+	// core is quiet (after receiving a scene, which is published after its
	73	+	// commands) and before sending the event under test: draining after the
	74	+	// send races with the core emitting the commands the test waits for.
	75	+	func (r *captureRig) drainCommands() {
	76	+	for len(r.commands) > 0 {
	77	+	<-r.commands
	78	+	}
	79	+	}
	80	+
71	81		// excludedScene waits for a scene whose exclusion list has n entries.
72	82		func (r captureRig) excludedScene(t testing.T, n int) ports.Scene {
73	83		t.Helper()

@@ -372,10 +382,8 @@ func TestCaptureExclusionKeyboardClamp(t *testing.T) {
372	382		r.client <- ports.CaptureExclusionBegin{Session: 1}
373	383		r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
374	384		r.excludedScene(t, 1)
	385	+	r.drainCommands()
375	386		r.client <- ports.LayerChanged{Layers: []ports.LayerSurface{r.layer(10, ports.LayerOverlay, 1), r.layer(11, ports.LayerOverlay, 1)}}
376		-	for len(r.commands) > 0 {
377		-	<-r.commands
378		-	}
379	387		scene(t, r.scenes)
380	388		for {
381	389		if f, ok := receive(t, r.commands).(ports.FocusWindow); ok {

@@ -396,9 +404,7 @@ func TestCaptureExclusionKeyboardNone(t *testing.T) {
396	404		r.client <- ports.CaptureExclusionBegin{Session: 1}
397	405		r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
398	406		r.excludedScene(t, 1)
399		-	for len(r.commands) > 0 {
400		-	<-r.commands
401		-	}
	407	+	r.drainCommands()
402	408		r.client <- ports.WindowMapped{ID: 1}
403	409		scene(t, r.scenes)
404	410		for len(r.commands) > 0 {

 	return ports.LayerSurface{ID: id, Layer: layer, Anchor: ports.AnchorTop | ports.AnchorLeft, Width: 10, Height: 10, Output: "OUT-1", Keyboard: keyboard}
 }
+// drainCommands drops the commands already queued. Call it only once the
+// core is quiet (after receiving a scene, which is published after its
+// commands) and before sending the event under test: draining after the
+// send races with the core emitting the commands the test waits for.
+func (r *captureRig) drainCommands() {
+	for len(r.commands) > 0 {
+		<-r.commands
+	}
+}
 // excludedScene waits for a scene whose exclusion list has n entries.
 func (r *captureRig) excludedScene(t *testing.T, n int) ports.Scene {
 	t.Helper()
 	r.client <- ports.CaptureExclusionBegin{Session: 1}
 	r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
 	r.excludedScene(t, 1)
+	r.drainCommands()
 	r.client <- ports.LayerChanged{Layers: []ports.LayerSurface{r.layer(10, ports.LayerOverlay, 1), r.layer(11, ports.LayerOverlay, 1)}}
-	for len(r.commands) > 0 {
-		<-r.commands
-	}
 	scene(t, r.scenes)
 	for {
 		if f, ok := receive(t, r.commands).(ports.FocusWindow); ok {
 	r.client <- ports.CaptureExclusionBegin{Session: 1}
 	r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
 	r.excludedScene(t, 1)
-	for len(r.commands) > 0 {
+	r.drainCommands()
-		<-r.commands
-	}
 	r.client <- ports.WindowMapped{ID: 1}
 	scene(t, r.scenes)
 	for len(r.commands) > 0 {

M internal/core/flash.go +15 -19


@@ -31,7 +31,6 @@ type focusFlash struct {
31	31		timerStop func() bool
32	32		running *flashTarget
33	33		rect Rect
34		-	radius int // Corner radius of the target, as SceneWindow.Radius.
35	34		start time.Time
36	35		value float64 // Retained between this output's own flips.
37	36		lastStarts map[flashTarget]time.Time

@@ -88,7 +87,7 @@ func (c *Core) flashTick() bool {
88	87		f.timerC, f.timerStop = newTimer(c.opts.Clock, wait)
89	88		return false
90	89		}
91		-	rect, radius, ok := c.flashRect(target, sc)
	90	+	rect, ok := c.flashRect(target, sc)
92	91		if !ok {
93	92		return false
94	93		}

@@ -104,7 +103,7 @@ func (c *Core) flashTick() bool {
104	103		}
105	104		}
106	105		f.lastStarts[target] = now
107		-	f.running, f.rect, f.radius, f.start = &target, rect, radius, now
	106	+	f.running, f.rect, f.start = &target, rect, now
108	107		f.value = c.cfg.Focus.FlashOpacity
109	108		return true
110	109		}

@@ -119,7 +118,7 @@ func (c Core) advanceFlash(only screen) {
119	118		return
120	119		}
121	120		sc := c.screens[c.screenIndex(f.running.output)]
122		-	if rect, radius, ok := c.flashRect(*f.running, sc); !ok \|\| rect != f.rect \|\| radius != f.radius {
	121	+	if rect, ok := c.flashRect(*f.running, sc); !ok \|\| rect != f.rect {
123	122		c.stopFlash()
124	123		return
125	124		}

@@ -139,50 +138,47 @@ func (c Core) advanceFlash(only screen) {
139	138		// flashRect resolves the current target, never retaining a border after its
140	139		// visibility or geometry changes. stopFlash leaves the published sample intact
141	140		// so the scene diff also damages the old border.
142		-	func (c Core) flashRect(target flashTarget, sc screen) (Rect, int, bool) {
	141	+	func (c Core) flashRect(target flashTarget, sc screen) (Rect, bool) {
143	142		if sc.mon.ov.open {
144		-	return Rect{}, 0, false
	143	+	return Rect{}, false
145	144		}
146	145		if target.level == flashMonitor {
147	146		o := sc.mon.Output()
148		-	return Rect{W: o.W, H: o.H}, 0, true
	147	+	return Rect{W: o.W, H: o.H}, true
149	148		}
150	149		owner, _ := c.screenOf(target.window)
151	150		if owner != sc \|\| c.windows.lookup(target.window).client.ID == 0 {
152		-	return Rect{}, 0, false
	151	+	return Rect{}, false
153	152		}
154	153		view := sc.mon.viewport()
155	154		c.flash.layout = sc.mon.layoutInto(c.flash.layout)
156	155		var rect Rect
157		-	radius := 0
158	156		found := false
159	157		for _, p := range c.flash.layout {
160	158		if p.ID == target.window {
161	159		if p.Fullscreen \|\| p.Preview != 0 \|\| !view.shows(p) {
162		-	return Rect{}, 0, false
	160	+	return Rect{}, false
163	161		}
164		-	// The flash sits inside the drawn border, hugging the body.
165		-	rect, found = c.clientRect(p), true
166		-	radius = max(windowRadius(p, sc.mon.Current().gap(), c.cfg.Border.Radius)-c.cfg.Border.Width, 0)
	162	+	rect, found = p.Rect, true
167	163		break
168	164		}
169	165		}
170	166		if !found {
171		-	return Rect{}, 0, false
	167	+	return Rect{}, false
172	168		}
173	169		if target.level == flashColumn {
174	170		w := sc.mon.Current()
175	171		col := w.columnOf(target.window)
176	172		if col < 0 {
177		-	return Rect{}, 0, false
	173	+	return Rect{}, false
178	174		}
179	175		for _, p := range c.flash.layout {
180	176		if !p.Hidden && slices.Contains(w.Columns[col].Windows, p.ID) {
181		-	rect = union(rect, c.clientRect(p))
	177	+	rect = union(rect, p.Rect)
182	178		}
183	179		}
184	180		}
185		-	return rect, radius, true
	181	+	return rect, true
186	182		}
187	183
188	184		func (c Core) flashFor(sc screen) *ports.FocusFlash {

@@ -194,9 +190,9 @@ func (c Core) flashFor(sc screen) *ports.FocusFlash {
194	190		if color == "" {
195	191		color = c.cfg.Border.Active
196	192		}
197		-	sample := ports.FocusFlash{Rect: f.rect, Width: c.cfg.Focus.FlashWidth, Radius: f.radius, Color: color, Alpha: f.value}
	193	+	sample := ports.FocusFlash{Rect: f.rect, Width: c.cfg.Focus.FlashWidth, Color: color, Alpha: f.value}
198	194		if f.published == nil \|\| *f.published != sample {
199		-	f.published = &sample
	195	+	f.published = &ports.FocusFlash{Rect: sample.Rect, Width: sample.Width, Color: sample.Color, Alpha: sample.Alpha}
200	196		}
201	197		return f.published
202	198		}

 	timerStop  func() bool
 	running    *flashTarget
 	rect       Rect
-	radius     int // Corner radius of the target, as SceneWindow.Radius.
 	start      time.Time
 	value      float64 // Retained between this output's own flips.
 	lastStarts map[flashTarget]time.Time
 		f.timerC, f.timerStop = newTimer(c.opts.Clock, wait)
 		return false
 	}
-	rect, radius, ok := c.flashRect(target, sc)
+	rect, ok := c.flashRect(target, sc)
 	if !ok {
 		return false
 	}
 		}
 	}
 	f.lastStarts[target] = now
-	f.running, f.rect, f.radius, f.start = &target, rect, radius, now
+	f.running, f.rect, f.start = &target, rect, now
 	f.value = c.cfg.Focus.FlashOpacity
 	return true
 }
 		return
 	}
 	sc := c.screens[c.screenIndex(f.running.output)]
-	if rect, radius, ok := c.flashRect(*f.running, sc); !ok || rect != f.rect || radius != f.radius {
+	if rect, ok := c.flashRect(*f.running, sc); !ok || rect != f.rect {
 		c.stopFlash()
 		return
 	}
 // flashRect resolves the current target, never retaining a border after its
 // visibility or geometry changes. stopFlash leaves the published sample intact
 // so the scene diff also damages the old border.
-func (c *Core) flashRect(target flashTarget, sc *screen) (Rect, int, bool) {
+func (c *Core) flashRect(target flashTarget, sc *screen) (Rect, bool) {
 	if sc.mon.ov.open {
-		return Rect{}, 0, false
+		return Rect{}, false
 	}
 	if target.level == flashMonitor {
 		o := sc.mon.Output()
-		return Rect{W: o.W, H: o.H}, 0, true
+		return Rect{W: o.W, H: o.H}, true
 	}
 	owner, _ := c.screenOf(target.window)
 	if owner != sc || c.windows.lookup(target.window).client.ID == 0 {
-		return Rect{}, 0, false
+		return Rect{}, false
 	}
 	view := sc.mon.viewport()
 	c.flash.layout = sc.mon.layoutInto(c.flash.layout)
 	var rect Rect
-	radius := 0
 	found := false
 	for _, p := range c.flash.layout {
 		if p.ID == target.window {
 			if p.Fullscreen || p.Preview != 0 || !view.shows(p) {
-				return Rect{}, 0, false
+				return Rect{}, false
 			}
-			// The flash sits inside the drawn border, hugging the body.
+			rect, found = p.Rect, true
-			rect, found = c.clientRect(p), true
-			radius = max(windowRadius(p, sc.mon.Current().gap(), c.cfg.Border.Radius)-c.cfg.Border.Width, 0)
 			break
 		}
 	}
 	if !found {
-		return Rect{}, 0, false
+		return Rect{}, false
 	}
 	if target.level == flashColumn {
 		w := sc.mon.Current()
 		col := w.columnOf(target.window)
 		if col < 0 {
-			return Rect{}, 0, false
+			return Rect{}, false
 		}
 		for _, p := range c.flash.layout {
 			if !p.Hidden && slices.Contains(w.Columns[col].Windows, p.ID) {
-				rect = union(rect, c.clientRect(p))
+				rect = union(rect, p.Rect)
 			}
 		}
 	}
-	return rect, radius, true
+	return rect, true
 }
 func (c *Core) flashFor(sc *screen) *ports.FocusFlash {
 	if color == "" {
 		color = c.cfg.Border.Active
 	}
-	sample := ports.FocusFlash{Rect: f.rect, Width: c.cfg.Focus.FlashWidth, Radius: f.radius, Color: color, Alpha: f.value}
+	sample := ports.FocusFlash{Rect: f.rect, Width: c.cfg.Focus.FlashWidth, Color: color, Alpha: f.value}
 	if f.published == nil || *f.published != sample {
-		f.published = &sample
+		f.published = &ports.FocusFlash{Rect: sample.Rect, Width: sample.Width, Color: sample.Color, Alpha: sample.Alpha}
 	}
 	return f.published
 }

M internal/core/flash_test.go +0 -57


@@ -717,60 +717,3 @@ func TestFlashGeometryRevalidationAllocations(t *testing.T) {
717	717		})
718	718		}
719	719		}
720		-
721		-	func TestFlashFollowsInnerBorderAndRadius(t *testing.T) {
722		-	for _, test := range []struct {
723		-	name string
724		-	gaps int
725		-	float bool
726		-	level flashLevel
727		-	radius int
728		-	}{
729		-	{"tile with gaps", 12, false, flashWindow, 11},
730		-	{"column with gaps", 12, false, flashColumn, 11},
731		-	{"tile without gaps", 0, false, flashWindow, 0},
732		-	{"float", 0, true, flashWindow, 11},
733		-	{"monitor", 12, false, flashMonitor, 0},
734		-	} {
735		-	t.Run(test.name, func(t *testing.T) {
736		-	c, clock := flashCore(t)
737		-	c.cfg.Border.Width, c.cfg.Border.Radius = 3, 14
738		-	w := c.cur().mon.Current()
739		-	w.Gaps = test.gaps
740		-	if test.float {
741		-	c.applyAction(ActionToggleFloating)
742		-	c.stopFlash()
743		-	c.stopAnimations()
744		-	}
745		-	id := WindowID(3)
746		-	if f, ok := w.Focused(); ok && test.float {
747		-	id = f
748		-	}
749		-	startFlash(t, c, clock, test.level, id)
750		-	want := Rect{W: 300, H: 200}
751		-	if test.level != flashMonitor {
752		-	for _, p := range c.cur().mon.Layout() {
753		-	if p.ID == id {
754		-	want = p.Rect.Inset(p.Inset, 3)
755		-	if test.level == flashColumn {
756		-	want = c.flash.rect
757		-	}
758		-	}
759		-	}
760		-	}
761		-	if c.flash.rect != want \|\| c.flash.radius != test.radius {
762		-	t.Fatalf("rect %+v radius %d, want %+v radius %d", c.flash.rect, c.flash.radius, want, test.radius)
763		-	}
764		-	if f := c.flashFor(c.cur()); f == nil \|\| f.Radius != test.radius {
765		-	t.Fatalf("published %+v", f)
766		-	}
767		-	if test.level == flashWindow && test.gaps > 0 {
768		-	for _, p := range c.cur().mon.Layout() {
769		-	if p.ID == id && (p.Inset != ports.SideAll \|\| c.flash.rect.W != p.Rect.W-6 \|\| c.flash.rect.H != p.Rect.H-6) {
770		-	t.Fatalf("tile %+v not inset by 3 on all sides: %+v", p, c.flash.rect)
771		-	}
772		-	}
773		-	}
774		-	})
775		-	}
776		-	}


@@ -717,60 +717,3 @@ func TestFlashGeometryRevalidationAllocations(t *testing.T) {
717		})	717	})
718		}	718	}
719		}	719	}
720	-
721	-	func TestFlashFollowsInnerBorderAndRadius(t *testing.T) {
722	-	for _, test := range []struct {
723	-	name string
724	-	gaps int
725	-	float bool
726	-	level flashLevel
727	-	radius int
728	-	}{
729	-	{"tile with gaps", 12, false, flashWindow, 11},
730	-	{"column with gaps", 12, false, flashColumn, 11},
731	-	{"tile without gaps", 0, false, flashWindow, 0},
732	-	{"float", 0, true, flashWindow, 11},
733	-	{"monitor", 12, false, flashMonitor, 0},
734	-	} {
735	-	t.Run(test.name, func(t *testing.T) {
736	-	c, clock := flashCore(t)
737	-	c.cfg.Border.Width, c.cfg.Border.Radius = 3, 14
738	-	w := c.cur().mon.Current()
739	-	w.Gaps = test.gaps
740	-	if test.float {
741	-	c.applyAction(ActionToggleFloating)
742	-	c.stopFlash()
743	-	c.stopAnimations()
744	-	}
745	-	id := WindowID(3)
746	-	if f, ok := w.Focused(); ok && test.float {
747	-	id = f
748	-	}
749	-	startFlash(t, c, clock, test.level, id)
750	-	want := Rect{W: 300, H: 200}
751	-	if test.level != flashMonitor {
752	-	for _, p := range c.cur().mon.Layout() {
753	-	if p.ID == id {
754	-	want = p.Rect.Inset(p.Inset, 3)
755	-	if test.level == flashColumn {
756	-	want = c.flash.rect
757	-	}
758	-	}
759	-	}
760	-	}
761	-	if c.flash.rect != want \|\| c.flash.radius != test.radius {
762	-	t.Fatalf("rect %+v radius %d, want %+v radius %d", c.flash.rect, c.flash.radius, want, test.radius)
763	-	}
764	-	if f := c.flashFor(c.cur()); f == nil \|\| f.Radius != test.radius {
765	-	t.Fatalf("published %+v", f)
766	-	}
767	-	if test.level == flashWindow && test.gaps > 0 {
768	-	for _, p := range c.cur().mon.Layout() {
769	-	if p.ID == id && (p.Inset != ports.SideAll \|\| c.flash.rect.W != p.Rect.W-6 \|\| c.flash.rect.H != p.Rect.H-6) {
770	-	t.Fatalf("tile %+v not inset by 3 on all sides: %+v", p, c.flash.rect)
771	-	}
772	-	}
773	-	}
774	-	})
775	-	}
776	-	}

M internal/ports/scene.go +2 -5


@@ -201,11 +201,8 @@ type SceneLayer struct {
201	201		type FocusFlash struct {
202	202		Rect Rect
203	203		Width int
204		-	// Radius is the target's corner radius in logical pixels (0 = square),
205		-	// the same as SceneWindow.Radius; the border follows it.
206		-	Radius int
207		-	Color string
208		-	Alpha float64
	204	+	Color string
	205	+	Alpha float64
209	206		}
210	207
211	208		// SceneWindow carries core → renderer window placement.

 type FocusFlash struct {
 	Rect  Rect
 	Width int
-	// Radius is the target's corner radius in logical pixels (0 = square),
+	Color string
-	// the same as SceneWindow.Radius; the border follows it.
+	Alpha float64
-	Radius int
-	Color  string
-	Alpha  float64
 }
 // SceneWindow carries core → renderer window placement.

Comments0 open / 0

no comments yet.

What

Checks

Merge settings

Comments0 open / 0