wip

src/musicplayer/musicplayer.gleam

@@ -146,6 +146,7 @@ fn update_playback_time_loop(
   interval_ms: Int,
 ) {
   process.sleep(interval_ms)
+  // TODO only update if state is playing
   update_playback_time(mpv, ui)
 
   update_playback_time_loop(mpv, ui, interval_ms)

src/musicplayer/ui/ansi.gleam

@@ -0,0 +1,42 @@
+import gleam/list
+import gleam/string
+import gleam/string_tree
+
+import musicplayer/ui/internal
+
+pub fn text(chars: String, x: Int, y: Int) {
+  internal.chars_at(chars, x, y)
+}
+
+pub fn box(x: Int, y: Int, width: Int, height: Int) -> String {
+  let box_chars = #("┌", "┐", "└", "┘", "─", "│")
+  let #(tl, tr, bl, br, h, v) = box_chars
+
+  // Add top of box
+  let tree =
+    string_tree.new()
+    |> string_tree.append(internal.chars_at(
+      tl <> string.repeat(h, width - 2) <> tr,
+      x,
+      y,
+    ))
+
+  // Add sides of box
+  let tree_with_sides =
+    list.range(1, height - 2)
+    |> list.map(fn(row) {
+      tree
+      |> string_tree.append(internal.chars_at(v, x, y + row))
+      |> string_tree.append(internal.chars_at(v, x + width - 1, y + row))
+    })
+    |> string_tree.concat
+
+  // Add bottom of box
+  tree_with_sides
+  |> string_tree.append(internal.chars_at(
+    bl <> string.repeat(h, width - 2) <> br,
+    x,
+    y + height - 1,
+  ))
+  |> string_tree.to_string
+}

src/musicplayer/ui/layout.gleam

@@ -1,22 +1,41 @@
 import gleam/dict
+import gleam/float
+import gleam/int
 import gleam/list
-import gleam/string_tree.{type StringTree}
+import gleam/string
+import gleam/string_tree
 
+import musicplayer/logging/logging
+import musicplayer/ui/ansi
 import musicplayer/ui/internal
 
-pub type Layout {
-  Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
-}
-
 pub type Section {
+  Section(String)
+
   Root
   Header
   Search
   PlaybackTime
 }
 
+pub type Dimension {
+  Percent(width: Int, height: Int)
+  Flex
+}
+
+pub type Style {
+  Style(dimensions: Dimension)
+}
+
+/// A Nodes width and height is in percentage (of the available width/height of its parent Node)
 pub type Node {
-  Node(content: String, x: Int, y: Int, children: List(Section))
+  Row(content: String, style: Style, children: List(Section))
+  Cell(content: String, style: Style)
+}
+
+/// The root node must use `Root` section
+pub type Layout {
+  Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
 }
 
 pub fn new() -> Layout {
@@ -24,18 +43,38 @@ pub fn new() -> Layout {
     dict.from_list([
       #(
         Root,
-        Node(content: "", x: 0, y: 0, children: [
+        Row(
-          Header,
+          content: "Music Player",
-          Search,
+          style: Style(dimensions: Percent(width: 100, height: 100)),
-          PlaybackTime,
+          children: [Header, Search, PlaybackTime],
-        ]),
+        ),
+      ),
+      #(
+        Header,
+        Row(
+          content: "Foo (1) | Bar (2) | Baz (3)",
+          style: Style(dimensions: Percent(width: 100, height: 33)),
+          children: [],
+        ),
+      ),
+      #(
+        Search,
+        Row(
+          content: "",
+          style: Style(dimensions: Percent(width: 100, height: 33)),
+          children: [],
+        ),
+      ),
+      #(
+        PlaybackTime,
+        Row(
+          content: "00:00",
+          style: Style(dimensions: Percent(width: 100, height: 33)),
+          children: [],
+        ),
       ),
-      #(Header, Node(content: "Music Player", x: 1, y: 1, children: [])),
-      #(Search, Node(content: "", x: 30, y: 1, children: [])),
-      #(PlaybackTime, Node(content: "00:00", x: 1, y: 2, children: [])),
     ])
