wip

src/musicplayer/ui/control.gleam

@@ -3,7 +3,7 @@ import gleam/erlang/process.{type Subject}
 import musicplayer/ui/layout.{type Section}
 
 pub type Control {
-  UpdateDimensions(columns: Int, rows: Int)
+  UpdateDimensions(width: Int, height: Int)
   UpdateState(section: Section, content: String)
 
   Exit(reply_to: Subject(Nil))

src/musicplayer/ui/layout.gleam

@@ -1,8 +1,7 @@
 import gleam/dict
+import gleam/float
 import gleam/int
 import gleam/list
-import gleam/pair
-import gleam/set
 import gleam/string
 import gleam/string_tree
 
@@ -10,64 +9,81 @@ import musicplayer/logging/logging
 import musicplayer/ui/ansi
 import musicplayer/ui/internal
 
-pub const root_section = "reserved_root_section"
-
 pub type Section {
   Section(String)
 
+  Root
   Header
   Search
   PlaybackTime
 }
 
-pub type Dimension {
+pub type NodeType {
-  Percent(width: Int, height: Int)
+  Container
-  // TODO add Flex that flows
+  Row
-}
+  Cell
-
-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 {
-  Row(content: String, style: Style, children: List(Section))
+  Node(
-  Cell(content: String, style: Style)
+    t: NodeType,
+    content: String,
+    width_percent: Int,
+    height_percent: Int,
+    children: List(Section),
+  )
 }
 
 pub type Layout {
-  Layout(columns: Int, rows: Int, nodes: dict.Dict(Section, Node))
+  Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
 }
 
-pub fn new(columns: Int, rows: Int, nodes: List(#(Section, Node))) -> Layout {
+pub fn new() -> Layout {
-  let children =
-    nodes
-    |> list.flat_map(fn(node) {
-      case pair.second(node) {
-        Row(children: c, ..) -> c
-        Cell(..) -> []
-      }
-    })
-    |> set.from_list
-
-  // All sections that are not children of other nodes will be added as
-  // children to the root
-  let orphans =
-    nodes
-    |> list.map(pair.first)
-    |> list.filter(fn(node) { !set.contains(children, node) })
-
   let nodes =
-    dict.from_list(nodes)
+    dict.from_list([
-    |> dict.insert(
+      #(
-      Section(root_section),
+        Root,
-      Row(
+        Node(
-        content: "",
+          t: Container,
-        style: Style(dimensions: Percent(width: 100, height: 100)),
+          content: "Music Player",
-        children: orphans,
+          width_percent: 100,
+          height_percent: 100,
+          children: [Header, Search, PlaybackTime],
+        ),
       ),
-    )
+      #(
-
+        Header,
-  Layout(columns:, rows:, nodes:)
+        Node(
+          t: Row,
+          content: "Foo (1) | Bar (2) | Baz (3)",
+          width_percent: 100,
+          height_percent: 33,
+          children: [],
+        ),
+      ),
+      #(
+        Search,
+        Node(
+          t: Row,
+          content: "",
+          width_percent: 100,
+          height_percent: 33,
+          children: [],
+        ),
+      ),
+      #(
+        PlaybackTime,
+        Node(
+          t: Row,
+          content: "00:00",
+          width_percent: 100,
+          height_percent: 33,
+          children: [],
+        ),
+      ),
+    ])
+  Layout(width: 0, height: 0, nodes: nodes)
 }
 
 pub fn update_section(
@@ -77,77 +93,77 @@ pub fn update_section(
 ) -> Layout {
   case dict.get(layout.nodes, section) {
     Error(_) -> layout
-    Ok(node) -> {
+    Ok(node) ->
-      let updated = case node {
+      Layout(
-        Cell(..) -> Cell(..node, content: content)
+        ..layout,
-        Row(..) -> Row(..node, content: content)
+        nodes: dict.insert(
-      }
+          layout.nodes,
-
+          section,
-      Layout(..layout, nodes: dict.insert(layout.nodes, section, updated))
+          Node(..node, content: content),
-    }
+        ),
+      )
   }
 }
 
-pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
+pub fn update_dimensions(layout: Layout, width: Int, height: Int) -> Layout {
-  Layout(..layout, columns:, rows:)
+  Layout(..layout, width:, height:)
 }
 
 pub fn render(layout: Layout) -> Nil {
   internal.clear_screen()
-
+  [layout.width, layout.height]
-  [layout.columns, layout.rows]
   |> list.map(int.to_string)
   |> string.join(" ")
   |> string.append("layout - render: ", _)
   |> logging.log
 
-  let context =
+  let container_width = int.to_float(layout.width)
-    RenderContext(
+  let container_height = int.to_float(layout.height)
-      parent_width: layout.columns,
+  let container_top_left_x = 1
-      parent_height: layout.rows,
+  let container_top_left_y = 1
-      parent_top_left_x: 1,
-      parent_top_left_y: 1,
-      position_index: 0,
-    )
 
   let ansi_renders =
     Renders(
-      text: fn(tree, chars, x, y) {
-        string_tree.append(tree, ansi.text(chars, x, y))
-      },
       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_generic(layout, context, Section(root_section), _, ansi_renders)
+  |> 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 type Renders(into) {
   Renders(
-    // into, chars, x, y
     text: fn(into, String, Int, Int) -> into,
-    // into, x, y, width, height
     box: fn(into, Int, Int, Int, Int) -> into,
   )
 }
 
-pub type RenderContext {
-  RenderContext(
-    parent_width: Int,
-    parent_height: Int,
-    parent_top_left_x: Int,
-    parent_top_left_y: Int,
-    position_index: Int,
-  )
-}
-
 pub fn render_generic(
   layout: Layout,
-  context: RenderContext,
+  // 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),
@@ -155,70 +171,61 @@ pub fn render_generic(
   case dict.get(layout.nodes, from) {
     Error(_) -> render_into
     Ok(node) -> {
-      // Margin between container and the node being rendere
+      let margin = 2.0
-      let margin = 2
 
-      let #(node_width, node_height) = case node.style.dimensions {
+      let width =
-        Percent(width:, height:) -> {
+        container_width *. { int.to_float(node.width_percent) /. 100.0 }
-          let width = { context.parent_width * width } / 100
+        |> float.floor
-          let height = { context.parent_height * height } / 100
+        |> float.truncate
 
-          #(width, height)
+      let height =
-        }
+        container_height *. { int.to_float(node.height_percent) /. 100.0 }
-      }
+        |> float.floor
+        |> float.truncate
 
-      // Check if this node should be placed to the left or below the parent
+      let #(cx, cy) = case node.t {
-      let #(node_top_left_x, node_top_left_y) = case node {
+        Container -> #(container_tl_x, container_tl_y)
-        Row(..) -> #(
+        Row -> #(container_tl_x, container_tl_y + { index * height })
-          context.parent_top_left_x,
+        Cell -> #(container_tl_x + { index * width }, container_tl_y)
-          context.parent_top_left_y + { context.position_index * node_height },
-        )
-        Cell(..) -> #(
-          context.parent_top_left_x + { context.position_index * node_width },
-          context.parent_top_left_y,
-        )
       }
 
       let parent =
         render_into
-        |> renders.box(
+        |> renders.box(cx, cy, width, height)
-          node_top_left_x,
+        // + 2 for header margin
-          node_top_left_y,
+        |> renders.text(node.content, cx + 2, cy)
-          node_width,
+
-          node_height,
+      list.index_map(node.children, fn(child, i) { #(i, child) })
+      |> list.fold(parent, fn(acc_into, ic) {
+        let #(i, child) = ic
+
+        let cw =
+          container_width
+          *. { int.to_float(node.width_percent) /. 100.0 }
+          -. margin
+          |> float.floor
+
+        let ch =
+          container_height
+          *. { int.to_float(node.height_percent) /. 100.0 }
+          -. margin
+          |> float.floor
+
+        let child_origin_x = container_tl_x + 1
+        let child_origin_y = container_tl_y + 1
+
+        render_generic(
+          layout,
+          cw,
+          ch,
+          child_origin_x,
+          child_origin_y,
+          i,
+          child,
+          acc_into,
+          renders,
         )
-        |> renders.text(node.content, node_top_left_x, node_top_left_y)
+      })
-
-      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 #(child_width, child_height) = case node.style.dimensions {
-              Percent(width:, height:) -> {
-                let width = { { context.parent_width * width } / 100 } - margin
-                let height =
-                  { { context.parent_height * height } / 100 } - margin
-
-                #(width, height)
-              }
-            }
-
-            let context =
-              RenderContext(
-                parent_width: child_width,
-                parent_height: child_height,
-                parent_top_left_x: context.parent_top_left_x + 1,
-                parent_top_left_y: context.parent_top_left_y + 1,
-                position_index: i,
-              )
-
-            render_generic(layout, context, child, acc_into, renders)
-          })
-        }
-      }
     }
   }
 }

