feat: spotify plugin and image display (#35)

Author: andrinoff

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/clipperhouse/displaywidth v0.11.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/godbus/dbus/v5 v5.2.2 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect

go.sum

@@ -26,6 +26,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
+github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=

internal/layout/layout.go

@@ -1,6 +1,8 @@
 package layout
 
 import (
+	"strings"
+
 	"github.com/floatpane/lattice/pkg/module"
 	"github.com/floatpane/lattice/pkg/styles"
 
@@ -21,10 +23,18 @@ var (
 			MarginBottom(1)
 )
 
+// ScreenPlacement is an image placement with absolute screen coordinates.
+type ScreenPlacement struct {
+	Row    int    // absolute terminal row (1-based)
+	Col    int    // absolute terminal col (1-based)
+	Escape string // kitty graphics escape sequence
+}
+
 // Render arranges modules into a columnar grid.
-func Render(modules []module.Module, columns, termWidth, termHeight int) string {
+// It returns the rendered text and any image placements with absolute positions.
+func Render(modules []module.Module, columns, termWidth, termHeight int) (string, []ScreenPlacement) {
 	if len(modules) == 0 {
-		return ""
+		return "", nil
 	}
 	if columns < 1 {
 		columns = 1
@@ -43,8 +53,13 @@ func Render(modules []module.Module, columns, termWidth, termHeight int) string
 	// Content width inside the box (subtract border=2 + padding=4)
 	contentWidth := colWidth - 6
 
+	// Track per-column cumulative height (in rendered lines) for positioning.
+	colHeights := make([]int, columns)
+
 	// Distribute modules across columns round-robin
 	cols := make([][]string, columns)
+	var placements []ScreenPlacement
+
 	for i, mod := range modules {
 		col := i % columns
 		_, minH := mod.MinSize()
@@ -57,6 +72,32 @@ func Render(modules []module.Module, columns, termWidth, termHeight int) string
 		inner := lipgloss.JoinVertical(lipgloss.Left, title, content)
 
 		box := boxStyle.Width(colWidth - 2).Height(minH + 2).Render(inner)
+
+		if placer, ok := mod.(module.ImagePlacer); ok {
+			for _, ip := range placer.ImagePlacements() {
+				// To find the content area within the box, we need to account for:
+				// - docStyle Padding(1, 2): 1 row top, 2 cols left
+				// - box border top: 1 row
+				// - box padding top: 1 row
+				// - title line: 1 row
+				// - title MarginBottom(1): 1 row
+				// - box border left: 1 col, box padding left: 2 cols
+				// Total row offset from box top to content: 4
+				// Total col offset from box left to content: 3
+				absRow := 1 + colHeights[col] + 4 + ip.Row + 1 // +1 for docPadTop, +1 for 1-based
+				absCol := 2 + (col * colWidth) + 3 + ip.Col + 1 // +2 for docPadLeft, +1 for 1-based
+				placements = append(placements, ScreenPlacement{
+					Row:    absRow,
+					Col:    absCol,
+					Escape: ip.Escape,
+				})
+			}
+		}
+
+		// Count actual rendered lines in the box for accurate height tracking
+		boxHeight := strings.Count(box, "\n") + 1
+		colHeights[col] += boxHeight
+
 		cols[col] = append(cols[col], box)
 	}
 
@@ -66,7 +107,9 @@ func Render(modules []module.Module, columns, termWidth, termHeight int) string
 		rendered[i] = lipgloss.JoinVertical(lipgloss.Left, col...)
 	}
 
-	return docStyle.Render(
+	text := docStyle.Render(
 		lipgloss.JoinHorizontal(lipgloss.Top, rendered...),
 	)
+
+	return text, placements
 }

internal/layout/layout_test.go

@@ -21,7 +21,7 @@ func (m *mockModule) View(_, _ int) string           { return m.content }
 func (m *mockModule) MinSize() (int, int)            { return m.w, m.h }
 
 func TestRenderEmpty(t *testing.T) {
-	result := Render(nil, 2, 80, 24)
+	result, _ := Render(nil, 2, 80, 24)
 	if result != "" {
 		t.Errorf("expected empty string, got %q", result)
 	}
@@ -31,7 +31,7 @@ func TestRenderSingleModule(t *testing.T) {
 	mods := []module.Module{
 		&mockModule{name: "TEST", content: "hello", w: 20, h: 3},
 	}
-	result := Render(mods, 2, 80, 24)
+	result, _ := Render(mods, 2, 80, 24)
 	if result == "" {
 		t.Fatal("expected non-empty output")
 	}
@@ -50,7 +50,7 @@ func TestRenderMultipleModules(t *testing.T) {
 		&mockModule{name: "C", content: "ccc", w: 20, h: 3},
 		&mockModule{name: "D", content: "ddd", w: 20, h: 3},
 	}
-	result := Render(mods, 2, 100, 40)
+	result, _ := Render(mods, 2, 100, 40)
 	for _, name := range []string{"A", "B", "C", "D"} {
 		if !strings.Contains(result, name) {
 			t.Errorf("expected %q in output", name)
@@ -63,7 +63,7 @@ func TestRenderClampsColumns(t *testing.T) {
 		&mockModule{name: "ONLY", content: "one", w: 20, h: 3},
 	}
 	// 5 columns but only 1 module — should clamp to 1 column
-	result := Render(mods, 5, 80, 24)
+	result, _ := Render(mods, 5, 80, 24)
 	if !strings.Contains(result, "ONLY") {
 		t.Error("expected module in output even with excess columns")
 	}
@@ -74,7 +74,7 @@ func TestRenderMinColumnWidth(t *testing.T) {
 		&mockModule{name: "NARROW", content: "x", w: 20, h: 3},
 	}
 	// Very narrow terminal — should still render
-	result := Render(mods, 1, 10, 24)
+	result, _ := Render(mods, 1, 10, 24)
 	if result == "" {
 		t.Error("expected output even with tiny terminal")
 	}
@@ -85,7 +85,7 @@ func TestRenderZeroColumns(t *testing.T) {
 		&mockModule{name: "A", content: "a", w: 20, h: 3},
 	}
 	// 0 columns should be treated as 1
-	result := Render(mods, 0, 80, 24)
+	result, _ := Render(mods, 0, 80, 24)
 	if !strings.Contains(result, "A") {
 		t.Error("expected module with 0 columns (should default to 1)")
 	}
@@ -95,7 +95,7 @@ func TestRenderMinHeight(t *testing.T) {
 	mods := []module.Module{
 		&mockModule{name: "TINY", content: "x", w: 20, h: 1}, // below minimum of 3
 	}
-	result := Render(mods, 1, 80, 24)
+	result, _ := Render(mods, 1, 80, 24)
 	if !strings.Contains(result, "TINY") {
 		t.Error("expected module with small min height")
 	}