-
+  Layout(width: 0, height: 0, nodes: nodes)
-  Layout(0, 0, nodes: nodes)
 }
 
 pub fn update_section(
@@ -45,15 +84,14 @@ pub fn update_section(
 ) -> Layout {
   case dict.get(layout.nodes, section) {
     Error(_) -> layout
-    Ok(node) ->
+    Ok(node) -> {
-      Layout(
+      let updated = case node {
-        ..layout,
+        Cell(..) -> Cell(..node, content: content)
-        nodes: dict.insert(
+        Row(..) -> Row(..node, content: content)
-          layout.nodes,
+      }
-          section,
+
-          Node(..node, content: content),
+      Layout(..layout, nodes: dict.insert(layout.nodes, section, updated))
-        ),
+    }
-      )
   }
 }
 
@@ -61,30 +99,140 @@ pub fn update_dimensions(layout: Layout, width: Int, height: Int) -> Layout {
   Layout(..layout, width:, height:)
 }
 
-pub fn render(layout: Layout, from: Section) -> Nil {
+pub fn render(layout: Layout) -> Nil {
+  internal.clear_screen()
+
+  [layout.width, layout.height]
+  |> list.map(int.to_string)
+  |> string.join(" ")
+  |> string.append("layout - render: ", _)
+  |> logging.log
+
+  let container_width = int.to_float(layout.width)
+  let container_height = int.to_float(layout.height)
+  let container_top_left_x = 1
+  let container_top_left_y = 1
+
+  let ansi_renders =
+    Renders(
+      box: fn(tree, x, y, w, h) {
+        string_tree.append(tree, ansi.box(x, y, w, h))
+      },
+      text: fn(tree, chars, x, y) {
+        string_tree.append(tree, ansi.text(chars, x, y))
+      },
+    )
+
   string_tree.new()
-  |> render_loop(layout, from, _)
+  |> render_generic(
+    layout,
+    container_width,
+    container_height,
+    container_top_left_x,
+    container_top_left_y,
+    0,
+    Root,
+    _,
+    ansi_renders,
+  )
   |> string_tree.to_string
   |> internal.print
 }
 
-pub fn render_loop(
+pub type Renders(into) {
-  layout: Layout,
+  Renders(
-  from: Section,
+    text: fn(into, String, Int, Int) -> into,
-  into: StringTree,
+    box: fn(into, Int, Int, Int, Int) -> into,
-) -> StringTree {
-  case dict.get(layout.nodes, from) {
-    Error(_) -> into
-    Ok(node) -> {
-      let parent =
-        string_tree.append(
-          into,
-          internal.chars_at(node.content, node.x, node.y),
   )
+}
 
-      list.fold(node.children, parent, fn(into_acc, child) {
+pub fn render_generic(
-        render_loop(layout, child, into_acc)
+  layout: Layout,
+  // Dimensions
+  container_width: Float,
+  container_height: Float,
+  container_tl_x: Int,
+  container_tl_y: Int,
+  // State
+  index: Int,
+  from: Section,
+  render_into: into,
+  renders: Renders(into),
+) -> into {
+  case dict.get(layout.nodes, from) {
+    Error(_) -> render_into
+    Ok(node) -> {
+      let margin = 2.0
+
+      let #(width, height) = case node.style.dimensions {
+        Flex -> todo
+        Percent(width:, height:) -> {
+          let width =
+            container_width *. { int.to_float(width) /. 100.0 }
+            |> float.floor
+            |> float.truncate
+
+          let height =
+            container_height *. { int.to_float(height) /. 100.0 }
+            |> float.floor
+            |> float.truncate
+
+          #(width, height)
+        }
+      }
+
+      let #(cx, cy) = case node {
+        Row(..) -> #(container_tl_x, container_tl_y + { index * height })
+        Cell(..) -> #(container_tl_x + { index * width }, container_tl_y)
+      }
+
+      let parent =
+        render_into
+        |> renders.box(cx, cy, width, height)
+        // + 2 for header margin
+        |> renders.text(node.content, cx, cy)
+
+      case node {
+        Cell(..) -> parent
+        Row(children:, ..) -> {
+          list.index_map(children, fn(child, i) { #(i, child) })
+          |> list.fold(parent, fn(acc_into, ic) {
+            let #(i, child) = ic
+
+            let #(width, height) = case node.style.dimensions {
+              Flex -> todo
+              Percent(width:, height:) -> {
+                let width =
+                  container_width *. { int.to_float(width) /. 100.0 } -. margin
+                  |> float.floor
+
+                let height =
+                  container_height
+                  *. { int.to_float(height) /. 100.0 }
+                  -. margin
+                  |> float.floor
+
+                #(width, height)
+              }
+            }
+
+            let child_origin_x = container_tl_x + 1
+            let child_origin_y = container_tl_y + 1
+
+            render_generic(
+              layout,
+              width,
+              height,
+              child_origin_x,
+              child_origin_y,
+              i,
+              child,
+              acc_into,
+              renders,
+            )
           })
         }
       }
     }
+  }
+}

src/musicplayer/ui/layout_examples/layout_examples.gleam

@@ -0,0 +1,70 @@
+import gleam/dict
+
+import musicplayer/ui/internal
+import musicplayer/ui/layout.{Layout, Percent, Section, Style}
+import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
+
+pub fn main() {
+  let assert Ok(width) = internal.io_get_columns()
+  let assert Ok(height) = internal.io_get_rows()
+
+  two_rows_with_cells(width, height)
+  |> layout.render
+
+  wait_for_input()
+}
+
+/// Two rows:
+/// First row has two cells
+/// Second row has no cells
+fn two_rows_with_cells(width: Int, height: Int) -> layout.Layout {
+  let nodes =
+    dict.from_list([
+      #(
+        layout.Root,
+        layout.Row(
+          content: "container",
+          style: Style(dimensions: Percent(width: 100, height: 100)),
+          children: [
+            Section("Row1"),
+            Section("Row2"),
+          ],
+        ),
+      ),
+      #(
+        Section("Row1"),
+        layout.Row(
+          content: "row 1",
+          style: Style(dimensions: Percent(width: 100, height: 50)),
+          children: [
+            Section("A"),
+            Section("A"),
+          ],
+        ),
+      ),
+      #(
+        Section("A"),
+        layout.Cell(
+          content: "cell 1",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
+        ),
+      ),
+      #(
+        Section("B"),
+        layout.Cell(
+          content: "cell 2",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
+        ),
+      ),
+      #(
+        Section("Row2"),
+        layout.Row(
+          content: "row 2",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
+          children: [],
+        ),
+      ),
+    ])
+
+  Layout(width:, height:, nodes: nodes)
+}

src/musicplayer/ui/layout_examples/wait_for_input.gleam

@@ -0,0 +1,15 @@
+import gleam/erlang/process.{type Name}
+
+import musicplayer/input/input
+import musicplayer/input/key.{type Key}
+
+pub fn wait_for_input() {
+  let input_keys_name: Name(Key) = process.new_name("input_keys")
+  let assert Ok(_) = process.register(process.self(), input_keys_name)
+
+  input.new(input_keys_name)
+
+  process.new_selector()
+  |> process.select(process.named_subject(input_keys_name))
+  |> process.selector_receive_forever
+}

src/musicplayer/ui/ui.gleam

@@ -38,7 +38,7 @@ pub fn new() -> Result(Subject(Control), String) {
         internal.clear_screen()
         internal.hide_cursor()
 
-        redraw_on_update_loop(redraw)
+        redraw_loop(redraw)
       })
 
       Ok(ui)
@@ -63,21 +63,18 @@ fn handle_message(
           |> string.append("ui - updating dimensions: ", _)
           |> logging.log
 
-          actor.continue(
+          let layout = layout.update_dimensions(state.layout, width, height)
-            State(
+
-              ..state,
+          process.send(state.redraw, layout)
-              layout: layout.update_dimensions(state.layout, width, height),
+          actor.continue(State(..state, layout:))
-            ),
-          )
         }
       }
     }
     control.UpdateState(section, content) -> {
       let layout = layout.update_section(state.layout, section, content)
-      let state = State(..state, layout:)
 
       actor.send(state.redraw, layout)
-      actor.continue(state)
+      actor.continue(State(..state, layout:))
     }
 
     control.Exit(reply_to) -> {
@@ -88,13 +85,11 @@ fn handle_message(
   }
 }
 