src/musicplayer/ui/layout_examples/layout_examples.gleam

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

src/musicplayer/ui/ui.gleam

@@ -17,34 +17,7 @@ pub fn new() -> Result(Subject(Control), String) {
   let redraw_name = process.new_name("redraw")
   let redraw: Subject(Layout) = process.named_subject(redraw_name)
 
-  let layout =
+  let layout = layout.new()
-    [
-      #(
-        layout.Header,
-        layout.Row(
-          content: "Foo (1) | Bar (2) | Baz (3)",
-          style: layout.Style(dimensions: layout.Percent(width: 100, height: 33)),
-          children: [],
-        ),
-      ),
-      #(
-        layout.Search,
-        layout.Row(
-          content: "",
-          style: layout.Style(dimensions: layout.Percent(width: 100, height: 33)),
-          children: [],
-        ),
-      ),
-      #(
-        layout.PlaybackTime,
-        layout.Row(
-          content: "00:00",
-          style: layout.Style(dimensions: layout.Percent(width: 100, height: 33)),
-          children: [],
-        ),
-      ),
-    ]
-    |> layout.new(0, 0, _)
 
   case
     actor.new(State(redraw, layout))
@@ -78,19 +51,19 @@ fn handle_message(
   control: Control,
 ) -> actor.Next(State(redraw, layout), Control) {
   case control {
-    control.UpdateDimensions(columns, rows) -> {
+    control.UpdateDimensions(width, height) -> {
-      let current_dimensions = #(state.layout.columns, state.layout.rows)
+      let current_dimensions = #(state.layout.width, state.layout.height)
 
-      case #(columns, rows) == current_dimensions {
+      case #(width, height) == current_dimensions {
         True -> actor.continue(state)
         False -> {
-          [columns, rows]
+          [width, height]
           |> list.map(int.to_string)
           |> string.join(" ")
           |> string.append("ui - updating dimensions: ", _)
           |> logging.log
 
-          let layout = layout.update_dimensions(state.layout, columns, rows)
+          let layout = layout.update_dimensions(state.layout, width, height)
 
           process.send(state.redraw, layout)
           actor.continue(State(..state, layout:))

test/musicplayer/ui/layout_test.gleam

@@ -1,59 +1,84 @@
+import gleam/dict
 import gleam/io
 import gleam/string
 import gleeunit
 import gleeunit/should
 import musicplayer/ui/virtual_ansi
 
-import musicplayer/ui/layout.{Percent, Section, Style}
+import musicplayer/ui/layout.{Layout, Node, Section}
 
 pub fn main() -> Nil {
   gleeunit.main()
 }
 
-pub fn percent_layout_test() {
+pub fn foo_test() {
-  let nodes = [
+  let layout =
-    #(
+    Layout(
-      Section("Row1"),
+      width: 80,
-      layout.Row(
+      height: 20,
-        content: "row 1",
+      nodes: dict.from_list([
-        style: Style(dimensions: Percent(width: 100, height: 50)),
+        #(
-        children: [
+          Section("Root"),
+          Node(
+            t: layout.Container,
+            content: "container",
+            width_percent: 100,
+            height_percent: 100,
+            children: [
+              Section("Row1"),
+              Section("Row2"),
+            ],
+          ),
+        ),
+        #(
+          Section("Row1"),
+          Node(
+            t: layout.Row,
+            content: "row 1",
+            width_percent: 100,
+            height_percent: 50,
+            children: [
+              Section("A"),
+              Section("B"),
+            ],
+          ),
+        ),
+        #(
           Section("A"),
+          Node(
+            t: layout.Cell,
+            content: "cell 1",
+            width_percent: 50,
+            height_percent: 100,
+            children: [],
+          ),
+        ),
+        #(
           Section("B"),
-        ],
+          Node(
-      ),
+            t: layout.Cell,
-    ),
+            content: "cell 2",
-    #(
+            width_percent: 50,
-      Section("A"),
+            height_percent: 100,
-      layout.Cell(
+            children: [],
-        content: "cell 1",
+          ),
-        style: Style(dimensions: Percent(width: 50, height: 100)),
+        ),
-      ),
+        #(
-    ),
+          Section("Row2"),
-    #(
+          Node(
-      Section("B"),
+            t: layout.Row,
-      layout.Cell(
+            content: "row 1",
-        content: "cell 2",
+            width_percent: 100,
-        style: Style(dimensions: Percent(width: 50, height: 100)),
+            height_percent: 50,
-      ),
+            children: [],
-    ),
+          ),
-    #(
+        ),
-      Section("Row2"),
+      ]),
-      layout.Row(
+    )
-        content: "row 1",
-        style: Style(dimensions: Percent(width: 100, height: 50)),
-        children: [],
-      ),
-    ),
-  ]
-
-  let columns = 80
-  let rows = 20
-  let layout = layout.new(columns, rows, nodes)
 
   let expected =
     "
