wip

src/musicplayer/control.gleam

@@ -1,58 +1,30 @@
-import gleam/string
-import musicplayer/ui/layout
-
 import musicplayer/input/key.{type Key}
 
-pub type Mode {
-  Idle
-  Searching(input: String)
-}
-
 pub type Control {
   TogglePlayPause
-  Search(input: String, capturing: Bool)
+  Search
 
-  SetView(view_idx: layout.ViewIdx)
+  Raw(String)
+  Return
+  Backspace
 
   Exit
 }
 
-pub fn from_key(key: Key, mode: Mode) -> Result(Control, Nil) {
+pub fn from_key(key: Key) -> Result(Control, Nil) {
-  case mode {
-    Idle -> idle_from_key(key)
-    Searching(input) -> searching_from_key(key, input)
-  }
-}
-
-pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
   case key {
-    key.Char(char) -> {
+    key.Return -> Ok(Return)
-      case char {
+    key.Backspace -> Ok(Backspace)
-        // Views are zero indexed
+    key.Char(char) -> Ok(char_control(char))
-        "1" -> Ok(SetView(0))
-        "2" -> Ok(SetView(1))
-
-        " " -> Ok(TogglePlayPause)
-        "/" -> Ok(Search(input: "", capturing: True))
-        "q" -> Ok(Exit)
-
-        // NOOP
-        _ -> Error(Nil)
-      }
-    }
-
-    // NOOP
     _ -> Error(Nil)
   }
 }
 