-fn redraw_on_update_loop(redraw: Subject(Layout)) -> Nil {
+fn redraw_loop(redraw: Subject(Layout)) -> Nil {
-  let layout = process.receive_forever(redraw)
+  process.receive_forever(redraw)
+  |> layout.render
 
-  internal.clear_screen()
+  redraw_loop(redraw)
-  layout.render(layout, layout.Root)
-
-  redraw_on_update_loop(redraw)
 }
 
 fn update_dimensions_on_interval(ui: Subject(Control), interval_ms: Int) {

test/musicplayer/ui/layout_test.gleam

@@ -0,0 +1,105 @@
+import gleam/dict
+import gleam/io
+import gleam/string
+import gleeunit
+import gleeunit/should
+import musicplayer/ui/virtual_ansi
+
+import musicplayer/ui/layout.{Layout, Percent, Section, Style}
+
+pub fn main() -> Nil {
+  gleeunit.main()
+}
+
+pub fn percent_layout_test() {
+  let layout =
+    Layout(
+      width: 80,
+      height: 20,
+      nodes: dict.from_list([
+        #(
+          layout.Root,
+          layout.Row(
+            content: "container",
+            style: Style(dimensions: Percent(width: 100, height: 100)),
+            children: [
+              Section("Row1"),
+              Section("Row2"),
+            ],
+          ),
+        ),
+        #(
+          Section("Row1"),
+          layout.Row(
+            content: "row 1",
+            style: Style(dimensions: Percent(width: 100, height: 50)),
+            children: [
+              Section("A"),
+              Section("B"),
+            ],
+          ),
+        ),
+        #(
+          Section("A"),
+          layout.Cell(
+            content: "cell 1",
+            style: Style(dimensions: Percent(width: 50, height: 100)),
+          ),
+        ),
+        #(
+          Section("B"),
+          layout.Cell(
+            content: "cell 2",
+            style: Style(dimensions: Percent(width: 50, height: 100)),
+          ),
+        ),
+        #(
+          Section("Row2"),
+          layout.Row(
+            content: "row 1",
+            style: Style(dimensions: Percent(width: 100, height: 50)),
+            children: [],
+          ),
+        ),
+      ]),
+    )
+
+  let expected =
+    "
+container──────────────────────────────────────────────────────────────────────┐
+│row 1────────────────────────────────────────────────────────────────────────┐│
+││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
+│││                                    ││                                    │││
+│││                                    ││                                    │││
+│││                                    ││                                    │││
+│││                                    ││                                    │││
+│││                                    ││                                    │││
+││└────────────────────────────────────┘└────────────────────────────────────┘││
+│└────────────────────────────────────────────────────────────────────────────┘│
+│row 1────────────────────────────────────────────────────────────────────────┐│
+││                                                                            ││
+││                                                                            ││
+││                                                                            ││
+││                                                                            ││
+││                                                                            ││
+││                                                                            ││
+││                                                                            ││
+│└────────────────────────────────────────────────────────────────────────────┘│
+└──────────────────────────────────────────────────────────────────────────────┘
+"
+
+  let visual = virtual_ansi.render(layout)
+  case visual == string.trim(expected) {
+    True -> Nil
+    False -> {
+      io.println("Test failed")
+      io.println("Expected:")
+      io.println(string.trim(expected))
+
+      io.println("Got:")
+      io.println(visual)
+
+      should.equal(visual, expected)
+    }
+  }
+}