-┌──────────────────────────────────────────────────────────────────────────────┐
+container──────────────────────────────────────────────────────────────────────┐
 │row 1────────────────────────────────────────────────────────────────────────┐│
 ││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
 │││                                    ││                                    │││
@@ -75,7 +100,8 @@ pub fn percent_layout_test() {
 └──────────────────────────────────────────────────────────────────────────────┘
 "
 
-  let visual = virtual_ansi.render(layout)
+  let visual =
+    virtual_ansi.render(layout, Section("Root"), layout.width, layout.height)
   case visual == string.trim(expected) {
     True -> Nil
     False -> {

test/musicplayer/ui/virtual_ansi.gleam

@@ -3,32 +3,27 @@ import gleam/int
 import gleam/list
 import gleam/string
 
-import musicplayer/ui/layout.{type Layout, RenderContext, Renders}
+import musicplayer/ui/layout.{type Layout, type Section, Renders}
 
 pub type Screen =
   dict.Dict(#(Int, Int), String)
 
-pub fn render(layout: Layout) -> String {
+pub fn render(layout: Layout, root: Section, width: Int, height: Int) -> String {
   let test_renders =
     Renders(
-      text: fn(screen, chars, x, y) { text(screen, chars, x, y) },
       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 context =
-    RenderContext(
-      parent_width: layout.columns,
-      parent_height: layout.rows,
-      parent_top_left_x: 1,
-      parent_top_left_y: 1,
-      position_index: 0,
     )
 
   let screen =
     layout.render_generic(
       layout,
-      context,
+      int.to_float(width),
-      layout.Section(layout.root_section),
+      int.to_float(height),
+      1,
+      1,
+      0,
+      root,
       dict.new(),
       test_renders,
     )