-pub fn searching_from_key(key: Key, input: String) -> Result(Control, Nil) {
+fn char_control(char: String) -> Control {
-  case key {
+  case char {
-    key.Char(char) -> Ok(Search(input <> char, True))
+    " " -> TogglePlayPause
-    key.Backspace -> Ok(Search(string.drop_end(input, 1), True))
+    "/" -> Search
-    key.Return -> Ok(Search(input, False))
+    "q" -> Exit
-
+    _ -> Raw(char)
-    // NOOP
-    _ -> Error(Nil)
   }
 }

src/musicplayer/musicplayer.gleam

@@ -1,8 +1,9 @@
 import gleam/erlang/process.{type Name, type Pid, type Subject}
 import gleam/otp/actor
+import gleam/result
 import gleam/string
 
-import musicplayer/control.{type Mode}
+import musicplayer/control.{type Control}
 import musicplayer/input/key.{type Key}
 import musicplayer/logging/logging
 import musicplayer/mpv/control as mpv_control
@@ -10,9 +11,19 @@ import musicplayer/time/time
 import musicplayer/ui/control as ui_control
 import musicplayer/ui/layout
 
+type Mode {
+  Idle
+  Searching
+}
+
+type Input {
+  Input(capturing: Bool, content: String)
+}
+
 type State {
   State(
     mode: Mode,
+    input: Input,
     ui: Subject(ui_control.Control),
     mpv: Subject(mpv_control.Control),
   )
@@ -25,8 +36,10 @@ pub fn new(
 ) -> Result(Pid, String) {
   let input_keys = process.named_subject(input_keys_name)
 
+  let input = Input(False, "")
+
   case
-    actor.new(State(control.Idle, ui, mpv))
+    actor.new(State(Idle, input, ui, mpv))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -36,77 +49,94 @@ pub fn new(
       logging.log("musicplayer - started")
       process.spawn(fn() {
         let assert Ok(_) = process.register(process.self(), input_keys_name)
-        forward_key(musicplayer, input_keys)
+        handle_key(musicplayer, input_keys)
       })
 
-      process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
+      process.spawn(fn() { update_playback_time_loop(mpv, ui, 1000) })
 
       Ok(pid)
     }
   }
 }
 
-fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
+fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
-  case control.from_key(key, state.mode) {
+  case control {
-    Error(_) -> actor.continue(state)
+    control.Search -> {
-    Ok(c) ->
+      logging.log("musicplayer - initiating search")
-      case c {
-        control.SetView(view_idx) -> {
-          logging.log(
-            "musicplayer - setting current view to: "
-            <> string.inspect(view_idx),
-          )
 
-          update_current_view(state.ui, view_idx)
+      update_search(state.ui, "searching: ")
-          actor.continue(state)
-        }
-        control.Search(input, capturing) -> {
-          case capturing {
-            True -> {
-              logging.log("musicplayer - searching: " <> input)
 
-              update_search(state.ui, "searching: " <> input)
+      actor.continue(
+        State(
+          ..state,
+          mode: Searching,
+          input: Input(..state.input, capturing: True),
+        ),
+      )
+    }
 
-              actor.continue(State(..state, mode: control.Searching(input)))
+    control.Raw(content) -> {
-            }
+      logging.log("musicplayer - recieved raw input: " <> content)
-            False -> {
-              logging.log(
-                "musicplayer - recieved return. `input`: "
-                <> "'"
-                <> input
-                <> "'",
-              )
 
-              update_search(state.ui, "")
+      let content = case state.mode {
-
+        Idle -> state.input.content
-              actor.continue(State(..state, mode: control.Idle))
+        Searching -> {
-            }
+          let updated = state.input.content <> content
-          }
+          update_search(state.ui, "searching: " <> updated)
-        }
+          updated
-        control.TogglePlayPause -> {
-          logging.log("musicplayer - toggling play/pause")
-
-          process.send(state.mpv, mpv_control.TogglePlayPause)
-          update_playback_time(state.mpv, state.ui)
-          actor.continue(state)
-        }
-        control.Exit -> {
-          logging.log("musicplayer - initiating musicplayer shutdown")
-          // Close `mpv` socket
-          process.call(state.mpv, 1000, fn(reply_to) {
-            mpv_control.Exit(reply_to)
-          })
-
-          // Reset terminal state (show cursor etc.)
-          process.call(state.ui, 1000, fn(reply_to) {
-            ui_control.Exit(reply_to)
-          })
-
-          logging.log("musicplayer - stopped")
-
-          actor.stop()
         }
       }
+
+      actor.continue(State(..state, input: Input(..state.input, content:)))
+    }
+    control.Backspace -> {
+      logging.log("musicplayer - recieved backspace")
+
+      let content = case state.mode {
+        Idle -> state.input.content
+        Searching -> string.drop_end(state.input.content, 1)
+      }
+      actor.continue(State(..state, input: Input(..state.input, content:)))
+    }
+    control.Return -> {
+      logging.log(
+        "musicplayer - recieved return. `input.capture`: "
+        <> "'"
+        <> state.input.content
+        <> "'",
+      )
+
+      // Note: state.input.content is now the final input, use it
+      // before it is reset
+      case state.mode {
+        Idle -> Nil
+        Searching -> update_search(state.ui, "")
+      }
+
+      actor.continue(
+        State(..state, mode: Idle, input: Input(capturing: False, content: "")),
+      )
+    }
+
+    control.TogglePlayPause -> {
+      logging.log("musicplayer - toggling play/pause")
+
+      process.send(state.mpv, mpv_control.TogglePlayPause)
+      update_playback_time(state.mpv, state.ui)
+      actor.continue(state)
+    }
+    control.Exit -> {
+      logging.log("musicplayer - initiating musicplayer shutdown")
+      // Close `mpv` socket
+      process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
+
+      // Reset terminal state (show cursor etc.)
+      process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
+
+      logging.log("musicplayer - stopped")
+
+      actor.stop()
+    }
   }
 }
 
@@ -155,21 +185,14 @@ fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
   process.send(ui, ui_control.UpdateState(layout.Search, content))
 }
 
-fn update_current_view(
+/// `handle_key` listens to a subject onto which `input` will send messages with `Key`s
-  ui: Subject(ui_control.Control),
+fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
-  view_idx: layout.ViewIdx,
-) {
-  process.send(ui, ui_control.SetView(view_idx))
-}
-
-/// `forward_key` listens to a subject onto which `input` will send messages with `Key`s
-/// that is then forwarded to the `musicplayer` agent to handle
-fn forward_key(musicplayer: Subject(Key), input_keys: Subject(Key)) -> Nil {
   let _ =
     process.new_selector()
     |> process.select(input_keys)
     |> process.selector_receive_forever
-    |> process.send(musicplayer, _)
+    |> control.from_key
+    |> result.map(process.send(musicplayer, _))
 
-  forward_key(musicplayer, input_keys)
+  handle_key(musicplayer, input_keys)
 }

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/control.gleam

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

src/musicplayer/ui/internal.gleam

@@ -3,16 +3,6 @@ import gleam/io
 
 // https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
 
-pub const move_to_home = "\u{001B}[H"
-
-pub const disable_auto_wrap = "\u{001B}[?7l"
-
-pub const enable_auto_wrap = "\u{001B}[?7h"
-
-pub fn update(frame: String) -> Nil {
-  io.print(disable_auto_wrap <> move_to_home <> frame <> enable_auto_wrap)
-}
-
 pub fn clear_screen() -> Nil {
   io.print("\u{001B}[2J\u{001B}[H")
 }
@@ -22,6 +12,10 @@ pub fn chars_at(chars: String, x: Int, y: Int) -> String {
   seq <> chars
 }
 
+pub fn print(chars: String) -> Nil {
+  io.print(chars)
+}
+
 pub fn hide_cursor() -> Nil {
   io.print("\u{001B}[?25l")
 }

src/musicplayer/ui/layout.gleam

@@ -1,101 +1,89 @@
 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
 
+import musicplayer/logging/logging
+import musicplayer/ui/ansi
 import musicplayer/ui/internal
-import musicplayer/ui/plot.{type Buffer}
-
-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 ViewIdx =
-  Int
-
-pub type View =
-  dict.Dict(Section, Node)
-
-// Layout consists of a list Views, and only one View is rendered at a time
 pub type Layout {
-  Layout(
+  Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
-    columns: Int,
-    rows: Int,
-    current_view: ViewIdx,
-    views: dict.Dict(ViewIdx, View),
-  )
 }
 
-pub fn new(
+pub fn new() -> Layout {
-  columns: Int,
+  let nodes =
-  rows: Int,
+    dict.from_list([
-  views: List(List(#(Section, Node))),
+      #(
-) -> Layout {
+        Root,
-  let views =
+        Node(
-    list.index_map(views, fn(view_nodes, i) { #(i, view_nodes) })
+          t: Container,
-    |> list.fold(dict.new(), fn(view_acc, iv) {
+          content: "Music Player",
-      let #(i, view_nodes) = iv
+          width_percent: 100,
-
+          height_percent: 100,
-      dict.insert(view_acc, i, view_loop(i, view_nodes))
+          children: [Header, Search, PlaybackTime],
-    })
+        ),
-
+      ),
-  Layout(columns:, rows:, current_view: 0, views:)
+      #(
-}
+        Header,
-
+        Node(
-fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
+          t: Row,
-  let children =
+          content: "Foo (1) | Bar (2) | Baz (3)",
-    view_nodes
+          width_percent: 100,
-    |> list.flat_map(fn(node) {
+          height_percent: 33,
-      case pair.second(node) {
+          children: [],
-        Row(children: c, ..) -> c
+        ),
-        Cell(..) -> []
+      ),
-      }
+      #(
-    })
+        Search,
-    |> set.from_list
+        Node(
-
+          t: Row,
-  // All sections that are not children of other nodes will be added as
+          content: "",
-  // children to the root
+          width_percent: 100,
-  let orphans =
+          height_percent: 33,
-    view_nodes
+          children: [],
-    |> list.map(pair.first)
+        ),
-    |> list.filter(fn(node) { !set.contains(children, node) })
+      ),
-
+      #(
-  dict.from_list(view_nodes)
+        PlaybackTime,
-  |> dict.insert(
+        Node(
-    view_index_section(i),
+          t: Row,
-    Row(
+          content: "00:00",
-      content: "",
+          width_percent: 100,
-      style: Style(dimensions: Percent(width: 100, height: 100)),
+          height_percent: 33,
-      children: orphans,
+          children: [],
-    ),
+        ),
-  )
+      ),
-}
+    ])
-
+  Layout(width: 0, height: 0, nodes: nodes)
-/// Takes a ViewIndex and create a Section key from it
-fn view_index_section(view_idx: ViewIdx) -> Section {
-  Section(string.append("view_", int.to_string(view_idx)))
 }
 
 pub fn update_section(
@@ -103,146 +91,141 @@ pub fn update_section(
   section: Section,
   content: String,
 ) -> Layout {
-  case dict.get(layout.views, layout.current_view) {
+  case dict.get(layout.nodes, section) {
     Error(_) -> layout
-    Ok(view) ->
+    Ok(node) ->
-      case dict.get(view, section) {
+      Layout(
-        Error(_) -> layout
+        ..layout,
-        Ok(node) -> {
+        nodes: dict.insert(
-          let updated_node = case node {
+          layout.nodes,
-            Cell(..) -> Cell(..node, content: content)
+          section,
-            Row(..) -> Row(..node, content: content)
+          Node(..node, content: content),
-          }
+        ),
-
+      )
-          let updated_view = dict.insert(view, section, updated_node)
-
-          Layout(
-            ..layout,
-            views: dict.insert(layout.views, layout.current_view, updated_view),
-          )
-        }
-      }
   }
 }
 
-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 update_current_view(layout: Layout, view_idx: ViewIdx) -> Layout {
-  Layout(..layout, current_view: view_idx)
 }
 
 pub fn render(layout: Layout) -> Nil {
-  let context =
+  internal.clear_screen()
-    RenderContext(
+  [layout.width, layout.height]
-      parent_width: layout.columns,
+  |> list.map(int.to_string)
-      parent_height: layout.rows,
+  |> string.join(" ")
-      parent_top_left_x: 1,
+  |> string.append("layout - render: ", _)
-      parent_top_left_y: 1,
+  |> logging.log
-      position_index: 0,
+
+  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))
+      },
     )
 
-  case dict.get(layout.views, layout.current_view) {
+  string_tree.new()
-    Error(_) -> Nil
+  |> render_generic(
-    Ok(view) -> {
+    layout,
-      let buffer: Buffer = dict.new()
+    container_width,
-
+    container_height,
-      render_loop(
+    container_top_left_x,
-        view,
+    container_top_left_y,
-        context,
+    0,
-        view_index_section(layout.current_view),
+    Root,
-        buffer,
+    _,
-      )
+    ansi_renders,
-      |> plot.flush_buffer(layout.columns, layout.rows)
+  )
-      |> internal.update
+  |> string_tree.to_string
-    }
+  |> internal.print
-  }
 }
 
-pub type RenderContext {
+pub type Renders(into) {
-  RenderContext(
+  Renders(
-    parent_width: Int,
+    text: fn(into, String, Int, Int) -> into,
-    parent_height: Int,
+    box: fn(into, Int, Int, Int, Int) -> into,
-    parent_top_left_x: Int,
-    parent_top_left_y: Int,
-    position_index: Int,
   )
 }
 
-pub fn render_loop(
+pub fn render_generic(
-  view: View,
+  layout: Layout,
-  context: RenderContext,
+  // Dimensions
+  container_width: Float,
+  container_height: Float,
+  container_tl_x: Int,
+  container_tl_y: Int,
+  // State
+  index: Int,
   from: Section,
-  buffer: Buffer,
+  render_into: into,
-) -> Buffer {
+  renders: Renders(into),
-  case dict.get(view, from) {
+) -> into {
-    Error(_) -> buffer
+  case dict.get(layout.nodes, from) {
+    Error(_) -> render_into
     Ok(node) -> {
-      // Margin between container and the node being rendered
+      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 =
-        plot.box(
+        render_into
-          buffer,
+        |> 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,
         )
-        |> plot.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_buffer, 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_loop(view, context, child, acc_buffer)
-          })
-        }
-      }
     }
   }
 }

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,44 +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 views = [
+  let nodes =
-    [
+    dict.from_list([
+      #(
+        Section("Root"),
+        Node(
+          t: Container,
+          content: "container",
+          width_percent: 100,
+          height_percent: 100,
+          children: [
+            Section("Row1"),
+            Section("Row2"),
+          ],
+        ),
+      ),
       #(
         Section("Row1"),
-        layout.Row(
+        Node(
+          t: layout.Row,
           content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+          width_percent: 100,
+          height_percent: 50,
           children: [
             Section("A"),
-            Section("B"),
+            Section("A"),
           ],
         ),
       ),
       #(
         Section("A"),
-        layout.Cell(
+        Node(
+          t: layout.Cell,
           content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          width_percent: 50,
+          height_percent: 100,
+          children: [],
         ),
       ),
       #(
         Section("B"),
-        layout.Cell(
+        Node(
+          t: layout.Cell,
           content: "cell 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          width_percent: 50,
+          height_percent: 100,
+          children: [],
         ),
       ),
       #(
         Section("Row2"),
-        layout.Row(
+        Node(
+          t: layout.Row,
           content: "row 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          width_percent: 100,
+          height_percent: 50,
           children: [],
         ),
       ),
-    ],
+    ])
-  ]
 
-  layout.new(columns, rows, views)
+  Layout(width:, height:, nodes: nodes)
 }