test/musicplayer/ui/virtual_ansi.gleam

@@ -0,0 +1,113 @@
+import gleam/dict
+import gleam/int
+import gleam/list
+import gleam/string
+
+import musicplayer/ui/layout.{type Layout, Renders}
+
+pub type Screen =
+  dict.Dict(#(Int, Int), String)
+
+pub fn render(layout: Layout) -> String {
+  let test_renders =
+    Renders(
+      box: fn(screen, x, y, w, h) { box(screen, x, y, w, h) },
+      text: fn(screen, chars, x, y) { text(screen, chars, x, y) },
+    )
+
+  let screen =
+    layout.render_generic(
+      layout,
+      int.to_float(layout.width),
+      int.to_float(layout.height),
+      1,
+      1,
+      0,
+      layout.Root,
+      dict.new(),
+      test_renders,
+    )
+
+  screen_to_string(screen)
+}
+
+pub fn screen_to_string(screen: Screen) -> String {
+  let keys = dict.keys(screen)
+
+  // Find the bounding box of the drawing
+  let max_x = list.fold(keys, 0, fn(m, k) { int.max(m, k.0) })
+  let max_y = list.fold(keys, 0, fn(m, k) { int.max(m, k.1) })
+
+  // We start from 1 because ANSI is 1-based
+  let min_y = list.fold(keys, 1000, fn(m, k) { int.min(m, k.1) })
+
+  list.range(min_y, max_y)
+  |> list.map(fn(y) {
+    list.range(1, max_x)
+    |> list.map(fn(x) {
+      case dict.get(screen, #(x, y)) {
+        Ok(char) -> char
+        Error(_) -> " "
+        // Fill gaps with space
+      }
+    })
+    |> string.join("")
+  })
+  |> string.join("\n")
+}
+
+pub fn text(screen: Screen, text: String, start_x: Int, y: Int) -> Screen {
+  // We use to_graphemes to ensure Unicode characters (like emoji or box lines)
+  // are treated as single visual units
+  text
+  |> string.to_graphemes
+  |> list.index_fold(screen, fn(acc, char, i) {
+    dict.insert(acc, #(start_x + i, y), char)
+  })
+}
+
+pub fn box(screen: Screen, x: Int, y: Int, w: Int, h: Int) -> Screen {
+  let box_chars = #("┌", "┐", "└", "┘", "─", "│")
+  let #(tl, tr, bl, br, hor, ver) = box_chars
+
+  // Don't draw impossible boxes
+  case w < 2 || h < 2 {
+    True -> screen
+    False -> {
+      screen
+      // 1. Corners
+      |> dict.insert(#(x, y), tl)
+      |> dict.insert(#(x + w - 1, y), tr)
+      |> dict.insert(#(x, y + h - 1), bl)
+      |> dict.insert(#(x + w - 1, y + h - 1), br)
+      // 2. Top and Bottom edges
+      |> horizontal_line(x + 1, y, w - 2, hor)
+      |> horizontal_line(x + 1, y + h - 1, w - 2, hor)
+      // 3. Side edges
+      |> vertical_line(x, y + 1, h - 2, ver)
+      |> vertical_line(x + w - 1, y + 1, h - 2, ver)
+    }
+  }
+}
+
+fn horizontal_line(
+  screen: Screen,
+  x: Int,
+  y: Int,
+  len: Int,
+  char: String,
+) -> Screen {
+  list.range(0, len - 1)
+  |> list.fold(screen, fn(acc, i) { dict.insert(acc, #(x + i, y), char) })
+}
+
+fn vertical_line(
+  screen: Screen,
+  x: Int,
+  y: Int,
+  len: Int,
+  char: String,
+) -> Screen {
+  list.range(0, len - 1)
+  |> list.fold(screen, fn(acc, i) { dict.insert(acc, #(x, y + i), char) })
+}