eb19005 refactor(core): always snapshot overview keys and scrolls and release unplugged shots · neferwl

M internal/core/input.go +4 -7


@@ -143,13 +143,10 @@ func (c *Core) handleInput(ctx context.Context, ev ports.InputEvent) error {
143	143		c.scrollStop(v)
144	144		// In the overview, scrolling moves the selection.
145	145		if c.cur().mon.ov.open && !c.overviewKeyboardTaken() {
146		-	// Only a scroll that can step needs the shot (not the end of
147		-	// one, nor the rest of a finger scroll that stepped).
	146	+	// overviewScroll owns which scrolls step; the shot costs no
	147	+	// allocation once warm.
148	148		now := c.now()
149		-	var shots []viewShot
150		-	if m := c.cur().mon; !v.Vertical.Stop && !v.Horizontal.Stop && !(v.Source == ports.AxisFinger && m.ov.scrolled) {
151		-	shots = c.snapshot(now)
152		-	}
	149	+	shots := c.snapshot(now)
153	150		if c.cur().mon.overviewScroll(v) {
154	151		c.transition(shots, now)
155	152		if err := c.workspaceVisible(ctx, true); err != nil {

@@ -202,7 +199,7 @@ func (c *Core) handleInput(ctx context.Context, ev ports.InputEvent) error {
202	199		if mon := c.cur().mon; mon.ov.open && !c.overviewKeyboardTaken() {
203	200		now := c.now()
204	201		var shots []viewShot
205		-	if key.Pressed && overviewKeyNamed(key) {
	202	+	if key.Pressed {
206	203		shots = c.snapshot(now)
207	204		}
208	205		if key.Pressed && mon.overviewKey(key) {

 		c.scrollStop(v)
 		// In the overview, scrolling moves the selection.
 		if c.cur().mon.ov.open && !c.overviewKeyboardTaken() {
-			// Only a scroll that can step needs the shot (not the end of
+			// overviewScroll owns which scrolls step; the shot costs no
-			// one, nor the rest of a finger scroll that stepped).
+			// allocation once warm.
 			now := c.now()
-			var shots []viewShot
+			shots := c.snapshot(now)
-			if m := c.cur().mon; !v.Vertical.Stop && !v.Horizontal.Stop && !(v.Source == ports.AxisFinger && m.ov.scrolled) {
-				shots = c.snapshot(now)
-			}
 			if c.cur().mon.overviewScroll(v) {
 				c.transition(shots, now)
 				if err := c.workspaceVisible(ctx, true); err != nil {
 	if mon := c.cur().mon; mon.ov.open && !c.overviewKeyboardTaken() {
 		now := c.now()
 		var shots []viewShot
-		if key.Pressed && overviewKeyNamed(key) {
+		if key.Pressed {
 			shots = c.snapshot(now)
 		}
 		if key.Pressed && mon.overviewKey(key) {

M internal/core/overview.go +0 -13


@@ -1015,19 +1015,6 @@ func (c *Core) overviewKeyboardTaken() bool {
1015	1015		return layer \|\| c.popups[id] != nil
1016	1016		}
1017	1017
1018		-	// overviewKeyNamed reports whether key is one overviewKey handles (a bare key); it
1019		-	// lets input snapshot only for those.
1020		-	func overviewKeyNamed(key ports.KeyEvent) bool {
1021		-	if key.Mods != 0 {
1022		-	return false
1023		-	}
1024		-	switch keyName(key.Keysym) {
1025		-	case "h", "Left", "l", "Right", "k", "Up", "j", "Down", "Return", "KP_Enter", "Escape":
1026		-	return true
1027		-	}
1028		-	return false
1029		-	}
1030		-
1031	1018		// overviewKey runs an overview key: true when the key was one.
1032	1019		func (m *Monitor) overviewKey(key ports.KeyEvent) bool {
1033	1020		if key.Mods != 0 {


@@ -1015,19 +1015,6 @@ func (c *Core) overviewKeyboardTaken() bool {
1015		return layer \|\| c.popups[id] != nil	1015	return layer \|\| c.popups[id] != nil
1016		}	1016	}
1017			1017
1018	-	// overviewKeyNamed reports whether key is one overviewKey handles (a bare key); it
1019	-	// lets input snapshot only for those.
1020	-	func overviewKeyNamed(key ports.KeyEvent) bool {
1021	-	if key.Mods != 0 {
1022	-	return false
1023	-	}
1024	-	switch keyName(key.Keysym) {
1025	-	case "h", "Left", "l", "Right", "k", "Up", "j", "Down", "Return", "KP_Enter", "Escape":
1026	-	return true
1027	-	}
1028	-	return false
1029	-	}
1030	-
1031		// overviewKey runs an overview key: true when the key was one.	1018	// overviewKey runs an overview key: true when the key was one.
1032		func (m *Monitor) overviewKey(key ports.KeyEvent) bool {	1019	func (m *Monitor) overviewKey(key ports.KeyEvent) bool {
1033		if key.Mods != 0 {	1020	if key.Mods != 0 {

M internal/core/transition.go +3 -0


@@ -657,7 +657,10 @@ func (c *Core) snapshot(now time.Time) []viewShot {
657	657		out = append(out, s)
658	658		}
659	659		for i := len(out); i < len(full); i++ {
	660	+	// Shots of unplugged screens keep nothing of them alive.
660	661		full[i].sc, full[i].ws = nil, nil
	662	+	clear(full[i].list[:cap(full[i].list)])
	663	+	full[i].list = full[i].list[:0]
661	664		}
662	665		c.shots = out
663	666		return out


@@ -657,7 +657,10 @@ func (c *Core) snapshot(now time.Time) []viewShot {
657	out = append(out, s)	657		out = append(out, s)
658	}	658		}
659	for i := len(out); i < len(full); i++ {	659		for i := len(out); i < len(full); i++ {
		660	+	// Shots of unplugged screens keep nothing of them alive.
660	full[i].sc, full[i].ws = nil, nil	661		full[i].sc, full[i].ws = nil, nil
		662	+	clear(full[i].list[:cap(full[i].list)])
		663	+	full[i].list = full[i].list[:0]
661	}	664		}
662	c.shots = out	665		c.shots = out
663	return out	666		return out