src/musicplayer/ui/plot.gleam

@@ -1,72 +0,0 @@
-import gleam/dict.{type Dict}
-import gleam/list
-import gleam/string
-
-pub type Buffer =
-  Dict(#(Int, Int), String)
-
-pub fn flush_buffer(buffer: Buffer, columns: Int, rows: Int) -> String {
-  list.range(1, rows)
-  |> list.map(fn(y) {
-    list.range(1, columns)
-    |> list.map(fn(x) {
-      case dict.get(buffer, #(x, y)) {
-        Ok(char) -> char
-        Error(_) -> " "
-      }
-    })
-    |> string.join("")
-  })
-  |> string.join("\r\n")
-}
-
-pub fn text(buffer: Buffer, text: String, x: Int, y: Int) -> Buffer {
-  text
-  |> string.to_graphemes
-  |> list.index_fold(buffer, fn(acc, char, i) {
-    dict.insert(acc, #(x + i, y), char)
-  })
-}
-
-pub fn box(buffer: Buffer, x: Int, y: Int, width: Int, height: Int) -> Buffer {
-  // TODO move box style to `layout.Style`
-  let box_chars = #("┌", "┐", "└", "┘", "─", "│")
-  let #(tl, tr, bl, br, hor, ver) = box_chars
-
-  case width < 2 || height < 2 {
-    True -> buffer
-    False -> {
-      buffer
-      |> dict.insert(#(x, y), tl)
-      |> dict.insert(#(x + width - 1, y), tr)
-      |> dict.insert(#(x, y + height - 1), bl)
-      |> dict.insert(#(x + width - 1, y + height - 1), br)
-      |> horizontal_line(x + 1, y, width - 2, hor)
-      |> horizontal_line(x + 1, y + height - 1, width - 2, hor)
-      |> vertical_line(x, y + 1, height - 2, ver)
-      |> vertical_line(x + width - 1, y + 1, height - 2, ver)
-    }
-  }
-}
-
-fn horizontal_line(
-  buffer: Buffer,
-  x: Int,
-  y: Int,
-  len: Int,
-  char: String,
-) -> Buffer {
-  list.range(0, len - 1)
-  |> list.fold(buffer, fn(acc, i) { dict.insert(acc, #(x + i, y), char) })
-}
-
-fn vertical_line(
-  buffer: Buffer,
-  x: Int,
-  y: Int,
-  len: Int,
-  char: String,
-) -> Buffer {
-  list.range(0, len - 1)
-  |> list.fold(buffer, fn(acc, i) { dict.insert(acc, #(x, y + i), char) })
-}

src/musicplayer/ui/ui.gleam

@@ -17,69 +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)",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 50,
-            )),
-            children: [],
-          ),
-        ),
-        #(
-          layout.PlaybackTime,
-          layout.Row(
-            content: "00:00",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 50,
-            )),
-            children: [],
-          ),
-        ),
-      ],
-      [
-        #(
-          layout.Header,
-          layout.Row(
-            content: "Foo (1) | Bar <2>",
-            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))
@@ -113,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:))
@@ -144,12 +82,6 @@ fn handle_message(
       process.send(reply_to, Nil)
       actor.stop()
     }
-    control.SetView(view_idx) -> {
-      let layout = layout.update_current_view(state.layout, view_idx)
-
-      actor.send(state.redraw, layout)
-      actor.continue(State(..state, layout:))
-    }
   }
 }
 

