Compare commits
3 Commits
dynamic-la
...
95eaeb60f4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95eaeb60f4 | ||
|
|
ed69566f6f | ||
|
|
b5965360eb |
@@ -52,7 +52,7 @@ pub fn new(
|
|||||||
handle_key(musicplayer, input_keys)
|
handle_key(musicplayer, input_keys)
|
||||||
})
|
})
|
||||||
|
|
||||||
process.spawn(fn() { update_playback_time_loop(mpv, ui, 1000) })
|
process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
|
||||||
|
|
||||||
Ok(pid)
|
Ok(pid)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@ import gleam/erlang/process.{type Subject}
|
|||||||
import musicplayer/ui/layout.{type Section}
|
import musicplayer/ui/layout.{type Section}
|
||||||
|
|
||||||
pub type Control {
|
pub type Control {
|
||||||
UpdateDimensions(width: Int, height: Int)
|
UpdateDimensions(columns: Int, rows: Int)
|
||||||
UpdateState(section: Section, content: String)
|
UpdateState(section: Section, content: String)
|
||||||
|
|
||||||
Exit(reply_to: Subject(Nil))
|
Exit(reply_to: Subject(Nil))
|
||||||
|
|||||||
@@ -3,6 +3,16 @@ import gleam/io
|
|||||||
|
|
||||||
// https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
|
// 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 {
|
pub fn clear_screen() -> Nil {
|
||||||
io.print("\u{001B}[2J\u{001B}[H")
|
io.print("\u{001B}[2J\u{001B}[H")
|
||||||
}
|
}
|
||||||
@@ -12,10 +22,6 @@ pub fn chars_at(chars: String, x: Int, y: Int) -> String {
|
|||||||
seq <> chars
|
seq <> chars
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn print(chars: String) -> Nil {
|
|
||||||
io.print(chars)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn hide_cursor() -> Nil {
|
pub fn hide_cursor() -> Nil {
|
||||||
io.print("\u{001B}[?25l")
|
io.print("\u{001B}[?25l")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,89 +1,97 @@
|
|||||||
import gleam/dict
|
import gleam/dict
|
||||||
import gleam/float
|
|
||||||
import gleam/int
|
import gleam/int
|
||||||
import gleam/list
|
import gleam/list
|
||||||
|
import gleam/pair
|
||||||
|
import gleam/set
|
||||||
import gleam/string
|
import gleam/string
|
||||||
import gleam/string_tree
|
|
||||||
|
|
||||||
import musicplayer/logging/logging
|
import musicplayer/logging/logging
|
||||||
import musicplayer/ui/ansi
|
|
||||||
import musicplayer/ui/internal
|
import musicplayer/ui/internal
|
||||||
|
import musicplayer/ui/plot.{type Buffer}
|
||||||
|
|
||||||
|
pub const root_section = "reserved_root_section"
|
||||||
|
|
||||||
pub type Section {
|
pub type Section {
|
||||||
Section(String)
|
Section(String)
|
||||||
|
|
||||||
Root
|
|
||||||
Header
|
Header
|
||||||
Search
|
Search
|
||||||
PlaybackTime
|
PlaybackTime
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type NodeType {
|
pub type Dimension {
|
||||||
Container
|
Percent(width: Int, height: Int)
|
||||||
Row
|
// TODO add Flex that flows
|
||||||
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 {
|
pub type Node {
|
||||||
Node(
|
Row(content: String, style: Style, children: List(Section))
|
||||||
t: NodeType,
|
Cell(content: String, style: Style)
|
||||||
content: String,
|
}
|
||||||
width_percent: Int,
|
|
||||||
height_percent: Int,
|
pub type ViewIdx =
|
||||||
children: List(Section),
|
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(
|
||||||
|
columns: Int,
|
||||||
|
rows: Int,
|
||||||
|
current_view: ViewIdx,
|
||||||
|
views: dict.Dict(ViewIdx, View),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type Layout {
|
pub fn new(
|
||||||
Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
|
columns: Int,
|
||||||
|
rows: Int,
|
||||||
|
views: List(List(#(Section, Node))),
|
||||||
|
) -> Layout {
|
||||||
|
let views =
|
||||||
|
list.index_map(views, fn(view_nodes, i) { #(i, view_nodes) })
|
||||||
|
|> list.fold(dict.new(), fn(view_acc, iv) {
|
||||||
|
let #(i, view_nodes) = iv
|
||||||
|
|
||||||
|
dict.insert(view_acc, i, view_loop(i, view_nodes))
|
||||||
|
})
|
||||||
|
|
||||||
|
Layout(columns:, rows:, current_view: 0, views:)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new() -> Layout {
|
fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
|
||||||
let nodes =
|
let children =
|
||||||
dict.from_list([
|
view_nodes
|
||||||
#(
|
|> list.flat_map(fn(node) {
|
||||||
Root,
|
case pair.second(node) {
|
||||||
Node(
|
Row(children: c, ..) -> c
|
||||||
t: Container,
|
Cell(..) -> []
|
||||||
content: "Music Player",
|
}
|
||||||
width_percent: 100,
|
})
|
||||||
height_percent: 100,
|
|> set.from_list
|
||||||
children: [Header, Search, PlaybackTime],
|
|
||||||
),
|
// All sections that are not children of other nodes will be added as
|
||||||
),
|
// children to the root
|
||||||
#(
|
let orphans =
|
||||||
Header,
|
view_nodes
|
||||||
Node(
|
|> list.map(pair.first)
|
||||||
t: Row,
|
|> list.filter(fn(node) { !set.contains(children, node) })
|
||||||
content: "Foo (1) | Bar (2) | Baz (3)",
|
|
||||||
width_percent: 100,
|
dict.from_list(view_nodes)
|
||||||
height_percent: 33,
|
|> dict.insert(
|
||||||
children: [],
|
Section(string.append("view_", string.inspect(i))),
|
||||||
),
|
Row(
|
||||||
),
|
|
||||||
#(
|
|
||||||
Search,
|
|
||||||
Node(
|
|
||||||
t: Row,
|
|
||||||
content: "",
|
content: "",
|
||||||
width_percent: 100,
|
style: Style(dimensions: Percent(width: 100, height: 100)),
|
||||||
height_percent: 33,
|
children: orphans,
|
||||||
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(
|
pub fn update_section(
|
||||||
@@ -91,141 +99,148 @@ pub fn update_section(
|
|||||||
section: Section,
|
section: Section,
|
||||||
content: String,
|
content: String,
|
||||||
) -> Layout {
|
) -> Layout {
|
||||||
case dict.get(layout.nodes, section) {
|
case dict.get(layout.views, layout.current_view) {
|
||||||
Error(_) -> layout
|
Error(_) -> layout
|
||||||
Ok(node) ->
|
Ok(view) ->
|
||||||
|
case dict.get(view, section) {
|
||||||
|
Error(_) -> layout
|
||||||
|
Ok(node) -> {
|
||||||
|
let updated_node = case node {
|
||||||
|
Cell(..) -> Cell(..node, content: content)
|
||||||
|
Row(..) -> Row(..node, content: content)
|
||||||
|
}
|
||||||
|
|
||||||
|
let updated_view = dict.insert(view, section, updated_node)
|
||||||
|
|
||||||
Layout(
|
Layout(
|
||||||
..layout,
|
..layout,
|
||||||
nodes: dict.insert(
|
views: dict.insert(layout.views, layout.current_view, updated_view),
|
||||||
layout.nodes,
|
|
||||||
section,
|
|
||||||
Node(..node, content: content),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn update_dimensions(layout: Layout, width: Int, height: Int) -> Layout {
|
pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
|
||||||
Layout(..layout, width:, height:)
|
Layout(..layout, columns:, rows:)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn render(layout: Layout) -> Nil {
|
pub fn render(layout: Layout) -> Nil {
|
||||||
internal.clear_screen()
|
[layout.columns, layout.rows]
|
||||||
[layout.width, layout.height]
|
|
||||||
|> list.map(int.to_string)
|
|> list.map(int.to_string)
|
||||||
|> string.join(" ")
|
|> string.join(" ")
|
||||||
|> string.append("layout - render: ", _)
|
|> string.append("layout - render: ", _)
|
||||||
|> logging.log
|
|> logging.log
|
||||||
|
|
||||||
let container_width = int.to_float(layout.width)
|
let context =
|
||||||
let container_height = int.to_float(layout.height)
|
RenderContext(
|
||||||
let container_top_left_x = 1
|
parent_width: layout.columns,
|
||||||
let container_top_left_y = 1
|
parent_height: layout.rows,
|
||||||
|
parent_top_left_x: 1,
|
||||||
let ansi_renders =
|
parent_top_left_y: 1,
|
||||||
Renders(
|
position_index: 0,
|
||||||
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()
|
case dict.get(layout.views, layout.current_view) {
|
||||||
|> render_generic(
|
Error(_) -> Nil
|
||||||
layout,
|
Ok(view) -> {
|
||||||
container_width,
|
let buffer: Buffer = dict.new()
|
||||||
container_height,
|
|
||||||
container_top_left_x,
|
render_loop(
|
||||||
container_top_left_y,
|
view,
|
||||||
0,
|
context,
|
||||||
Root,
|
Section(string.append("view_", string.inspect(layout.current_view))),
|
||||||
_,
|
buffer,
|
||||||
ansi_renders,
|
|
||||||
)
|
)
|
||||||
|> string_tree.to_string
|
|> plot.flush_buffer(layout.columns, layout.rows)
|
||||||
|> internal.print
|
|> internal.update
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type Renders(into) {
|
pub type RenderContext {
|
||||||
Renders(
|
RenderContext(
|
||||||
text: fn(into, String, Int, Int) -> into,
|
parent_width: Int,
|
||||||
box: fn(into, Int, Int, Int, Int) -> into,
|
parent_height: Int,
|
||||||
|
parent_top_left_x: Int,
|
||||||
|
parent_top_left_y: Int,
|
||||||
|
position_index: Int,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn render_generic(
|
pub fn render_loop(
|
||||||
layout: Layout,
|
view: View,
|
||||||
// Dimensions
|
context: RenderContext,
|
||||||
container_width: Float,
|
|
||||||
container_height: Float,
|
|
||||||
container_tl_x: Int,
|
|
||||||
container_tl_y: Int,
|
|
||||||
// State
|
|
||||||
index: Int,
|
|
||||||
from: Section,
|
from: Section,
|
||||||
render_into: into,
|
buffer: Buffer,
|
||||||
renders: Renders(into),
|
) -> Buffer {
|
||||||
) -> into {
|
case dict.get(view, from) {
|
||||||
case dict.get(layout.nodes, from) {
|
Error(_) -> buffer
|
||||||
Error(_) -> render_into
|
|
||||||
Ok(node) -> {
|
Ok(node) -> {
|
||||||
let margin = 2.0
|
// Margin between container and the node being rendered
|
||||||
|
let margin = 2
|
||||||
|
|
||||||
let width =
|
let #(node_width, node_height) = case node.style.dimensions {
|
||||||
container_width *. { int.to_float(node.width_percent) /. 100.0 }
|
Percent(width:, height:) -> {
|
||||||
|> float.floor
|
let width = { context.parent_width * width } / 100
|
||||||
|> float.truncate
|
let height = { context.parent_height * height } / 100
|
||||||
|
|
||||||
let height =
|
#(width, height)
|
||||||
container_height *. { int.to_float(node.height_percent) /. 100.0 }
|
}
|
||||||
|> float.floor
|
}
|
||||||
|> float.truncate
|
|
||||||
|
|
||||||
let #(cx, cy) = case node.t {
|
// Check if this node should be placed to the left or below the parent
|
||||||
Container -> #(container_tl_x, container_tl_y)
|
let #(node_top_left_x, node_top_left_y) = case node {
|
||||||
Row -> #(container_tl_x, container_tl_y + { index * height })
|
Row(..) -> #(
|
||||||
Cell -> #(container_tl_x + { index * width }, container_tl_y)
|
context.parent_top_left_x,
|
||||||
|
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 =
|
let parent =
|
||||||
render_into
|
plot.box(
|
||||||
|> renders.box(cx, cy, width, height)
|
buffer,
|
||||||
// + 2 for header margin
|
node_top_left_x,
|
||||||
|> renders.text(node.content, cx + 2, cy)
|
node_top_left_y,
|
||||||
|
node_width,
|
||||||
|
node_height,
|
||||||
|
)
|
||||||
|
|> plot.text(node.content, node_top_left_x, node_top_left_y)
|
||||||
|
|
||||||
list.index_map(node.children, fn(child, i) { #(i, child) })
|
case node {
|
||||||
|> list.fold(parent, fn(acc_into, ic) {
|
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 #(i, child) = ic
|
||||||
|
|
||||||
let cw =
|
let #(child_width, child_height) = case node.style.dimensions {
|
||||||
container_width
|
Percent(width:, height:) -> {
|
||||||
*. { int.to_float(node.width_percent) /. 100.0 }
|
let width = { { context.parent_width * width } / 100 } - margin
|
||||||
-. margin
|
let height =
|
||||||
|> float.floor
|
{ { context.parent_height * height } / 100 } - margin
|
||||||
|
|
||||||
let ch =
|
#(width, height)
|
||||||
container_height
|
}
|
||||||
*. { int.to_float(node.height_percent) /. 100.0 }
|
}
|
||||||
-. margin
|
|
||||||
|> float.floor
|
|
||||||
|
|
||||||
let child_origin_x = container_tl_x + 1
|
let context =
|
||||||
let child_origin_y = container_tl_y + 1
|
RenderContext(
|
||||||
|
parent_width: child_width,
|
||||||
render_generic(
|
parent_height: child_height,
|
||||||
layout,
|
parent_top_left_x: context.parent_top_left_x + 1,
|
||||||
cw,
|
parent_top_left_y: context.parent_top_left_y + 1,
|
||||||
ch,
|
position_index: i,
|
||||||
child_origin_x,
|
|
||||||
child_origin_y,
|
|
||||||
i,
|
|
||||||
child,
|
|
||||||
acc_into,
|
|
||||||
renders,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
render_loop(view, context, child, acc_buffer)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
import gleam/dict
|
|
||||||
|
|
||||||
import musicplayer/ui/internal
|
import musicplayer/ui/internal
|
||||||
import musicplayer/ui/layout.{Container, Layout, Node, Section}
|
import musicplayer/ui/layout.{Percent, Section, Style}
|
||||||
import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
|
import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let assert Ok(width) = internal.io_get_columns()
|
let assert Ok(columns) = internal.io_get_columns()
|
||||||
let assert Ok(height) = internal.io_get_rows()
|
let assert Ok(rows) = internal.io_get_rows()
|
||||||
|
|
||||||
two_rows_with_cells(width, height)
|
two_rows_with_cells(columns, rows)
|
||||||
|> layout.render
|
|> layout.render
|
||||||
|
|
||||||
wait_for_input()
|
wait_for_input()
|
||||||
@@ -17,66 +15,44 @@ pub fn main() {
|
|||||||
/// Two rows:
|
/// Two rows:
|
||||||
/// First row has two cells
|
/// First row has two cells
|
||||||
/// Second row has no cells
|
/// Second row has no cells
|
||||||
fn two_rows_with_cells(width: Int, height: Int) -> layout.Layout {
|
fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
|
||||||
let nodes =
|
let views = [
|
||||||
dict.from_list([
|
[
|
||||||
#(
|
|
||||||
Section("Root"),
|
|
||||||
Node(
|
|
||||||
t: Container,
|
|
||||||
content: "container",
|
|
||||||
width_percent: 100,
|
|
||||||
height_percent: 100,
|
|
||||||
children: [
|
|
||||||
Section("Row1"),
|
|
||||||
Section("Row2"),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
#(
|
#(
|
||||||
Section("Row1"),
|
Section("Row1"),
|
||||||
Node(
|
layout.Row(
|
||||||
t: layout.Row,
|
|
||||||
content: "row 1",
|
content: "row 1",
|
||||||
width_percent: 100,
|
style: Style(dimensions: Percent(width: 100, height: 50)),
|
||||||
height_percent: 50,
|
|
||||||
children: [
|
children: [
|
||||||
Section("A"),
|
Section("A"),
|
||||||
Section("A"),
|
Section("B"),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("A"),
|
Section("A"),
|
||||||
Node(
|
layout.Cell(
|
||||||
t: layout.Cell,
|
|
||||||
content: "cell 1",
|
content: "cell 1",
|
||||||
width_percent: 50,
|
style: Style(dimensions: Percent(width: 50, height: 50)),
|
||||||
height_percent: 100,
|
|
||||||
children: [],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("B"),
|
Section("B"),
|
||||||
Node(
|
layout.Cell(
|
||||||
t: layout.Cell,
|
|
||||||
content: "cell 2",
|
content: "cell 2",
|
||||||
width_percent: 50,
|
style: Style(dimensions: Percent(width: 50, height: 50)),
|
||||||
height_percent: 100,
|
|
||||||
children: [],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("Row2"),
|
Section("Row2"),
|
||||||
Node(
|
layout.Row(
|
||||||
t: layout.Row,
|
|
||||||
content: "row 2",
|
content: "row 2",
|
||||||
width_percent: 100,
|
style: Style(dimensions: Percent(width: 50, height: 50)),
|
||||||
height_percent: 50,
|
|
||||||
children: [],
|
children: [],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
])
|
],
|
||||||
|
]
|
||||||
|
|
||||||
Layout(width:, height:, nodes: nodes)
|
layout.new(columns, rows, views)
|
||||||
}
|
}
|
||||||
|
|||||||
71
src/musicplayer/ui/plot.gleam
Normal file
71
src/musicplayer/ui/plot.gleam
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
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 {
|
||||||
|
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) })
|
||||||
|
}
|
||||||
@@ -17,7 +17,45 @@ pub fn new() -> Result(Subject(Control), String) {
|
|||||||
let redraw_name = process.new_name("redraw")
|
let redraw_name = process.new_name("redraw")
|
||||||
let redraw: Subject(Layout) = process.named_subject(redraw_name)
|
let redraw: Subject(Layout) = process.named_subject(redraw_name)
|
||||||
|
|
||||||
let layout = layout.new()
|
let layout =
|
||||||
|
[
|
||||||
|
[
|
||||||
|
#(
|
||||||
|
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
|
case
|
||||||
actor.new(State(redraw, layout))
|
actor.new(State(redraw, layout))
|
||||||
@@ -51,19 +89,19 @@ fn handle_message(
|
|||||||
control: Control,
|
control: Control,
|
||||||
) -> actor.Next(State(redraw, layout), Control) {
|
) -> actor.Next(State(redraw, layout), Control) {
|
||||||
case control {
|
case control {
|
||||||
control.UpdateDimensions(width, height) -> {
|
control.UpdateDimensions(columns, rows) -> {
|
||||||
let current_dimensions = #(state.layout.width, state.layout.height)
|
let current_dimensions = #(state.layout.columns, state.layout.rows)
|
||||||
|
|
||||||
case #(width, height) == current_dimensions {
|
case #(columns, rows) == current_dimensions {
|
||||||
True -> actor.continue(state)
|
True -> actor.continue(state)
|
||||||
False -> {
|
False -> {
|
||||||
[width, height]
|
[columns, rows]
|
||||||
|> list.map(int.to_string)
|
|> list.map(int.to_string)
|
||||||
|> string.join(" ")
|
|> string.join(" ")
|
||||||
|> string.append("ui - updating dimensions: ", _)
|
|> string.append("ui - updating dimensions: ", _)
|
||||||
|> logging.log
|
|> logging.log
|
||||||
|
|
||||||
let layout = layout.update_dimensions(state.layout, width, height)
|
let layout = layout.update_dimensions(state.layout, columns, rows)
|
||||||
|
|
||||||
process.send(state.redraw, layout)
|
process.send(state.redraw, layout)
|
||||||
actor.continue(State(..state, layout:))
|
actor.continue(State(..state, layout:))
|
||||||
|
|||||||
@@ -3,40 +3,22 @@ import gleam/io
|
|||||||
import gleam/string
|
import gleam/string
|
||||||
import gleeunit
|
import gleeunit
|
||||||
import gleeunit/should
|
import gleeunit/should
|
||||||
import musicplayer/ui/virtual_ansi
|
|
||||||
|
|
||||||
import musicplayer/ui/layout.{Layout, Node, Section}
|
import musicplayer/ui/layout.{Percent, RenderContext, Section, Style}
|
||||||
|
import musicplayer/ui/plot
|
||||||
|
|
||||||
pub fn main() -> Nil {
|
pub fn main() -> Nil {
|
||||||
gleeunit.main()
|
gleeunit.main()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn foo_test() {
|
pub fn percent_layout_test() {
|
||||||
let layout =
|
let views = [
|
||||||
Layout(
|
[
|
||||||
width: 80,
|
|
||||||
height: 20,
|
|
||||||
nodes: dict.from_list([
|
|
||||||
#(
|
|
||||||
Section("Root"),
|
|
||||||
Node(
|
|
||||||
t: layout.Container,
|
|
||||||
content: "container",
|
|
||||||
width_percent: 100,
|
|
||||||
height_percent: 100,
|
|
||||||
children: [
|
|
||||||
Section("Row1"),
|
|
||||||
Section("Row2"),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
#(
|
#(
|
||||||
Section("Row1"),
|
Section("Row1"),
|
||||||
Node(
|
layout.Row(
|
||||||
t: layout.Row,
|
|
||||||
content: "row 1",
|
content: "row 1",
|
||||||
width_percent: 100,
|
style: Style(dimensions: Percent(width: 100, height: 50)),
|
||||||
height_percent: 50,
|
|
||||||
children: [
|
children: [
|
||||||
Section("A"),
|
Section("A"),
|
||||||
Section("B"),
|
Section("B"),
|
||||||
@@ -45,40 +27,36 @@ pub fn foo_test() {
|
|||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("A"),
|
Section("A"),
|
||||||
Node(
|
layout.Cell(
|
||||||
t: layout.Cell,
|
|
||||||
content: "cell 1",
|
content: "cell 1",
|
||||||
width_percent: 50,
|
style: Style(dimensions: Percent(width: 50, height: 100)),
|
||||||
height_percent: 100,
|
|
||||||
children: [],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("B"),
|
Section("B"),
|
||||||
Node(
|
layout.Cell(
|
||||||
t: layout.Cell,
|
|
||||||
content: "cell 2",
|
content: "cell 2",
|
||||||
width_percent: 50,
|
style: Style(dimensions: Percent(width: 50, height: 100)),
|
||||||
height_percent: 100,
|
|
||||||
children: [],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
#(
|
#(
|
||||||
Section("Row2"),
|
Section("Row2"),
|
||||||
Node(
|
layout.Row(
|
||||||
t: layout.Row,
|
|
||||||
content: "row 1",
|
content: "row 1",
|
||||||
width_percent: 100,
|
style: Style(dimensions: Percent(width: 100, height: 50)),
|
||||||
height_percent: 50,
|
|
||||||
children: [],
|
children: [],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
]),
|
],
|
||||||
)
|
]
|
||||||
|
|
||||||
|
let columns = 80
|
||||||
|
let rows = 20
|
||||||
|
let layout = layout.new(columns, rows, views)
|
||||||
|
|
||||||
let expected =
|
let expected =
|
||||||
"
|
"
|
||||||
container──────────────────────────────────────────────────────────────────────┐
|
┌──────────────────────────────────────────────────────────────────────────────┐
|
||||||
│row 1────────────────────────────────────────────────────────────────────────┐│
|
│row 1────────────────────────────────────────────────────────────────────────┐│
|
||||||
││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
|
││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
|
||||||
│││ ││ │││
|
│││ ││ │││
|
||||||
@@ -99,10 +77,30 @@ container───────────────────────
|
|||||||
│└────────────────────────────────────────────────────────────────────────────┘│
|
│└────────────────────────────────────────────────────────────────────────────┘│
|
||||||
└──────────────────────────────────────────────────────────────────────────────┘
|
└──────────────────────────────────────────────────────────────────────────────┘
|
||||||
"
|
"
|
||||||
|
|> string.replace(each: "\n", with: "\r\n")
|
||||||
|
|> string.trim
|
||||||
|
|
||||||
let visual =
|
let context =
|
||||||
virtual_ansi.render(layout, Section("Root"), layout.width, layout.height)
|
RenderContext(
|
||||||
case visual == string.trim(expected) {
|
parent_width: layout.columns,
|
||||||
|
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
|
True -> Nil
|
||||||
False -> {
|
False -> {
|
||||||
io.println("Test failed")
|
io.println("Test failed")
|
||||||
@@ -110,9 +108,9 @@ container───────────────────────
|
|||||||
io.println(string.trim(expected))
|
io.println(string.trim(expected))
|
||||||
|
|
||||||
io.println("Got:")
|
io.println("Got:")
|
||||||
io.println(visual)
|
io.println(flushed)
|
||||||
|
|
||||||
should.equal(visual, expected)
|
should.equal(flushed, expected)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,113 +0,0 @@
|
|||||||
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) })
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user