test/musicplayer/control_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import musicplayer/control.{type Control, type Mode}
+import musicplayer/control.{type Control}
 import musicplayer/input/key.{type Key, Char}
 
 pub fn main() -> Nil {
@@ -9,24 +9,16 @@ pub fn main() -> Nil {
 }
 
 type TestCase {
-  TestCase(key: Key, mode: Mode, expected: Result(Control, Nil))
+  TestCase(key: Key, expected: Result(Control, Nil))
 }
 
 pub fn control_from_key_test() {
-  let idle_tests = [
+  let test_cases = [
-    TestCase(Char(" "), control.Idle, Ok(control.TogglePlayPause)),
+    TestCase(Char(" "), Ok(control.TogglePlayPause)),
-    TestCase(Char("/"), control.Idle, Ok(control.Search("", True))),
+    TestCase(Char("q"), Ok(control.Exit)),
-    TestCase(Char("q"), control.Idle, Ok(control.Exit)),
   ]
 
-  let search_tests = [
+  list.each(test_cases, fn(tc) {
-    TestCase(Char("a"), control.Searching(""), Ok(control.Search("a", True))),
+    assert tc.expected == control.from_key(tc.key)
-    TestCase(Char("b"), control.Searching("a"), Ok(control.Search("ab", True))),
-  ]
-
-  let test_cases = [idle_tests, search_tests]
-
-  list.each(list.flatten(test_cases), fn(tc) {
-    assert tc.expected == control.from_key(tc.key, tc.mode)
   })
 }

test/musicplayer/ui/layout_test.gleam

@@ -3,60 +3,82 @@ import gleam/io
 import gleam/string
 import gleeunit
 import gleeunit/should
+import musicplayer/ui/virtual_ansi
 
-import musicplayer/ui/layout.{Percent, RenderContext, Section, Style}
+import musicplayer/ui/layout.{Layout, Node, Section}
-import musicplayer/ui/plot
 
 pub fn main() -> Nil {
   gleeunit.main()
 }
 
-pub fn percent_layout_test() {
+pub fn foo_test() {
-  let views = [
+  let layout =
-    [
+    Layout(
-      #(
+      width: 80,
-        Section("Row1"),
+      height: 20,
-        layout.Row(
+      nodes: dict.from_list([
-          content: "row 1",
+        #(
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+          Section("Root"),
-          children: [
+          Node(
-            Section("A"),
+            t: layout.Container,
-            Section("B"),
+            content: "container",
-          ],
+            width_percent: 100,
+            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: 100)),
+            width_percent: 100,
+            height_percent: 50,
+            children: [
+              Section("A"),
+              Section("B"),
+            ],
+          ),
         ),
-      ),
+        #(
-      #(
+          Section("A"),
-        Section("B"),
+          Node(
-        layout.Cell(
+            t: layout.Cell,
-          content: "cell 2",
+            content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 100)),
+            width_percent: 50,
+            height_percent: 100,
+            children: [],
+          ),
         ),
-      ),
+        #(
-      #(
+          Section("B"),
-        Section("Row2"),
+          Node(
-        layout.Row(
+            t: layout.Cell,
-          content: "row 1",
+            content: "cell 2",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+            width_percent: 50,
-          children: [],
+            height_percent: 100,
+            children: [],
+          ),
         ),
-      ),
+        #(
-    ],
+          Section("Row2"),
-  ]
+          Node(
-
+            t: layout.Row,
-  let columns = 80
+            content: "row 1",
-  let rows = 20
+            width_percent: 100,
-  let layout = layout.new(columns, rows, views)
+            height_percent: 50,
+            children: [],
+          ),
+        ),
+      ]),
+    )
 
   let expected =
     "
-┌──────────────────────────────────────────────────────────────────────────────┐
+container──────────────────────────────────────────────────────────────────────┐
 │row 1────────────────────────────────────────────────────────────────────────┐│
 ││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
 │││                                    ││                                    │││
@@ -77,30 +99,10 @@ pub fn percent_layout_test() {
 │└────────────────────────────────────────────────────────────────────────────┘│
 └──────────────────────────────────────────────────────────────────────────────┘
 "
-    |> string.replace(each: "\n", with: "\r\n")
-    |> string.trim
 
-  let context =
+  let visual =
-    RenderContext(
+    virtual_ansi.render(layout, Section("Root"), layout.width, layout.height)
-      parent_width: layout.columns,
+  case visual == string.trim(expected) {
-      parent_height: layout.rows,
-      parent_top_left_x: 1,
-      parent_top_left_y: 1,
-      position_index: 0,
-    )
-
-  let assert Ok(view) = dict.get(layout.views, layout.current_view)
-
-  let flushed =
-    layout.render_loop(
-      view,
-      context,
-      Section(string.append("view_", string.inspect(layout.current_view))),
-      dict.new(),
-    )
-    |> plot.flush_buffer(layout.columns, layout.rows)
-
-  case flushed == expected {
     True -> Nil
     False -> {
       io.println("Test failed")
@@ -108,9 +110,9 @@ pub fn percent_layout_test() {
       io.println(string.trim(expected))
 
       io.println("Got:")
-      io.println(flushed)
+      io.println(visual)
 
-      should.equal(flushed, expected)
+      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, type Section, Renders}
+
+pub type Screen =
+  dict.Dict(#(Int, Int), String)
+
+pub fn render(layout: Layout, root: Section, width: Int, height: Int) -> 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(width),
+      int.to_float(height),
+      1,
+      1,
+      0,
+      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) })
+}