From bf38f10d254d19cfd1aaa5c8f4d5d9ae033a8327 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:04:57 -0500 Subject: [PATCH 01/14] Moving terminal back to public. --- container/container_test.go | 6 ++-- container/draw_test.go | 2 +- container/focus_test.go | 2 +- container/traversal_test.go | 2 +- internal/canvas/braille/braille_test.go | 2 +- .../canvas/braille/testbraille/testbraille.go | 2 +- internal/canvas/canvas_test.go | 2 +- internal/canvas/testcanvas/testcanvas.go | 2 +- internal/draw/border_test.go | 2 +- internal/draw/braille_circle_test.go | 2 +- internal/draw/braille_fill_test.go | 2 +- internal/draw/braille_line_test.go | 2 +- internal/draw/hv_line_test.go | 2 +- internal/draw/rectangle_test.go | 2 +- internal/draw/segdisp/segment/segment_test.go | 2 +- internal/draw/segdisp/sixteen/sixteen_test.go | 2 +- internal/draw/text_test.go | 2 +- internal/draw/vertical_text_test.go | 2 +- termdash_test.go | 34 +++++++++++-------- termdashdemo/termdashdemo.go | 2 +- .../terminal => terminal}/faketerm/diff.go | 0 .../faketerm/faketerm.go | 0 .../termbox/cell_options.go | 0 .../termbox/cell_options_test.go | 0 .../termbox/color_mode.go | 0 .../terminal => terminal}/termbox/event.go | 0 .../termbox/event_test.go | 0 .../terminal => terminal}/termbox/termbox.go | 0 .../termbox/termbox_test.go | 0 widgets/barchart/barchart_test.go | 2 +- widgets/barchart/barchartdemo/barchartdemo.go | 2 +- widgets/button/button_test.go | 2 +- widgets/button/buttondemo/buttondemo.go | 2 +- widgets/donut/donut_test.go | 2 +- widgets/donut/donutdemo/donutdemo.go | 2 +- widgets/fakewidget/fakewidget_test.go | 2 +- widgets/gauge/gauge_test.go | 2 +- widgets/gauge/gaugedemo/gaugedemo.go | 2 +- widgets/linechart/linechart_test.go | 2 +- .../linechart/linechartdemo/linechartdemo.go | 2 +- widgets/segmentdisplay/segmentdisplay_test.go | 2 +- .../segmentdisplaydemo/segmentdisplaydemo.go | 2 +- widgets/sparkline/sparkline_test.go | 2 +- .../sparkline/sparklinedemo/sparklinedemo.go | 2 +- widgets/text/line_trim_test.go | 2 +- widgets/text/text_test.go | 2 +- widgets/text/textdemo/textdemo.go | 2 +- 47 files changed, 60 insertions(+), 52 deletions(-) rename {internal/terminal => terminal}/faketerm/diff.go (100%) rename {internal/terminal => terminal}/faketerm/faketerm.go (100%) rename {internal/terminal => terminal}/termbox/cell_options.go (100%) rename {internal/terminal => terminal}/termbox/cell_options_test.go (100%) rename {internal/terminal => terminal}/termbox/color_mode.go (100%) rename {internal/terminal => terminal}/termbox/event.go (100%) rename {internal/terminal => terminal}/termbox/event_test.go (100%) rename {internal/terminal => terminal}/termbox/termbox.go (100%) rename {internal/terminal => terminal}/termbox/termbox_test.go (100%) diff --git a/container/container_test.go b/container/container_test.go index 77ea229..97ea040 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -30,14 +30,16 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" ) // Example demonstrates how to use the Container API. func Example() { + bc, err := barchart.New() if _, err := New( /* terminal = */ nil, SplitVertical( @@ -61,7 +63,7 @@ func Example() { ), Right( Border(draw.LineStyleLight), - PlaceWidget(fakewidget.New(widgetapi.Options{})), + PlaceWidget(bc), ), ), ); err != nil { diff --git a/container/draw_test.go b/container/draw_test.go index 2b18d62..e2f016e 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -23,8 +23,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/focus_test.go b/container/focus_test.go index 306fadd..e707cbb 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/faketerm" ) // pointCase is a test case for the pointCont function. diff --git a/container/traversal_test.go b/container/traversal_test.go index 6b26d60..fb0f2d1 100644 --- a/container/traversal_test.go +++ b/container/traversal_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestRoot(t *testing.T) { diff --git a/internal/canvas/braille/braille_test.go b/internal/canvas/braille/braille_test.go index 786e483..6807b68 100644 --- a/internal/canvas/braille/braille_test.go +++ b/internal/canvas/braille/braille_test.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func Example_copiedToCanvas() { diff --git a/internal/canvas/braille/testbraille/testbraille.go b/internal/canvas/braille/testbraille/testbraille.go index 355fd6c..c8dfd0d 100644 --- a/internal/canvas/braille/testbraille/testbraille.go +++ b/internal/canvas/braille/testbraille/testbraille.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/canvas/canvas_test.go b/internal/canvas/canvas_test.go index ac0781b..1ca8117 100644 --- a/internal/canvas/canvas_test.go +++ b/internal/canvas/canvas_test.go @@ -21,7 +21,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestNew(t *testing.T) { diff --git a/internal/canvas/testcanvas/testcanvas.go b/internal/canvas/testcanvas/testcanvas.go index a80e6ae..399cf2c 100644 --- a/internal/canvas/testcanvas/testcanvas.go +++ b/internal/canvas/testcanvas/testcanvas.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/draw/border_test.go b/internal/draw/border_test.go index 478a1d8..f8ef267 100644 --- a/internal/draw/border_test.go +++ b/internal/draw/border_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestBorder(t *testing.T) { diff --git a/internal/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go index 0be67e9..bc184fa 100644 --- a/internal/draw/braille_circle_test.go +++ b/internal/draw/braille_circle_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) // mustBrailleLine draws the braille line or panics. diff --git a/internal/draw/braille_fill_test.go b/internal/draw/braille_fill_test.go index 367a045..ef069bb 100644 --- a/internal/draw/braille_fill_test.go +++ b/internal/draw/braille_fill_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestBrailleFill(t *testing.T) { diff --git a/internal/draw/braille_line_test.go b/internal/draw/braille_line_test.go index 4d1e7a6..5becae6 100644 --- a/internal/draw/braille_line_test.go +++ b/internal/draw/braille_line_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestBrailleLine(t *testing.T) { diff --git a/internal/draw/hv_line_test.go b/internal/draw/hv_line_test.go index 6816af6..87df93d 100644 --- a/internal/draw/hv_line_test.go +++ b/internal/draw/hv_line_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestHVLines(t *testing.T) { diff --git a/internal/draw/rectangle_test.go b/internal/draw/rectangle_test.go index ede962f..13b7e0c 100644 --- a/internal/draw/rectangle_test.go +++ b/internal/draw/rectangle_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestRectangle(t *testing.T) { diff --git a/internal/draw/segdisp/segment/segment_test.go b/internal/draw/segdisp/segment/segment_test.go index 9238877..fdff00c 100644 --- a/internal/draw/segdisp/segment/segment_test.go +++ b/internal/draw/segdisp/segment/segment_test.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestHV(t *testing.T) { diff --git a/internal/draw/segdisp/sixteen/sixteen_test.go b/internal/draw/segdisp/sixteen/sixteen_test.go index 0175f2e..47cafb2 100644 --- a/internal/draw/segdisp/sixteen/sixteen_test.go +++ b/internal/draw/segdisp/sixteen/sixteen_test.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/segment" "github.com/mum4k/termdash/internal/draw/segdisp/segment/testsegment" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestDraw(t *testing.T) { diff --git a/internal/draw/text_test.go b/internal/draw/text_test.go index dc05ff0..99255e3 100644 --- a/internal/draw/text_test.go +++ b/internal/draw/text_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestTrimText(t *testing.T) { diff --git a/internal/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go index 3d97c33..0d41046 100644 --- a/internal/draw/vertical_text_test.go +++ b/internal/draw/vertical_text_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestVerticalText(t *testing.T) { diff --git a/termdash_test.go b/termdash_test.go index 9e2423b..025fe61 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -30,11 +30,13 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" + "github.com/mum4k/termdash/widgets/gauge" ) // Example shows how to setup and run termdash with periodic redraw. @@ -46,21 +48,25 @@ func Example() { } defer t.Close() - wOpts := widgetapi.Options{ - MinimumSize: fakewidget.MinimumSize, - WantKeyboard: widgetapi.KeyScopeFocused, - WantMouse: widgetapi.MouseScopeWidget, + // Create some widgets. + bc, err := barchart.New() + if err != nil { + panic(err) + } + g, err := gauge.New() + if err != nil { + panic(err) } - // Create the container with two fake widgets. + // Create the container with two widgets. c, err := container.New( t, container.SplitVertical( container.Left( - container.PlaceWidget(fakewidget.New(wOpts)), + container.PlaceWidget(bc), ), container.Right( - container.PlaceWidget(fakewidget.New(wOpts)), + container.PlaceWidget(g), ), container.SplitPercent(30), ), @@ -86,16 +92,16 @@ func Example_triggered() { } defer t.Close() - wOpts := widgetapi.Options{ - MinimumSize: fakewidget.MinimumSize, - WantKeyboard: widgetapi.KeyScopeFocused, - WantMouse: widgetapi.MouseScopeWidget, + // Create a widget. + bc, err := barchart.New() + if err != nil { + panic(err) } // Create the container with a widget. c, err := container.New( t, - container.PlaceWidget(fakewidget.New(wOpts)), + container.PlaceWidget(bc), ) if err != nil { panic(err) diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 7ba9252..9ea0100 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -29,8 +29,8 @@ import ( "github.com/mum4k/termdash/internal/align" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/donut" diff --git a/internal/terminal/faketerm/diff.go b/terminal/faketerm/diff.go similarity index 100% rename from internal/terminal/faketerm/diff.go rename to terminal/faketerm/diff.go diff --git a/internal/terminal/faketerm/faketerm.go b/terminal/faketerm/faketerm.go similarity index 100% rename from internal/terminal/faketerm/faketerm.go rename to terminal/faketerm/faketerm.go diff --git a/internal/terminal/termbox/cell_options.go b/terminal/termbox/cell_options.go similarity index 100% rename from internal/terminal/termbox/cell_options.go rename to terminal/termbox/cell_options.go diff --git a/internal/terminal/termbox/cell_options_test.go b/terminal/termbox/cell_options_test.go similarity index 100% rename from internal/terminal/termbox/cell_options_test.go rename to terminal/termbox/cell_options_test.go diff --git a/internal/terminal/termbox/color_mode.go b/terminal/termbox/color_mode.go similarity index 100% rename from internal/terminal/termbox/color_mode.go rename to terminal/termbox/color_mode.go diff --git a/internal/terminal/termbox/event.go b/terminal/termbox/event.go similarity index 100% rename from internal/terminal/termbox/event.go rename to terminal/termbox/event.go diff --git a/internal/terminal/termbox/event_test.go b/terminal/termbox/event_test.go similarity index 100% rename from internal/terminal/termbox/event_test.go rename to terminal/termbox/event_test.go diff --git a/internal/terminal/termbox/termbox.go b/terminal/termbox/termbox.go similarity index 100% rename from internal/terminal/termbox/termbox.go rename to terminal/termbox/termbox.go diff --git a/internal/terminal/termbox/termbox_test.go b/terminal/termbox/termbox_test.go similarity index 100% rename from internal/terminal/termbox/termbox_test.go rename to terminal/termbox/termbox_test.go diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index fe83e67..5fbe830 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestBarChart(t *testing.T) { diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index 5086191..8f8b3c9 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/barchart" ) diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 72f1af6..564b5fd 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -29,9 +29,9 @@ import ( "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) // callbackTracker tracks whether callback was called. diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 1029019..5a61e5a 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/internal/align" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 1f30720..a2618b0 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -25,9 +25,9 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestDonut(t *testing.T) { diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index 3b79818..2a60a78 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/donut" ) diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index 6985f1e..b553402 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) // keyEvents are keyboard events to send to the widget. diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 2264565..990dd7e 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) // percentCall contains arguments for a call to GaugePercent(). diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index 936fe78..e4aa3c0 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/gauge" ) diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 2e94086..7eeb37f 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -27,9 +27,9 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestLineChartDraws(t *testing.T) { diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index b7951a3..c814e9a 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/linechart" ) diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index 0bade4a..a1eaec2 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -25,9 +25,9 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen/testsixteen" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) // mustDrawChar draws the provided character in the area of the canvas or panics. diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index a0229cc..cb0f745 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index cece593..2c90d63 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestSparkLine(t *testing.T) { diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index d4ce883..73436b0 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/sparkline" ) diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 5719427..336fa7f 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index 93077ff..f612215 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -26,9 +26,9 @@ import ( "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminal/faketerm" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminal/faketerm" ) func TestTextDraws(t *testing.T) { diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index faf1ff6..2d9e510 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -26,8 +26,8 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminal/termbox" "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/text" ) From 8df9e3307cc817a6b19ab20c7ce86f513173eefc Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:09:23 -0500 Subject: [PATCH 02/14] Moving faketerm to internal. --- container/container_test.go | 5 ++++- container/draw_test.go | 2 +- container/focus_test.go | 2 +- container/traversal_test.go | 2 +- internal/canvas/braille/braille_test.go | 2 +- internal/canvas/braille/testbraille/testbraille.go | 2 +- internal/canvas/canvas_test.go | 2 +- internal/canvas/testcanvas/testcanvas.go | 2 +- internal/draw/border_test.go | 2 +- internal/draw/braille_circle_test.go | 2 +- internal/draw/braille_fill_test.go | 2 +- internal/draw/braille_line_test.go | 2 +- internal/draw/hv_line_test.go | 2 +- internal/draw/rectangle_test.go | 2 +- internal/draw/segdisp/segment/segment_test.go | 2 +- internal/draw/segdisp/sixteen/sixteen_test.go | 2 +- internal/draw/text_test.go | 2 +- internal/draw/vertical_text_test.go | 2 +- {terminal => internal}/faketerm/diff.go | 0 {terminal => internal}/faketerm/faketerm.go | 0 termdash_test.go | 2 +- widgets/barchart/barchart_test.go | 2 +- widgets/button/button_test.go | 2 +- widgets/donut/donut_test.go | 2 +- widgets/fakewidget/fakewidget_test.go | 2 +- widgets/gauge/gauge_test.go | 2 +- widgets/linechart/linechart_test.go | 2 +- widgets/segmentdisplay/segmentdisplay_test.go | 2 +- widgets/sparkline/sparkline_test.go | 2 +- widgets/text/line_trim_test.go | 2 +- widgets/text/text_test.go | 2 +- 31 files changed, 32 insertions(+), 29 deletions(-) rename {terminal => internal}/faketerm/diff.go (100%) rename {terminal => internal}/faketerm/faketerm.go (100%) diff --git a/container/container_test.go b/container/container_test.go index 97ea040..baede5b 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -28,11 +28,11 @@ import ( "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" ) @@ -40,6 +40,9 @@ import ( // Example demonstrates how to use the Container API. func Example() { bc, err := barchart.New() + if err != nil { + panic(err) + } if _, err := New( /* terminal = */ nil, SplitVertical( diff --git a/container/draw_test.go b/container/draw_test.go index e2f016e..3b3ee5c 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/focus_test.go b/container/focus_test.go index e707cbb..9f7b6d1 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // pointCase is a test case for the pointCont function. diff --git a/container/traversal_test.go b/container/traversal_test.go index fb0f2d1..980b92d 100644 --- a/container/traversal_test.go +++ b/container/traversal_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestRoot(t *testing.T) { diff --git a/internal/canvas/braille/braille_test.go b/internal/canvas/braille/braille_test.go index 6807b68..dc48a98 100644 --- a/internal/canvas/braille/braille_test.go +++ b/internal/canvas/braille/braille_test.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func Example_copiedToCanvas() { diff --git a/internal/canvas/braille/testbraille/testbraille.go b/internal/canvas/braille/testbraille/testbraille.go index c8dfd0d..05ca45e 100644 --- a/internal/canvas/braille/testbraille/testbraille.go +++ b/internal/canvas/braille/testbraille/testbraille.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/canvas/canvas_test.go b/internal/canvas/canvas_test.go index 1ca8117..fc6a5db 100644 --- a/internal/canvas/canvas_test.go +++ b/internal/canvas/canvas_test.go @@ -21,7 +21,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestNew(t *testing.T) { diff --git a/internal/canvas/testcanvas/testcanvas.go b/internal/canvas/testcanvas/testcanvas.go index 399cf2c..a1da85f 100644 --- a/internal/canvas/testcanvas/testcanvas.go +++ b/internal/canvas/testcanvas/testcanvas.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/draw/border_test.go b/internal/draw/border_test.go index f8ef267..c0b6b77 100644 --- a/internal/draw/border_test.go +++ b/internal/draw/border_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestBorder(t *testing.T) { diff --git a/internal/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go index bc184fa..3e5fa76 100644 --- a/internal/draw/braille_circle_test.go +++ b/internal/draw/braille_circle_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // mustBrailleLine draws the braille line or panics. diff --git a/internal/draw/braille_fill_test.go b/internal/draw/braille_fill_test.go index ef069bb..5ce9575 100644 --- a/internal/draw/braille_fill_test.go +++ b/internal/draw/braille_fill_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestBrailleFill(t *testing.T) { diff --git a/internal/draw/braille_line_test.go b/internal/draw/braille_line_test.go index 5becae6..35c21b8 100644 --- a/internal/draw/braille_line_test.go +++ b/internal/draw/braille_line_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestBrailleLine(t *testing.T) { diff --git a/internal/draw/hv_line_test.go b/internal/draw/hv_line_test.go index 87df93d..ace9680 100644 --- a/internal/draw/hv_line_test.go +++ b/internal/draw/hv_line_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestHVLines(t *testing.T) { diff --git a/internal/draw/rectangle_test.go b/internal/draw/rectangle_test.go index 13b7e0c..5435174 100644 --- a/internal/draw/rectangle_test.go +++ b/internal/draw/rectangle_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestRectangle(t *testing.T) { diff --git a/internal/draw/segdisp/segment/segment_test.go b/internal/draw/segdisp/segment/segment_test.go index fdff00c..608f898 100644 --- a/internal/draw/segdisp/segment/segment_test.go +++ b/internal/draw/segdisp/segment/segment_test.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestHV(t *testing.T) { diff --git a/internal/draw/segdisp/sixteen/sixteen_test.go b/internal/draw/segdisp/sixteen/sixteen_test.go index 47cafb2..1695eb9 100644 --- a/internal/draw/segdisp/sixteen/sixteen_test.go +++ b/internal/draw/segdisp/sixteen/sixteen_test.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/segment" "github.com/mum4k/termdash/internal/draw/segdisp/segment/testsegment" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestDraw(t *testing.T) { diff --git a/internal/draw/text_test.go b/internal/draw/text_test.go index 99255e3..bda08bc 100644 --- a/internal/draw/text_test.go +++ b/internal/draw/text_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestTrimText(t *testing.T) { diff --git a/internal/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go index 0d41046..59a541b 100644 --- a/internal/draw/vertical_text_test.go +++ b/internal/draw/vertical_text_test.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestVerticalText(t *testing.T) { diff --git a/terminal/faketerm/diff.go b/internal/faketerm/diff.go similarity index 100% rename from terminal/faketerm/diff.go rename to internal/faketerm/diff.go diff --git a/terminal/faketerm/faketerm.go b/internal/faketerm/faketerm.go similarity index 100% rename from terminal/faketerm/faketerm.go rename to internal/faketerm/faketerm.go diff --git a/termdash_test.go b/termdash_test.go index 025fe61..a1a4f75 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -32,7 +32,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index 5fbe830..bd125f4 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestBarChart(t *testing.T) { diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 564b5fd..c3edeac 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -31,7 +31,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // callbackTracker tracks whether callback was called. diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index a2618b0..29dab2c 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestDonut(t *testing.T) { diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index b553402..ee148a8 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // keyEvents are keyboard events to send to the widget. diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 990dd7e..24a91ca 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // percentCall contains arguments for a call to GaugePercent(). diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 7eeb37f..854fcac 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -29,7 +29,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestLineChartDraws(t *testing.T) { diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index a1eaec2..94da804 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/internal/draw/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) // mustDrawChar draws the provided character in the area of the canvas or panics. diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index 2c90d63..9a77a80 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestSparkLine(t *testing.T) { diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 336fa7f..bfb2099 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index f612215..e8cffde 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -28,7 +28,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminal/faketerm" + "github.com/mum4k/termdash/internal/faketerm" ) func TestTextDraws(t *testing.T) { From 6a7f3ff8867bace3bd8be56c37022464f38e6960 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:10:29 -0500 Subject: [PATCH 03/14] Fixing lint issue in button. --- widgets/button/button.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/widgets/button/button.go b/widgets/button/button.go index 2ae5603..559d68e 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -146,14 +146,11 @@ func (b *Button) Draw(cvs *canvas.Canvas) error { if err != nil { return err } - if err := draw.Text(cvs, b.text, start, + return draw.Text(cvs, b.text, start, draw.TextOverrunMode(draw.OverrunModeThreeDot), draw.TextMaxX(buttonAr.Max.X), draw.TextCellOpts(cell.FgColor(b.opts.textColor)), - ); err != nil { - return err - } - return nil + ) } // Keyboard processes keyboard events, acts as a button press on the configured From 97ec73069ffb717ec422ea18a6e19d6cd6b394e3 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:13:26 -0500 Subject: [PATCH 04/14] Moving align, cell and terminalapi back from internal. --- {internal/align => align}/align.go | 2 +- {internal/align => align}/align_test.go | 0 {internal/cell => cell}/cell.go | 2 +- {internal/cell => cell}/cell_test.go | 0 {internal/cell => cell}/color.go | 0 {internal/cell => cell}/color_test.go | 0 {internal/cell => cell}/runewidth/runewidth.go | 0 {internal/cell => cell}/runewidth/runewidth_test.go | 0 container/container.go | 4 ++-- container/container_test.go | 6 +++--- container/draw.go | 2 +- container/draw_test.go | 6 +++--- container/focus.go | 2 +- container/focus_test.go | 6 +++--- container/options.go | 4 ++-- container/traversal_test.go | 2 +- internal/attrrange/attrrange_test.go | 2 +- internal/canvas/braille/braille.go | 4 ++-- internal/canvas/braille/braille_test.go | 2 +- internal/canvas/braille/testbraille/testbraille.go | 2 +- internal/canvas/canvas.go | 6 +++--- internal/canvas/canvas_test.go | 2 +- internal/canvas/testcanvas/testcanvas.go | 2 +- internal/draw/border.go | 4 ++-- internal/draw/border_test.go | 4 ++-- internal/draw/braille_circle.go | 2 +- internal/draw/braille_circle_test.go | 2 +- internal/draw/braille_fill.go | 2 +- internal/draw/braille_fill_test.go | 2 +- internal/draw/braille_line.go | 2 +- internal/draw/braille_line_test.go | 2 +- internal/draw/hv_line.go | 2 +- internal/draw/hv_line_test.go | 2 +- internal/draw/line_style.go | 2 +- internal/draw/rectangle.go | 2 +- internal/draw/rectangle_test.go | 2 +- internal/draw/segdisp/segment/segment.go | 2 +- internal/draw/segdisp/segment/segment_test.go | 2 +- internal/draw/segdisp/sixteen/sixteen.go | 2 +- internal/draw/segdisp/sixteen/sixteen_test.go | 2 +- internal/draw/text.go | 4 ++-- internal/draw/text_test.go | 2 +- internal/draw/vertical_text.go | 2 +- internal/draw/vertical_text_test.go | 2 +- internal/event/event.go | 2 +- internal/event/event_test.go | 2 +- internal/event/eventqueue/eventqueue.go | 2 +- internal/event/eventqueue/eventqueue_test.go | 2 +- internal/faketerm/diff.go | 2 +- internal/faketerm/faketerm.go | 4 ++-- internal/mouse/button/button.go | 2 +- internal/mouse/button/button_test.go | 2 +- internal/widgetapi/widgetapi.go | 2 +- termdash.go | 2 +- termdash_test.go | 4 ++-- termdashdemo/termdashdemo.go | 6 +++--- terminal/termbox/cell_options.go | 2 +- terminal/termbox/cell_options_test.go | 2 +- terminal/termbox/color_mode.go | 2 +- terminal/termbox/event.go | 2 +- terminal/termbox/event_test.go | 2 +- terminal/termbox/termbox.go | 4 ++-- terminal/termbox/termbox_test.go | 2 +- {internal/terminalapi => terminalapi}/color_mode.go | 0 {internal/terminalapi => terminalapi}/event.go | 0 {internal/terminalapi => terminalapi}/terminalapi.go | 2 +- widgets/barchart/barchart.go | 6 +++--- widgets/barchart/barchart_test.go | 4 ++-- widgets/barchart/barchartdemo/barchartdemo.go | 4 ++-- widgets/barchart/options.go | 2 +- widgets/button/button.go | 6 +++--- widgets/button/button_test.go | 6 +++--- widgets/button/buttondemo/buttondemo.go | 6 +++--- widgets/button/options.go | 4 ++-- widgets/donut/donut.go | 6 +++--- widgets/donut/donut_test.go | 6 +++--- widgets/donut/donutdemo/donutdemo.go | 4 ++-- widgets/donut/options.go | 2 +- widgets/fakewidget/fakewidget.go | 2 +- widgets/fakewidget/fakewidget_test.go | 4 ++-- widgets/gauge/gauge.go | 8 ++++---- widgets/gauge/gauge_test.go | 6 +++--- widgets/gauge/gaugedemo/gaugedemo.go | 4 ++-- widgets/gauge/options.go | 4 ++-- widgets/linechart/internal/axes/label.go | 2 +- widgets/linechart/internal/zoom/zoom.go | 2 +- widgets/linechart/internal/zoom/zoom_test.go | 2 +- widgets/linechart/linechart.go | 4 ++-- widgets/linechart/linechart_test.go | 8 ++++---- widgets/linechart/linechartdemo/linechartdemo.go | 4 ++-- widgets/linechart/options.go | 2 +- widgets/segmentdisplay/options.go | 2 +- widgets/segmentdisplay/segmentdisplay.go | 4 ++-- widgets/segmentdisplay/segmentdisplay_test.go | 8 ++++---- .../segmentdisplaydemo/segmentdisplaydemo.go | 4 ++-- widgets/segmentdisplay/write_options.go | 2 +- widgets/sparkline/options.go | 2 +- widgets/sparkline/sparkline.go | 4 ++-- widgets/sparkline/sparkline_test.go | 4 ++-- widgets/sparkline/sparklinedemo/sparklinedemo.go | 4 ++-- widgets/sparkline/sparks.go | 2 +- widgets/text/line_scanner.go | 2 +- widgets/text/line_trim.go | 2 +- widgets/text/text.go | 2 +- widgets/text/text_test.go | 6 +++--- widgets/text/textdemo/textdemo.go | 4 ++-- widgets/text/write_options.go | 2 +- 107 files changed, 158 insertions(+), 158 deletions(-) rename {internal/align => align}/align.go (98%) rename {internal/align => align}/align_test.go (100%) rename {internal/cell => cell}/cell.go (99%) rename {internal/cell => cell}/cell_test.go (100%) rename {internal/cell => cell}/color.go (100%) rename {internal/cell => cell}/color_test.go (100%) rename {internal/cell => cell}/runewidth/runewidth.go (100%) rename {internal/cell => cell}/runewidth/runewidth_test.go (100%) rename {internal/terminalapi => terminalapi}/color_mode.go (100%) rename {internal/terminalapi => terminalapi}/event.go (100%) rename {internal/terminalapi => terminalapi}/terminalapi.go (97%) diff --git a/internal/align/align.go b/align/align.go similarity index 98% rename from internal/align/align.go rename to align/align.go index 1a2acc7..aac220f 100644 --- a/internal/align/align.go +++ b/align/align.go @@ -20,7 +20,7 @@ import ( "image" "strings" - "github.com/mum4k/termdash/internal/cell/runewidth" + "github.com/mum4k/termdash/cell/runewidth" ) // Horizontal indicates the type of horizontal alignment. diff --git a/internal/align/align_test.go b/align/align_test.go similarity index 100% rename from internal/align/align_test.go rename to align/align_test.go diff --git a/internal/cell/cell.go b/cell/cell.go similarity index 99% rename from internal/cell/cell.go rename to cell/cell.go index 37e4df8..a74dd8b 100644 --- a/internal/cell/cell.go +++ b/cell/cell.go @@ -23,8 +23,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/cell/runewidth" ) // Option is used to provide options for cells on a 2-D terminal. diff --git a/internal/cell/cell_test.go b/cell/cell_test.go similarity index 100% rename from internal/cell/cell_test.go rename to cell/cell_test.go diff --git a/internal/cell/color.go b/cell/color.go similarity index 100% rename from internal/cell/color.go rename to cell/color.go diff --git a/internal/cell/color_test.go b/cell/color_test.go similarity index 100% rename from internal/cell/color_test.go rename to cell/color_test.go diff --git a/internal/cell/runewidth/runewidth.go b/cell/runewidth/runewidth.go similarity index 100% rename from internal/cell/runewidth/runewidth.go rename to cell/runewidth/runewidth.go diff --git a/internal/cell/runewidth/runewidth_test.go b/cell/runewidth/runewidth_test.go similarity index 100% rename from internal/cell/runewidth/runewidth_test.go rename to cell/runewidth/runewidth_test.go diff --git a/container/container.go b/container/container.go index a7a42bd..4e96808 100644 --- a/container/container.go +++ b/container/container.go @@ -26,12 +26,12 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // Container wraps either sub containers or widgets and positions them on the diff --git a/container/container_test.go b/container/container_test.go index baede5b..88677b2 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/event" @@ -31,8 +31,8 @@ import ( "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/draw.go b/container/draw.go index befb4fe..c23a35c 100644 --- a/container/draw.go +++ b/container/draw.go @@ -21,9 +21,9 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" ) diff --git a/container/draw_test.go b/container/draw_test.go index 3b3ee5c..7237158 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -18,13 +18,13 @@ import ( "image" "testing" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/focus.go b/container/focus.go index 38b4f06..18fc189 100644 --- a/container/focus.go +++ b/container/focus.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // pointCont finds the top-most (on the screen) container whose area contains diff --git a/container/focus_test.go b/container/focus_test.go index 9f7b6d1..97abeda 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -20,13 +20,13 @@ import ( "testing" "time" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" - "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/terminalapi" ) // pointCase is a test case for the pointCont function. diff --git a/container/options.go b/container/options.go index 3e6aa27..ef2eab3 100644 --- a/container/options.go +++ b/container/options.go @@ -19,8 +19,8 @@ package container import ( "fmt" - "github.com/mum4k/termdash/internal/align" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/container/traversal_test.go b/container/traversal_test.go index 980b92d..e4dd430 100644 --- a/container/traversal_test.go +++ b/container/traversal_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/attrrange/attrrange_test.go b/internal/attrrange/attrrange_test.go index bfdd460..13031ee 100644 --- a/internal/attrrange/attrrange_test.go +++ b/internal/attrrange/attrrange_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) func Example() { diff --git a/internal/canvas/braille/braille.go b/internal/canvas/braille/braille.go index 7799509..b516d9c 100644 --- a/internal/canvas/braille/braille.go +++ b/internal/canvas/braille/braille.go @@ -45,9 +45,9 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) const ( diff --git a/internal/canvas/braille/braille_test.go b/internal/canvas/braille/braille_test.go index dc48a98..c84199a 100644 --- a/internal/canvas/braille/braille_test.go +++ b/internal/canvas/braille/braille_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/canvas/braille/testbraille/testbraille.go b/internal/canvas/braille/testbraille/testbraille.go index 05ca45e..33512fa 100644 --- a/internal/canvas/braille/testbraille/testbraille.go +++ b/internal/canvas/braille/testbraille/testbraille.go @@ -19,9 +19,9 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/canvas/canvas.go b/internal/canvas/canvas.go index b2bbc1f..5bce064 100644 --- a/internal/canvas/canvas.go +++ b/internal/canvas/canvas.go @@ -19,10 +19,10 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/cell/runewidth" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // Canvas is where a widget draws its output for display on the terminal. diff --git a/internal/canvas/canvas_test.go b/internal/canvas/canvas_test.go index fc6a5db..fe0328a 100644 --- a/internal/canvas/canvas_test.go +++ b/internal/canvas/canvas_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/canvas/testcanvas/testcanvas.go b/internal/canvas/testcanvas/testcanvas.go index a1da85f..6d10cda 100644 --- a/internal/canvas/testcanvas/testcanvas.go +++ b/internal/canvas/testcanvas/testcanvas.go @@ -19,8 +19,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/border.go b/internal/draw/border.go index 78a3139..79d793b 100644 --- a/internal/draw/border.go +++ b/internal/draw/border.go @@ -20,9 +20,9 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" ) // BorderOption is used to provide options to Border(). diff --git a/internal/draw/border_test.go b/internal/draw/border_test.go index c0b6b77..0a0eb58 100644 --- a/internal/draw/border_test.go +++ b/internal/draw/border_test.go @@ -18,10 +18,10 @@ import ( "image" "testing" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/braille_circle.go b/internal/draw/braille_circle.go index 65f1861..ef7de90 100644 --- a/internal/draw/braille_circle.go +++ b/internal/draw/braille_circle.go @@ -20,8 +20,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/numbers/trig" ) diff --git a/internal/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go index 3e5fa76..95fd08e 100644 --- a/internal/draw/braille_circle_test.go +++ b/internal/draw/braille_circle_test.go @@ -18,10 +18,10 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/braille_fill.go b/internal/draw/braille_fill.go index c7aea3f..790d06f 100644 --- a/internal/draw/braille_fill.go +++ b/internal/draw/braille_fill.go @@ -20,8 +20,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" ) // BrailleFillOption is used to provide options to BrailleFill. diff --git a/internal/draw/braille_fill_test.go b/internal/draw/braille_fill_test.go index 5ce9575..e5990b0 100644 --- a/internal/draw/braille_fill_test.go +++ b/internal/draw/braille_fill_test.go @@ -18,10 +18,10 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/braille_line.go b/internal/draw/braille_line.go index bb8c375..fcd5d6b 100644 --- a/internal/draw/braille_line.go +++ b/internal/draw/braille_line.go @@ -20,8 +20,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/numbers" ) diff --git a/internal/draw/braille_line_test.go b/internal/draw/braille_line_test.go index 35c21b8..cc526f3 100644 --- a/internal/draw/braille_line_test.go +++ b/internal/draw/braille_line_test.go @@ -18,10 +18,10 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/hv_line.go b/internal/draw/hv_line.go index 6e9f8c4..0eb757a 100644 --- a/internal/draw/hv_line.go +++ b/internal/draw/hv_line.go @@ -20,8 +20,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" ) // HVLineOption is used to provide options to HVLine(). diff --git a/internal/draw/hv_line_test.go b/internal/draw/hv_line_test.go index ace9680..126fc9b 100644 --- a/internal/draw/hv_line_test.go +++ b/internal/draw/hv_line_test.go @@ -18,9 +18,9 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/line_style.go b/internal/draw/line_style.go index 64aa75b..21eb5fc 100644 --- a/internal/draw/line_style.go +++ b/internal/draw/line_style.go @@ -17,7 +17,7 @@ package draw import ( "fmt" - "github.com/mum4k/termdash/internal/cell/runewidth" + "github.com/mum4k/termdash/cell/runewidth" ) // line_style.go contains the Unicode characters used for drawing lines of diff --git a/internal/draw/rectangle.go b/internal/draw/rectangle.go index a7f90bc..1df54af 100644 --- a/internal/draw/rectangle.go +++ b/internal/draw/rectangle.go @@ -20,8 +20,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" ) // RectangleOption is used to provide options to the Rectangle function. diff --git a/internal/draw/rectangle_test.go b/internal/draw/rectangle_test.go index 5435174..d8b2434 100644 --- a/internal/draw/rectangle_test.go +++ b/internal/draw/rectangle_test.go @@ -18,9 +18,9 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/segdisp/segment/segment.go b/internal/draw/segdisp/segment/segment.go index 23b98fa..2d4553b 100644 --- a/internal/draw/segdisp/segment/segment.go +++ b/internal/draw/segdisp/segment/segment.go @@ -19,8 +19,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" ) diff --git a/internal/draw/segdisp/segment/segment_test.go b/internal/draw/segdisp/segment/segment_test.go index 608f898..012cffd 100644 --- a/internal/draw/segdisp/segment/segment_test.go +++ b/internal/draw/segdisp/segment/segment_test.go @@ -19,10 +19,10 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" diff --git a/internal/draw/segdisp/sixteen/sixteen.go b/internal/draw/segdisp/sixteen/sixteen.go index 5a893b5..d398b28 100644 --- a/internal/draw/segdisp/sixteen/sixteen.go +++ b/internal/draw/segdisp/sixteen/sixteen.go @@ -45,10 +45,10 @@ import ( "image" "math" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/segment" ) diff --git a/internal/draw/segdisp/sixteen/sixteen_test.go b/internal/draw/segdisp/sixteen/sixteen_test.go index 1695eb9..0ec75ef 100644 --- a/internal/draw/segdisp/sixteen/sixteen_test.go +++ b/internal/draw/segdisp/sixteen/sixteen_test.go @@ -20,11 +20,11 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/segment" "github.com/mum4k/termdash/internal/draw/segdisp/segment/testsegment" "github.com/mum4k/termdash/internal/faketerm" diff --git a/internal/draw/text.go b/internal/draw/text.go index 330f708..7286259 100644 --- a/internal/draw/text.go +++ b/internal/draw/text.go @@ -21,9 +21,9 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/cell/runewidth" ) // OverrunMode represents diff --git a/internal/draw/text_test.go b/internal/draw/text_test.go index bda08bc..a9fa405 100644 --- a/internal/draw/text_test.go +++ b/internal/draw/text_test.go @@ -18,9 +18,9 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/vertical_text.go b/internal/draw/vertical_text.go index e44bf6b..fd206ae 100644 --- a/internal/draw/vertical_text.go +++ b/internal/draw/vertical_text.go @@ -21,8 +21,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" ) // VerticalTextOption is used to provide options to Text(). diff --git a/internal/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go index 59a541b..bca03de 100644 --- a/internal/draw/vertical_text_test.go +++ b/internal/draw/vertical_text_test.go @@ -18,9 +18,9 @@ import ( "image" "testing" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/event/event.go b/internal/event/event.go index b9e04d8..62406bb 100644 --- a/internal/event/event.go +++ b/internal/event/event.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // Callback is a function provided by an event subscriber. diff --git a/internal/event/event_test.go b/internal/event/event_test.go index 9b12be5..b91f779 100644 --- a/internal/event/event_test.go +++ b/internal/event/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // receiverMode defines how the receiver behaves. diff --git a/internal/event/eventqueue/eventqueue.go b/internal/event/eventqueue/eventqueue.go index 589b987..815db8d 100644 --- a/internal/event/eventqueue/eventqueue.go +++ b/internal/event/eventqueue/eventqueue.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // node is a single data item on the queue. diff --git a/internal/event/eventqueue/eventqueue_test.go b/internal/event/eventqueue/eventqueue_test.go index 5868dd3..17625b2 100644 --- a/internal/event/eventqueue/eventqueue_test.go +++ b/internal/event/eventqueue/eventqueue_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) func TestQueue(t *testing.T) { diff --git a/internal/faketerm/diff.go b/internal/faketerm/diff.go index a64045c..3a178a7 100644 --- a/internal/faketerm/diff.go +++ b/internal/faketerm/diff.go @@ -23,7 +23,7 @@ import ( "reflect" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) // optDiff is used to display differences in cell options. diff --git a/internal/faketerm/faketerm.go b/internal/faketerm/faketerm.go index 12b3e51..58a0f8d 100644 --- a/internal/faketerm/faketerm.go +++ b/internal/faketerm/faketerm.go @@ -23,9 +23,9 @@ import ( "log" "sync" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // Option is used to provide options. diff --git a/internal/mouse/button/button.go b/internal/mouse/button/button.go index b25e252..7de620b 100644 --- a/internal/mouse/button/button.go +++ b/internal/mouse/button/button.go @@ -19,7 +19,7 @@ import ( "image" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // State represents the state of the mouse button. diff --git a/internal/mouse/button/button_test.go b/internal/mouse/button/button_test.go index ceec635..bf4d288 100644 --- a/internal/mouse/button/button_test.go +++ b/internal/mouse/button/button_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // eventTestCase is one mouse event and the output expectation. diff --git a/internal/widgetapi/widgetapi.go b/internal/widgetapi/widgetapi.go index 8f72bfb..29077e5 100644 --- a/internal/widgetapi/widgetapi.go +++ b/internal/widgetapi/widgetapi.go @@ -19,7 +19,7 @@ import ( "image" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // KeyScope indicates the scope at which the widget wants to receive keyboard diff --git a/termdash.go b/termdash.go index fd71e00..24a2af1 100644 --- a/termdash.go +++ b/termdash.go @@ -32,7 +32,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) // DefaultRedrawInterval is the default for the RedrawInterval option. diff --git a/termdash_test.go b/termdash_test.go index a1a4f75..38b3b12 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -28,12 +28,12 @@ import ( "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/event/eventqueue" "github.com/mum4k/termdash/internal/event/testevent" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" "github.com/mum4k/termdash/widgets/gauge" diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 9ea0100..f590005 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -25,12 +25,12 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/align" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/donut" diff --git a/terminal/termbox/cell_options.go b/terminal/termbox/cell_options.go index a4e28cb..41ee760 100644 --- a/terminal/termbox/cell_options.go +++ b/terminal/termbox/cell_options.go @@ -17,7 +17,7 @@ package termbox // cell_options.go converts termdash cell options to the termbox format. import ( - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/cell_options_test.go b/terminal/termbox/cell_options_test.go index 25585da..f74e9bb 100644 --- a/terminal/termbox/cell_options_test.go +++ b/terminal/termbox/cell_options_test.go @@ -17,7 +17,7 @@ package termbox import ( "testing" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/color_mode.go b/terminal/termbox/color_mode.go index 8d830ca..0e42ee7 100644 --- a/terminal/termbox/color_mode.go +++ b/terminal/termbox/color_mode.go @@ -17,7 +17,7 @@ package termbox import ( "fmt" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event.go b/terminal/termbox/event.go index f33ccb8..4e57738 100644 --- a/terminal/termbox/event.go +++ b/terminal/termbox/event.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event_test.go b/terminal/termbox/event_test.go index 22535df..99ccb95 100644 --- a/terminal/termbox/event_test.go +++ b/terminal/termbox/event_test.go @@ -23,7 +23,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox.go b/terminal/termbox/termbox.go index 7c5889a..0aee2b8 100644 --- a/terminal/termbox/termbox.go +++ b/terminal/termbox/termbox.go @@ -19,9 +19,9 @@ import ( "context" "image" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox_test.go b/terminal/termbox/termbox_test.go index 641b84e..355ddad 100644 --- a/terminal/termbox/termbox_test.go +++ b/terminal/termbox/termbox_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" ) func TestNewTerminal(t *testing.T) { diff --git a/internal/terminalapi/color_mode.go b/terminalapi/color_mode.go similarity index 100% rename from internal/terminalapi/color_mode.go rename to terminalapi/color_mode.go diff --git a/internal/terminalapi/event.go b/terminalapi/event.go similarity index 100% rename from internal/terminalapi/event.go rename to terminalapi/event.go diff --git a/internal/terminalapi/terminalapi.go b/terminalapi/terminalapi.go similarity index 97% rename from internal/terminalapi/terminalapi.go rename to terminalapi/terminalapi.go index f471e4f..d45935a 100644 --- a/internal/terminalapi/terminalapi.go +++ b/terminalapi/terminalapi.go @@ -19,7 +19,7 @@ import ( "context" "image" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) // Terminal abstracts an implementation of a 2-D terminal. diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index bc425eb..61fbbb6 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -22,13 +22,13 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // BarChart displays multiple bars showing relative ratios of values. diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index bd125f4..ce9d146 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -19,13 +19,13 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" ) func TestBarChart(t *testing.T) { diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index 8f8b3c9..753ebcd 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -22,11 +22,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" ) diff --git a/widgets/barchart/options.go b/widgets/barchart/options.go index 77534f6..1bdb770 100644 --- a/widgets/barchart/options.go +++ b/widgets/barchart/options.go @@ -19,7 +19,7 @@ package barchart import ( "fmt" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/draw" ) diff --git a/widgets/button/button.go b/widgets/button/button.go index 559d68e..5ae60d1 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // CallbackFn is the function called when the button is pressed. diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index c3edeac..6097a6d 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -22,16 +22,16 @@ import ( "time" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/terminalapi" ) // callbackTracker tracks whether callback was called. diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 5a61e5a..dbff3a8 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -21,12 +21,12 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/align" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/button/options.go b/widgets/button/options.go index 1bc2ed4..5885d9a 100644 --- a/widgets/button/options.go +++ b/widgets/button/options.go @@ -20,8 +20,8 @@ import ( "fmt" "time" - "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/cell/runewidth" + "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index ed6ea28..d971fea 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -22,14 +22,14 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell/runewidth" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // progressType indicates how was the current progress provided by the caller. diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 29dab2c..6432676 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/terminalapi" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) func TestDonut(t *testing.T) { diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index 2a60a78..402350b 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -21,11 +21,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/donut" ) diff --git a/widgets/donut/options.go b/widgets/donut/options.go index 6a7c35e..b09b8ab 100644 --- a/widgets/donut/options.go +++ b/widgets/donut/options.go @@ -19,7 +19,7 @@ package donut import ( "fmt" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) // Option is used to provide options. diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index c936f71..c9baac8 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -26,8 +26,8 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // outputLines are the number of lines written by this plugin. diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index ee148a8..7167f6a 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -22,11 +22,11 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/draw/testdraw" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/terminalapi" ) // keyEvents are keyboard events to send to the widget. diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 16f9874..7efc6f4 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -22,14 +22,14 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/internal/cell/runewidth" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // progressType indicates how was the current progress provided by the caller. diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 24a91ca..9d0ee99 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -19,14 +19,14 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" ) // percentCall contains arguments for a call to GaugePercent(). diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index e4aa3c0..bcef2e9 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -21,11 +21,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/gauge" ) diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index 1c10fad..0bc8d10 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -19,8 +19,8 @@ package gauge import ( "fmt" - "github.com/mum4k/termdash/internal/align" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/draw" ) diff --git a/widgets/linechart/internal/axes/label.go b/widgets/linechart/internal/axes/label.go index 28344fb..c99522a 100644 --- a/widgets/linechart/internal/axes/label.go +++ b/widgets/linechart/internal/axes/label.go @@ -20,7 +20,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" ) // LabelOrientation represents the orientation of text labels. diff --git a/widgets/linechart/internal/zoom/zoom.go b/widgets/linechart/internal/zoom/zoom.go index e7b0a78..f4daf6a 100644 --- a/widgets/linechart/internal/zoom/zoom.go +++ b/widgets/linechart/internal/zoom/zoom.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/internal/zoom/zoom_test.go b/widgets/linechart/internal/zoom/zoom_test.go index 2d227a0..76cba33 100644 --- a/widgets/linechart/internal/zoom/zoom_test.go +++ b/widgets/linechart/internal/zoom/zoom_test.go @@ -20,7 +20,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 8611e93..99786cd 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -22,14 +22,14 @@ import ( "sort" "sync" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" "github.com/mum4k/termdash/widgets/linechart/internal/zoom" ) diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 854fcac..bc65997 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -20,16 +20,16 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) func TestLineChartDraws(t *testing.T) { diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index c814e9a..69d62fa 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -22,11 +22,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/linechart" ) diff --git a/widgets/linechart/options.go b/widgets/linechart/options.go index 692c428..53e25d3 100644 --- a/widgets/linechart/options.go +++ b/widgets/linechart/options.go @@ -18,7 +18,7 @@ import ( "fmt" "math" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/widgets/linechart/internal/axes" "github.com/mum4k/termdash/widgets/linechart/internal/zoom" ) diff --git a/widgets/segmentdisplay/options.go b/widgets/segmentdisplay/options.go index 4e70ff1..a6cb034 100644 --- a/widgets/segmentdisplay/options.go +++ b/widgets/segmentdisplay/options.go @@ -17,7 +17,7 @@ package segmentdisplay import ( "fmt" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" ) // options.go contains configurable options for SegmentDisplay. diff --git a/widgets/segmentdisplay/segmentdisplay.go b/widgets/segmentdisplay/segmentdisplay.go index 7706659..59ce98e 100644 --- a/widgets/segmentdisplay/segmentdisplay.go +++ b/widgets/segmentdisplay/segmentdisplay.go @@ -23,12 +23,12 @@ import ( "image" "sync" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // SegmentDisplay displays ASCII content by simulating a segment display. diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index 94da804..446d550 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/align" + "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen/testsixteen" - "github.com/mum4k/termdash/internal/terminalapi" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // mustDrawChar draws the provided character in the area of the canvas or panics. diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index cb0f745..5a99708 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -21,11 +21,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/segmentdisplay/write_options.go b/widgets/segmentdisplay/write_options.go index 7d8ccb6..9252c84 100644 --- a/widgets/segmentdisplay/write_options.go +++ b/widgets/segmentdisplay/write_options.go @@ -16,7 +16,7 @@ package segmentdisplay // write_options.go contains options used when writing content to the widget. -import "github.com/mum4k/termdash/internal/cell" +import "github.com/mum4k/termdash/cell" // WriteOption is used to provide options to Write(). type WriteOption interface { diff --git a/widgets/sparkline/options.go b/widgets/sparkline/options.go index 27de78e..4b0f9e2 100644 --- a/widgets/sparkline/options.go +++ b/widgets/sparkline/options.go @@ -19,7 +19,7 @@ package sparkline import ( "fmt" - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) // Option is used to provide options. diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index 0c55fb7..8bf7677 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -21,12 +21,12 @@ import ( "image" "sync" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // SparkLine draws a graph showing a series of values as vertical bars. diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index 9a77a80..2af5c4c 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -19,13 +19,13 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" - "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" ) func TestSparkLine(t *testing.T) { diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index 73436b0..284fded 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -22,11 +22,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" ) diff --git a/widgets/sparkline/sparks.go b/widgets/sparkline/sparks.go index 98c81bb..2b8526e 100644 --- a/widgets/sparkline/sparks.go +++ b/widgets/sparkline/sparks.go @@ -20,7 +20,7 @@ package sparkline import ( "fmt" - "github.com/mum4k/termdash/internal/cell/runewidth" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/numbers" ) diff --git a/widgets/text/line_scanner.go b/widgets/text/line_scanner.go index 19c250b..e2f65af 100644 --- a/widgets/text/line_scanner.go +++ b/widgets/text/line_scanner.go @@ -20,7 +20,7 @@ import ( "strings" "text/scanner" - "github.com/mum4k/termdash/internal/cell/runewidth" + "github.com/mum4k/termdash/cell/runewidth" ) // wrapNeeded returns true if wrapping is needed for the rune at the horizontal diff --git a/widgets/text/line_trim.go b/widgets/text/line_trim.go index fd3e4a7..f431d41 100644 --- a/widgets/text/line_trim.go +++ b/widgets/text/line_trim.go @@ -18,8 +18,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/cell/runewidth" ) // line_trim.go contains code that trims lines that are too long. diff --git a/widgets/text/text.go b/widgets/text/text.go index a3802b5..b545ac6 100644 --- a/widgets/text/text.go +++ b/widgets/text/text.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/terminalapi" ) // Text displays a block of text. diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index e8cffde..f352429 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -19,16 +19,16 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" + "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/terminalapi" ) func TestTextDraws(t *testing.T) { diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index 2d9e510..c3d6840 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -23,11 +23,11 @@ import ( "time" "github.com/mum4k/termdash" + "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/text" ) diff --git a/widgets/text/write_options.go b/widgets/text/write_options.go index 36e7777..ddb5c40 100644 --- a/widgets/text/write_options.go +++ b/widgets/text/write_options.go @@ -17,7 +17,7 @@ package text // write_options.go contains options used when writing content to the Text widget. import ( - "github.com/mum4k/termdash/internal/cell" + "github.com/mum4k/termdash/cell" ) // WriteOption is used to provide options to Write(). From bf61ca147990617e3a2207f3b8db8c5ef14abfc9 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:20:03 -0500 Subject: [PATCH 05/14] Moving draw out of internal. --- container/container.go | 2 +- container/container_test.go | 4 ++-- container/draw.go | 2 +- container/draw_test.go | 4 ++-- container/focus_test.go | 2 +- container/options.go | 2 +- {internal/draw => draw}/border.go | 0 {internal/draw => draw}/border_test.go | 0 {internal/draw => draw}/braille_circle.go | 0 {internal/draw => draw}/braille_circle_test.go | 0 {internal/draw => draw}/braille_fill.go | 0 {internal/draw => draw}/braille_fill_test.go | 0 {internal/draw => draw}/braille_line.go | 0 {internal/draw => draw}/braille_line_test.go | 0 {internal/draw => draw}/draw.go | 0 {internal/draw => draw}/hv_line.go | 0 {internal/draw => draw}/hv_line_graph.go | 0 {internal/draw => draw}/hv_line_graph_test.go | 0 {internal/draw => draw}/hv_line_test.go | 0 {internal/draw => draw}/line_style.go | 0 {internal/draw => draw}/rectangle.go | 0 {internal/draw => draw}/rectangle_test.go | 0 {internal/draw => draw}/segdisp/segment/segment.go | 2 +- .../draw => draw}/segdisp/segment/segment_test.go | 4 ++-- .../segdisp/segment/testsegment/testsegment.go | 2 +- .../draw => draw}/segdisp/sixteen/attributes.go | 2 +- .../segdisp/sixteen/doc/16-Segment-ASCII-All.jpg | Bin .../segdisp/sixteen/doc/segment_placement.graffle | Bin .../segdisp/sixteen/doc/segment_placement.svg | 0 {internal/draw => draw}/segdisp/sixteen/sixteen.go | 2 +- .../draw => draw}/segdisp/sixteen/sixteen_test.go | 4 ++-- .../segdisp/sixteen/testsixteen/testsixteen.go | 2 +- {internal/draw => draw}/testdraw/testdraw.go | 2 +- {internal/draw => draw}/text.go | 0 {internal/draw => draw}/text_test.go | 0 {internal/draw => draw}/vertical_text.go | 0 {internal/draw => draw}/vertical_text_test.go | 0 termdashdemo/termdashdemo.go | 2 +- widgets/barchart/barchart.go | 2 +- widgets/barchart/barchart_test.go | 4 ++-- widgets/barchart/barchartdemo/barchartdemo.go | 2 +- widgets/barchart/options.go | 2 +- widgets/button/button.go | 2 +- widgets/button/button_test.go | 4 ++-- widgets/button/buttondemo/buttondemo.go | 2 +- widgets/donut/donut.go | 2 +- widgets/donut/donut_test.go | 4 ++-- widgets/donut/donutdemo/donutdemo.go | 2 +- widgets/fakewidget/fakewidget.go | 2 +- widgets/fakewidget/fakewidget_test.go | 2 +- widgets/gauge/gauge.go | 2 +- widgets/gauge/gauge_test.go | 4 ++-- widgets/gauge/gaugedemo/gaugedemo.go | 2 +- widgets/gauge/options.go | 2 +- widgets/linechart/linechart.go | 2 +- widgets/linechart/linechart_test.go | 4 ++-- widgets/linechart/linechartdemo/linechartdemo.go | 2 +- widgets/segmentdisplay/segment_area.go | 2 +- widgets/segmentdisplay/segmentdisplay.go | 2 +- widgets/segmentdisplay/segmentdisplay_test.go | 4 ++-- .../segmentdisplaydemo/segmentdisplaydemo.go | 2 +- widgets/sparkline/sparkline.go | 2 +- widgets/sparkline/sparkline_test.go | 4 ++-- widgets/sparkline/sparklinedemo/sparklinedemo.go | 2 +- widgets/text/line_trim_test.go | 2 +- widgets/text/text_test.go | 4 ++-- widgets/text/textdemo/textdemo.go | 2 +- 67 files changed, 56 insertions(+), 56 deletions(-) rename {internal/draw => draw}/border.go (100%) rename {internal/draw => draw}/border_test.go (100%) rename {internal/draw => draw}/braille_circle.go (100%) rename {internal/draw => draw}/braille_circle_test.go (100%) rename {internal/draw => draw}/braille_fill.go (100%) rename {internal/draw => draw}/braille_fill_test.go (100%) rename {internal/draw => draw}/braille_line.go (100%) rename {internal/draw => draw}/braille_line_test.go (100%) rename {internal/draw => draw}/draw.go (100%) rename {internal/draw => draw}/hv_line.go (100%) rename {internal/draw => draw}/hv_line_graph.go (100%) rename {internal/draw => draw}/hv_line_graph_test.go (100%) rename {internal/draw => draw}/hv_line_test.go (100%) rename {internal/draw => draw}/line_style.go (100%) rename {internal/draw => draw}/rectangle.go (100%) rename {internal/draw => draw}/rectangle_test.go (100%) rename {internal/draw => draw}/segdisp/segment/segment.go (99%) rename {internal/draw => draw}/segdisp/segment/segment_test.go (99%) rename {internal/draw => draw}/segdisp/segment/testsegment/testsegment.go (95%) rename {internal/draw => draw}/segdisp/sixteen/attributes.go (99%) rename {internal/draw => draw}/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg (100%) rename {internal/draw => draw}/segdisp/sixteen/doc/segment_placement.graffle (100%) rename {internal/draw => draw}/segdisp/sixteen/doc/segment_placement.svg (100%) rename {internal/draw => draw}/segdisp/sixteen/sixteen.go (99%) rename {internal/draw => draw}/segdisp/sixteen/sixteen_test.go (99%) rename {internal/draw => draw}/segdisp/sixteen/testsixteen/testsixteen.go (95%) rename {internal/draw => draw}/testdraw/testdraw.go (98%) rename {internal/draw => draw}/text.go (100%) rename {internal/draw => draw}/text_test.go (100%) rename {internal/draw => draw}/vertical_text.go (100%) rename {internal/draw => draw}/vertical_text_test.go (100%) diff --git a/container/container.go b/container/container.go index 4e96808..d2b8a16 100644 --- a/container/container.go +++ b/container/container.go @@ -27,8 +27,8 @@ import ( "sync" "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" diff --git a/container/container_test.go b/container/container_test.go index 88677b2..38e3321 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -23,9 +23,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" diff --git a/container/draw.go b/container/draw.go index c23a35c..14bc08c 100644 --- a/container/draw.go +++ b/container/draw.go @@ -22,9 +22,9 @@ import ( "image" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" ) // drawTree draws this container and all of its sub containers. diff --git a/container/draw_test.go b/container/draw_test.go index 7237158..e0c6dd5 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -20,9 +20,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/fakewidget" diff --git a/container/focus_test.go b/container/focus_test.go index 97abeda..a2ac5d4 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" diff --git a/container/options.go b/container/options.go index ef2eab3..3cd9ed8 100644 --- a/container/options.go +++ b/container/options.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/internal/draw/border.go b/draw/border.go similarity index 100% rename from internal/draw/border.go rename to draw/border.go diff --git a/internal/draw/border_test.go b/draw/border_test.go similarity index 100% rename from internal/draw/border_test.go rename to draw/border_test.go diff --git a/internal/draw/braille_circle.go b/draw/braille_circle.go similarity index 100% rename from internal/draw/braille_circle.go rename to draw/braille_circle.go diff --git a/internal/draw/braille_circle_test.go b/draw/braille_circle_test.go similarity index 100% rename from internal/draw/braille_circle_test.go rename to draw/braille_circle_test.go diff --git a/internal/draw/braille_fill.go b/draw/braille_fill.go similarity index 100% rename from internal/draw/braille_fill.go rename to draw/braille_fill.go diff --git a/internal/draw/braille_fill_test.go b/draw/braille_fill_test.go similarity index 100% rename from internal/draw/braille_fill_test.go rename to draw/braille_fill_test.go diff --git a/internal/draw/braille_line.go b/draw/braille_line.go similarity index 100% rename from internal/draw/braille_line.go rename to draw/braille_line.go diff --git a/internal/draw/braille_line_test.go b/draw/braille_line_test.go similarity index 100% rename from internal/draw/braille_line_test.go rename to draw/braille_line_test.go diff --git a/internal/draw/draw.go b/draw/draw.go similarity index 100% rename from internal/draw/draw.go rename to draw/draw.go diff --git a/internal/draw/hv_line.go b/draw/hv_line.go similarity index 100% rename from internal/draw/hv_line.go rename to draw/hv_line.go diff --git a/internal/draw/hv_line_graph.go b/draw/hv_line_graph.go similarity index 100% rename from internal/draw/hv_line_graph.go rename to draw/hv_line_graph.go diff --git a/internal/draw/hv_line_graph_test.go b/draw/hv_line_graph_test.go similarity index 100% rename from internal/draw/hv_line_graph_test.go rename to draw/hv_line_graph_test.go diff --git a/internal/draw/hv_line_test.go b/draw/hv_line_test.go similarity index 100% rename from internal/draw/hv_line_test.go rename to draw/hv_line_test.go diff --git a/internal/draw/line_style.go b/draw/line_style.go similarity index 100% rename from internal/draw/line_style.go rename to draw/line_style.go diff --git a/internal/draw/rectangle.go b/draw/rectangle.go similarity index 100% rename from internal/draw/rectangle.go rename to draw/rectangle.go diff --git a/internal/draw/rectangle_test.go b/draw/rectangle_test.go similarity index 100% rename from internal/draw/rectangle_test.go rename to draw/rectangle_test.go diff --git a/internal/draw/segdisp/segment/segment.go b/draw/segdisp/segment/segment.go similarity index 99% rename from internal/draw/segdisp/segment/segment.go rename to draw/segdisp/segment/segment.go index 2d4553b..99f242a 100644 --- a/internal/draw/segdisp/segment/segment.go +++ b/draw/segdisp/segment/segment.go @@ -20,8 +20,8 @@ import ( "image" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" ) // Type identifies the type of the segment that is drawn. diff --git a/internal/draw/segdisp/segment/segment_test.go b/draw/segdisp/segment/segment_test.go similarity index 99% rename from internal/draw/segdisp/segment/segment_test.go rename to draw/segdisp/segment/segment_test.go index 012cffd..4bfab80 100644 --- a/internal/draw/segdisp/segment/segment_test.go +++ b/draw/segdisp/segment/segment_test.go @@ -20,11 +20,11 @@ import ( "testing" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/segdisp/segment/testsegment/testsegment.go b/draw/segdisp/segment/testsegment/testsegment.go similarity index 95% rename from internal/draw/segdisp/segment/testsegment/testsegment.go rename to draw/segdisp/segment/testsegment/testsegment.go index 1862c8d..ec99d76 100644 --- a/internal/draw/segdisp/segment/testsegment/testsegment.go +++ b/draw/segdisp/segment/testsegment/testsegment.go @@ -19,8 +19,8 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw/segdisp/segment" ) // MustHV draws the segment or panics. diff --git a/internal/draw/segdisp/sixteen/attributes.go b/draw/segdisp/sixteen/attributes.go similarity index 99% rename from internal/draw/segdisp/sixteen/attributes.go rename to draw/segdisp/sixteen/attributes.go index 2bf5bce..7b76457 100644 --- a/internal/draw/segdisp/sixteen/attributes.go +++ b/draw/segdisp/sixteen/attributes.go @@ -22,7 +22,7 @@ import ( "image" "math" - "github.com/mum4k/termdash/internal/draw/segdisp/segment" + "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/numbers" ) diff --git a/internal/draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg b/draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg similarity index 100% rename from internal/draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg rename to draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg diff --git a/internal/draw/segdisp/sixteen/doc/segment_placement.graffle b/draw/segdisp/sixteen/doc/segment_placement.graffle similarity index 100% rename from internal/draw/segdisp/sixteen/doc/segment_placement.graffle rename to draw/segdisp/sixteen/doc/segment_placement.graffle diff --git a/internal/draw/segdisp/sixteen/doc/segment_placement.svg b/draw/segdisp/sixteen/doc/segment_placement.svg similarity index 100% rename from internal/draw/segdisp/sixteen/doc/segment_placement.svg rename to draw/segdisp/sixteen/doc/segment_placement.svg diff --git a/internal/draw/segdisp/sixteen/sixteen.go b/draw/segdisp/sixteen/sixteen.go similarity index 99% rename from internal/draw/segdisp/sixteen/sixteen.go rename to draw/segdisp/sixteen/sixteen.go index d398b28..50c5a8e 100644 --- a/internal/draw/segdisp/sixteen/sixteen.go +++ b/draw/segdisp/sixteen/sixteen.go @@ -46,10 +46,10 @@ import ( "math" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw/segdisp/segment" ) // Segment represents a single segment in the display. diff --git a/internal/draw/segdisp/sixteen/sixteen_test.go b/draw/segdisp/sixteen/sixteen_test.go similarity index 99% rename from internal/draw/segdisp/sixteen/sixteen_test.go rename to draw/segdisp/sixteen/sixteen_test.go index 0ec75ef..9d8cea8 100644 --- a/internal/draw/segdisp/sixteen/sixteen_test.go +++ b/draw/segdisp/sixteen/sixteen_test.go @@ -21,12 +21,12 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw/segdisp/segment" + "github.com/mum4k/termdash/draw/segdisp/segment/testsegment" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/segdisp/segment" - "github.com/mum4k/termdash/internal/draw/segdisp/segment/testsegment" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/internal/draw/segdisp/sixteen/testsixteen/testsixteen.go b/draw/segdisp/sixteen/testsixteen/testsixteen.go similarity index 95% rename from internal/draw/segdisp/sixteen/testsixteen/testsixteen.go rename to draw/segdisp/sixteen/testsixteen/testsixteen.go index 884a17c..4d8f756 100644 --- a/internal/draw/segdisp/sixteen/testsixteen/testsixteen.go +++ b/draw/segdisp/sixteen/testsixteen/testsixteen.go @@ -18,8 +18,8 @@ package testsixteen import ( "fmt" + "github.com/mum4k/termdash/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" ) // MustSetCharacter sets the character on the display or panics. diff --git a/internal/draw/testdraw/testdraw.go b/draw/testdraw/testdraw.go similarity index 98% rename from internal/draw/testdraw/testdraw.go rename to draw/testdraw/testdraw.go index e29f499..6887266 100644 --- a/internal/draw/testdraw/testdraw.go +++ b/draw/testdraw/testdraw.go @@ -19,9 +19,9 @@ import ( "fmt" "image" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" ) // MustBorder draws border on the canvas or panics. diff --git a/internal/draw/text.go b/draw/text.go similarity index 100% rename from internal/draw/text.go rename to draw/text.go diff --git a/internal/draw/text_test.go b/draw/text_test.go similarity index 100% rename from internal/draw/text_test.go rename to draw/text_test.go diff --git a/internal/draw/vertical_text.go b/draw/vertical_text.go similarity index 100% rename from internal/draw/vertical_text.go rename to draw/vertical_text.go diff --git a/internal/draw/vertical_text_test.go b/draw/vertical_text_test.go similarity index 100% rename from internal/draw/vertical_text_test.go rename to draw/vertical_text_test.go diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index f590005..44c54dd 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -28,7 +28,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index 61fbbb6..1e7a2d3 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" ) diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index ce9d146..73a4829 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -20,10 +20,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index 753ebcd..4f573fb 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/barchart" diff --git a/widgets/barchart/options.go b/widgets/barchart/options.go index 1bdb770..5b941c9 100644 --- a/widgets/barchart/options.go +++ b/widgets/barchart/options.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" ) // Option is used to provide options. diff --git a/widgets/button/button.go b/widgets/button/button.go index 5ae60d1..8309626 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 6097a6d..8509279 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -23,10 +23,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index dbff3a8..2b4595c 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/button" diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index d971fea..a43b980 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell/runewidth" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 6432676..a4ce0a1 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index 402350b..c177a59 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/donut" diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index c9baac8..7f6cb14 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -21,9 +21,9 @@ import ( "image" "sync" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index 7167f6a..c364116 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 7efc6f4..7dfd84c 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -25,9 +25,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/cell/runewidth" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" ) diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 9d0ee99..a526ca1 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index bcef2e9..093ac43 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/gauge" diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index 0bc8d10..e743f07 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" ) // Option is used to provide options. diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 99786cd..f714494 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -23,10 +23,10 @@ import ( "sync" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index bc65997..24be7d5 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -21,11 +21,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index 69d62fa..2e84259 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/linechart" diff --git a/widgets/segmentdisplay/segment_area.go b/widgets/segmentdisplay/segment_area.go index aaf6e98..3ac0492 100644 --- a/widgets/segmentdisplay/segment_area.go +++ b/widgets/segmentdisplay/segment_area.go @@ -21,7 +21,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" + "github.com/mum4k/termdash/draw/segdisp/sixteen" ) // segArea contains information about the area that will contain the segments. diff --git a/widgets/segmentdisplay/segmentdisplay.go b/widgets/segmentdisplay/segmentdisplay.go index 59ce98e..22b62f0 100644 --- a/widgets/segmentdisplay/segmentdisplay.go +++ b/widgets/segmentdisplay/segmentdisplay.go @@ -24,9 +24,9 @@ import ( "sync" "github.com/mum4k/termdash/align" + "github.com/mum4k/termdash/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" ) diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index 446d550..953106e 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw/segdisp/sixteen" + "github.com/mum4k/termdash/draw/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" - "github.com/mum4k/termdash/internal/draw/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index 5a99708..bc62ec7 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index 8bf7677..884cb70 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -22,9 +22,9 @@ import ( "sync" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminalapi" ) diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index 2af5c4c..dfeae3d 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -20,10 +20,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index 284fded..73e8c9f 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index bfb2099..38e1cf9 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" ) diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index f352429..881ec98 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -20,10 +20,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" - "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index c3d6840..13372e2 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminalapi" "github.com/mum4k/termdash/widgets/text" From b74f46509be959bf1e410bc91a89b4d98b4520fa Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:27:17 -0500 Subject: [PATCH 06/14] Moving runewidth, segdisp and testdraw to internal. --- align/align.go | 2 +- cell/cell.go | 2 +- container/container.go | 2 +- container/container_test.go | 4 ++-- container/draw_test.go | 2 +- container/focus.go | 2 +- container/focus_test.go | 2 +- draw/line_style.go | 2 +- draw/text.go | 2 +- internal/canvas/braille/braille.go | 2 +- internal/canvas/canvas.go | 4 ++-- internal/event/event.go | 2 +- internal/event/event_test.go | 2 +- internal/event/eventqueue/eventqueue.go | 2 +- internal/event/eventqueue/eventqueue_test.go | 2 +- internal/faketerm/faketerm.go | 2 +- internal/mouse/button/button.go | 2 +- internal/mouse/button/button_test.go | 2 +- {cell => internal}/runewidth/runewidth.go | 0 {cell => internal}/runewidth/runewidth_test.go | 0 {draw => internal}/segdisp/segment/segment.go | 0 {draw => internal}/segdisp/segment/segment_test.go | 2 +- .../segdisp/segment/testsegment/testsegment.go | 2 +- {draw => internal}/segdisp/sixteen/attributes.go | 2 +- .../segdisp/sixteen/doc/16-Segment-ASCII-All.jpg | Bin .../segdisp/sixteen/doc/segment_placement.graffle | Bin .../segdisp/sixteen/doc/segment_placement.svg | 0 {draw => internal}/segdisp/sixteen/sixteen.go | 2 +- {draw => internal}/segdisp/sixteen/sixteen_test.go | 4 ++-- .../segdisp/sixteen/testsixteen/testsixteen.go | 2 +- {draw => internal}/testdraw/testdraw.go | 0 internal/widgetapi/widgetapi.go | 2 +- termdash.go | 2 +- termdash_test.go | 2 +- termdashdemo/termdashdemo.go | 2 +- terminal/termbox/color_mode.go | 2 +- terminal/termbox/event.go | 2 +- terminal/termbox/event_test.go | 2 +- terminal/termbox/termbox.go | 2 +- terminal/termbox/termbox_test.go | 2 +- {terminalapi => terminal/terminalapi}/color_mode.go | 0 {terminalapi => terminal/terminalapi}/event.go | 0 .../terminalapi}/terminalapi.go | 0 widgets/barchart/barchart.go | 2 +- widgets/barchart/barchart_test.go | 2 +- widgets/barchart/barchartdemo/barchartdemo.go | 2 +- widgets/button/button.go | 2 +- widgets/button/button_test.go | 4 ++-- widgets/button/buttondemo/buttondemo.go | 2 +- widgets/button/options.go | 2 +- widgets/donut/donut.go | 4 ++-- widgets/donut/donut_test.go | 4 ++-- widgets/donut/donutdemo/donutdemo.go | 2 +- widgets/fakewidget/fakewidget.go | 2 +- widgets/fakewidget/fakewidget_test.go | 4 ++-- widgets/gauge/gauge.go | 4 ++-- widgets/gauge/gauge_test.go | 2 +- widgets/gauge/gaugedemo/gaugedemo.go | 2 +- widgets/linechart/internal/zoom/zoom.go | 2 +- widgets/linechart/internal/zoom/zoom_test.go | 2 +- widgets/linechart/linechart.go | 2 +- widgets/linechart/linechart_test.go | 4 ++-- widgets/linechart/linechartdemo/linechartdemo.go | 2 +- widgets/segmentdisplay/segment_area.go | 2 +- widgets/segmentdisplay/segmentdisplay.go | 4 ++-- widgets/segmentdisplay/segmentdisplay_test.go | 6 +++--- .../segmentdisplaydemo/segmentdisplaydemo.go | 2 +- widgets/sparkline/sparkline.go | 2 +- widgets/sparkline/sparkline_test.go | 2 +- widgets/sparkline/sparklinedemo/sparklinedemo.go | 2 +- widgets/sparkline/sparks.go | 2 +- widgets/text/line_scanner.go | 2 +- widgets/text/line_trim.go | 2 +- widgets/text/line_trim_test.go | 2 +- widgets/text/text.go | 2 +- widgets/text/text_test.go | 4 ++-- widgets/text/textdemo/textdemo.go | 2 +- 77 files changed, 80 insertions(+), 80 deletions(-) rename {cell => internal}/runewidth/runewidth.go (100%) rename {cell => internal}/runewidth/runewidth_test.go (100%) rename {draw => internal}/segdisp/segment/segment.go (100%) rename {draw => internal}/segdisp/segment/segment_test.go (99%) rename {draw => internal}/segdisp/segment/testsegment/testsegment.go (96%) rename {draw => internal}/segdisp/sixteen/attributes.go (99%) rename {draw => internal}/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg (100%) rename {draw => internal}/segdisp/sixteen/doc/segment_placement.graffle (100%) rename {draw => internal}/segdisp/sixteen/doc/segment_placement.svg (100%) rename {draw => internal}/segdisp/sixteen/sixteen.go (99%) rename {draw => internal}/segdisp/sixteen/sixteen_test.go (99%) rename {draw => internal}/segdisp/sixteen/testsixteen/testsixteen.go (95%) rename {draw => internal}/testdraw/testdraw.go (100%) rename {terminalapi => terminal/terminalapi}/color_mode.go (100%) rename {terminalapi => terminal/terminalapi}/event.go (100%) rename {terminalapi => terminal/terminalapi}/terminalapi.go (100%) diff --git a/align/align.go b/align/align.go index aac220f..8505c80 100644 --- a/align/align.go +++ b/align/align.go @@ -20,7 +20,7 @@ import ( "image" "strings" - "github.com/mum4k/termdash/cell/runewidth" + "github.com/mum4k/termdash/internal/runewidth" ) // Horizontal indicates the type of horizontal alignment. diff --git a/cell/cell.go b/cell/cell.go index a74dd8b..103a60b 100644 --- a/cell/cell.go +++ b/cell/cell.go @@ -23,8 +23,8 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/area" + "github.com/mum4k/termdash/internal/runewidth" ) // Option is used to provide options for cells on a 2-D terminal. diff --git a/container/container.go b/container/container.go index d2b8a16..2b43511 100644 --- a/container/container.go +++ b/container/container.go @@ -31,7 +31,7 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // Container wraps either sub containers or widgets and positions them on the diff --git a/container/container_test.go b/container/container_test.go index 38e3321..48d6871 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -24,15 +24,15 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/draw_test.go b/container/draw_test.go index e0c6dd5..5c6f349 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -21,9 +21,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/focus.go b/container/focus.go index 18fc189..03e72c6 100644 --- a/container/focus.go +++ b/container/focus.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // pointCont finds the top-most (on the screen) container whose area contains diff --git a/container/focus_test.go b/container/focus_test.go index a2ac5d4..58212b6 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // pointCase is a test case for the pointCont function. diff --git a/draw/line_style.go b/draw/line_style.go index 21eb5fc..6c5d7c0 100644 --- a/draw/line_style.go +++ b/draw/line_style.go @@ -17,7 +17,7 @@ package draw import ( "fmt" - "github.com/mum4k/termdash/cell/runewidth" + "github.com/mum4k/termdash/internal/runewidth" ) // line_style.go contains the Unicode characters used for drawing lines of diff --git a/draw/text.go b/draw/text.go index 7286259..c940ee5 100644 --- a/draw/text.go +++ b/draw/text.go @@ -22,8 +22,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/runewidth" ) // OverrunMode represents diff --git a/internal/canvas/braille/braille.go b/internal/canvas/braille/braille.go index b516d9c..b8520e6 100644 --- a/internal/canvas/braille/braille.go +++ b/internal/canvas/braille/braille.go @@ -47,7 +47,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) const ( diff --git a/internal/canvas/canvas.go b/internal/canvas/canvas.go index 5bce064..f2f131c 100644 --- a/internal/canvas/canvas.go +++ b/internal/canvas/canvas.go @@ -20,9 +20,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/area" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/terminal/terminalapi" ) // Canvas is where a widget draws its output for display on the terminal. diff --git a/internal/event/event.go b/internal/event/event.go index 62406bb..c953c9a 100644 --- a/internal/event/event.go +++ b/internal/event/event.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // Callback is a function provided by an event subscriber. diff --git a/internal/event/event_test.go b/internal/event/event_test.go index b91f779..953b6b8 100644 --- a/internal/event/event_test.go +++ b/internal/event/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // receiverMode defines how the receiver behaves. diff --git a/internal/event/eventqueue/eventqueue.go b/internal/event/eventqueue/eventqueue.go index 815db8d..eb22d4f 100644 --- a/internal/event/eventqueue/eventqueue.go +++ b/internal/event/eventqueue/eventqueue.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // node is a single data item on the queue. diff --git a/internal/event/eventqueue/eventqueue_test.go b/internal/event/eventqueue/eventqueue_test.go index 17625b2..2e631dc 100644 --- a/internal/event/eventqueue/eventqueue_test.go +++ b/internal/event/eventqueue/eventqueue_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) func TestQueue(t *testing.T) { diff --git a/internal/faketerm/faketerm.go b/internal/faketerm/faketerm.go index 58a0f8d..f8d462d 100644 --- a/internal/faketerm/faketerm.go +++ b/internal/faketerm/faketerm.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // Option is used to provide options. diff --git a/internal/mouse/button/button.go b/internal/mouse/button/button.go index 7de620b..ba81940 100644 --- a/internal/mouse/button/button.go +++ b/internal/mouse/button/button.go @@ -19,7 +19,7 @@ import ( "image" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // State represents the state of the mouse button. diff --git a/internal/mouse/button/button_test.go b/internal/mouse/button/button_test.go index bf4d288..ae59a5e 100644 --- a/internal/mouse/button/button_test.go +++ b/internal/mouse/button/button_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // eventTestCase is one mouse event and the output expectation. diff --git a/cell/runewidth/runewidth.go b/internal/runewidth/runewidth.go similarity index 100% rename from cell/runewidth/runewidth.go rename to internal/runewidth/runewidth.go diff --git a/cell/runewidth/runewidth_test.go b/internal/runewidth/runewidth_test.go similarity index 100% rename from cell/runewidth/runewidth_test.go rename to internal/runewidth/runewidth_test.go diff --git a/draw/segdisp/segment/segment.go b/internal/segdisp/segment/segment.go similarity index 100% rename from draw/segdisp/segment/segment.go rename to internal/segdisp/segment/segment.go diff --git a/draw/segdisp/segment/segment_test.go b/internal/segdisp/segment/segment_test.go similarity index 99% rename from draw/segdisp/segment/segment_test.go rename to internal/segdisp/segment/segment_test.go index 4bfab80..b5c9f51 100644 --- a/draw/segdisp/segment/segment_test.go +++ b/internal/segdisp/segment/segment_test.go @@ -21,11 +21,11 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" ) func TestHV(t *testing.T) { diff --git a/draw/segdisp/segment/testsegment/testsegment.go b/internal/segdisp/segment/testsegment/testsegment.go similarity index 96% rename from draw/segdisp/segment/testsegment/testsegment.go rename to internal/segdisp/segment/testsegment/testsegment.go index ec99d76..d8a2b35 100644 --- a/draw/segdisp/segment/testsegment/testsegment.go +++ b/internal/segdisp/segment/testsegment/testsegment.go @@ -19,8 +19,8 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/segdisp/segment" ) // MustHV draws the segment or panics. diff --git a/draw/segdisp/sixteen/attributes.go b/internal/segdisp/sixteen/attributes.go similarity index 99% rename from draw/segdisp/sixteen/attributes.go rename to internal/segdisp/sixteen/attributes.go index 7b76457..5af1a7c 100644 --- a/draw/segdisp/sixteen/attributes.go +++ b/internal/segdisp/sixteen/attributes.go @@ -22,8 +22,8 @@ import ( "image" "math" - "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/internal/segdisp/segment" ) // hvSegType maps horizontal and vertical segments to their type. diff --git a/draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg b/internal/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg similarity index 100% rename from draw/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg rename to internal/segdisp/sixteen/doc/16-Segment-ASCII-All.jpg diff --git a/draw/segdisp/sixteen/doc/segment_placement.graffle b/internal/segdisp/sixteen/doc/segment_placement.graffle similarity index 100% rename from draw/segdisp/sixteen/doc/segment_placement.graffle rename to internal/segdisp/sixteen/doc/segment_placement.graffle diff --git a/draw/segdisp/sixteen/doc/segment_placement.svg b/internal/segdisp/sixteen/doc/segment_placement.svg similarity index 100% rename from draw/segdisp/sixteen/doc/segment_placement.svg rename to internal/segdisp/sixteen/doc/segment_placement.svg diff --git a/draw/segdisp/sixteen/sixteen.go b/internal/segdisp/sixteen/sixteen.go similarity index 99% rename from draw/segdisp/sixteen/sixteen.go rename to internal/segdisp/sixteen/sixteen.go index 50c5a8e..dcab6d6 100644 --- a/draw/segdisp/sixteen/sixteen.go +++ b/internal/segdisp/sixteen/sixteen.go @@ -46,10 +46,10 @@ import ( "math" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw/segdisp/segment" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/segdisp/segment" ) // Segment represents a single segment in the display. diff --git a/draw/segdisp/sixteen/sixteen_test.go b/internal/segdisp/sixteen/sixteen_test.go similarity index 99% rename from draw/segdisp/sixteen/sixteen_test.go rename to internal/segdisp/sixteen/sixteen_test.go index 9d8cea8..2fabdde 100644 --- a/draw/segdisp/sixteen/sixteen_test.go +++ b/internal/segdisp/sixteen/sixteen_test.go @@ -21,13 +21,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw/segdisp/segment" - "github.com/mum4k/termdash/draw/segdisp/segment/testsegment" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/segdisp/segment" + "github.com/mum4k/termdash/internal/segdisp/segment/testsegment" ) func TestDraw(t *testing.T) { diff --git a/draw/segdisp/sixteen/testsixteen/testsixteen.go b/internal/segdisp/sixteen/testsixteen/testsixteen.go similarity index 95% rename from draw/segdisp/sixteen/testsixteen/testsixteen.go rename to internal/segdisp/sixteen/testsixteen/testsixteen.go index 4d8f756..a9be809 100644 --- a/draw/segdisp/sixteen/testsixteen/testsixteen.go +++ b/internal/segdisp/sixteen/testsixteen/testsixteen.go @@ -18,8 +18,8 @@ package testsixteen import ( "fmt" - "github.com/mum4k/termdash/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/segdisp/sixteen" ) // MustSetCharacter sets the character on the display or panics. diff --git a/draw/testdraw/testdraw.go b/internal/testdraw/testdraw.go similarity index 100% rename from draw/testdraw/testdraw.go rename to internal/testdraw/testdraw.go diff --git a/internal/widgetapi/widgetapi.go b/internal/widgetapi/widgetapi.go index 29077e5..9646c6e 100644 --- a/internal/widgetapi/widgetapi.go +++ b/internal/widgetapi/widgetapi.go @@ -19,7 +19,7 @@ import ( "image" "github.com/mum4k/termdash/internal/canvas" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // KeyScope indicates the scope at which the widget wants to receive keyboard diff --git a/termdash.go b/termdash.go index 24a2af1..50b1c02 100644 --- a/termdash.go +++ b/termdash.go @@ -32,7 +32,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // DefaultRedrawInterval is the default for the RedrawInterval option. diff --git a/termdash_test.go b/termdash_test.go index 38b3b12..e560d53 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -33,7 +33,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" "github.com/mum4k/termdash/widgets/gauge" diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 44c54dd..5a30d54 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -30,7 +30,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/donut" diff --git a/terminal/termbox/color_mode.go b/terminal/termbox/color_mode.go index 0e42ee7..793f2a9 100644 --- a/terminal/termbox/color_mode.go +++ b/terminal/termbox/color_mode.go @@ -17,7 +17,7 @@ package termbox import ( "fmt" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event.go b/terminal/termbox/event.go index 4e57738..8a32101 100644 --- a/terminal/termbox/event.go +++ b/terminal/termbox/event.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event_test.go b/terminal/termbox/event_test.go index 99ccb95..904c3e3 100644 --- a/terminal/termbox/event_test.go +++ b/terminal/termbox/event_test.go @@ -23,7 +23,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox.go b/terminal/termbox/termbox.go index 0aee2b8..6edb104 100644 --- a/terminal/termbox/termbox.go +++ b/terminal/termbox/termbox.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox_test.go b/terminal/termbox/termbox_test.go index 355ddad..394f879 100644 --- a/terminal/termbox/termbox_test.go +++ b/terminal/termbox/termbox_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) func TestNewTerminal(t *testing.T) { diff --git a/terminalapi/color_mode.go b/terminal/terminalapi/color_mode.go similarity index 100% rename from terminalapi/color_mode.go rename to terminal/terminalapi/color_mode.go diff --git a/terminalapi/event.go b/terminal/terminalapi/event.go similarity index 100% rename from terminalapi/event.go rename to terminal/terminalapi/event.go diff --git a/terminalapi/terminalapi.go b/terminal/terminalapi/terminalapi.go similarity index 100% rename from terminalapi/terminalapi.go rename to terminal/terminalapi/terminalapi.go diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index 1e7a2d3..9d35acb 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -28,7 +28,7 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // BarChart displays multiple bars showing relative ratios of values. diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index 73a4829..e3c6a27 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index 4f573fb..ac2012f 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" ) diff --git a/widgets/button/button.go b/widgets/button/button.go index 8309626..7c25d8e 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -29,7 +29,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // CallbackFn is the function called when the button is pressed. diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 8509279..1254f17 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -24,14 +24,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // callbackTracker tracks whether callback was called. diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 2b4595c..3fae80b 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/button/options.go b/widgets/button/options.go index 5885d9a..522b2d3 100644 --- a/widgets/button/options.go +++ b/widgets/button/options.go @@ -21,8 +21,8 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/keyboard" + "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index a43b980..2f97a8b 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -23,13 +23,13 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // progressType indicates how was the current progress provided by the caller. diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index a4ce0a1..830bcb0 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -21,13 +21,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) func TestDonut(t *testing.T) { diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index c177a59..e89a4b7 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/donut" ) diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index 7f6cb14..24ca384 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // outputLines are the number of lines written by this plugin. diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index c364116..c73151c 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -19,14 +19,14 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // keyEvents are keyboard events to send to the widget. diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 7dfd84c..9ef760e 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -24,12 +24,12 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // progressType indicates how was the current progress provided by the caller. diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index a526ca1..cac1a98 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -22,10 +22,10 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index 093ac43..b0260d3 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/gauge" ) diff --git a/widgets/linechart/internal/zoom/zoom.go b/widgets/linechart/internal/zoom/zoom.go index f4daf6a..5c6bb5c 100644 --- a/widgets/linechart/internal/zoom/zoom.go +++ b/widgets/linechart/internal/zoom/zoom.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/internal/zoom/zoom_test.go b/widgets/linechart/internal/zoom/zoom_test.go index 76cba33..f435bc6 100644 --- a/widgets/linechart/internal/zoom/zoom_test.go +++ b/widgets/linechart/internal/zoom/zoom_test.go @@ -20,7 +20,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index f714494..226cd6f 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -29,7 +29,7 @@ import ( "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" "github.com/mum4k/termdash/widgets/linechart/internal/zoom" ) diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 24be7d5..9092f75 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -22,14 +22,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) func TestLineChartDraws(t *testing.T) { diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index 2e84259..e95d936 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart" ) diff --git a/widgets/segmentdisplay/segment_area.go b/widgets/segmentdisplay/segment_area.go index 3ac0492..e458643 100644 --- a/widgets/segmentdisplay/segment_area.go +++ b/widgets/segmentdisplay/segment_area.go @@ -21,7 +21,7 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/draw/segdisp/sixteen" + "github.com/mum4k/termdash/internal/segdisp/sixteen" ) // segArea contains information about the area that will contain the segments. diff --git a/widgets/segmentdisplay/segmentdisplay.go b/widgets/segmentdisplay/segmentdisplay.go index 22b62f0..97fd735 100644 --- a/widgets/segmentdisplay/segmentdisplay.go +++ b/widgets/segmentdisplay/segmentdisplay.go @@ -24,11 +24,11 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/draw/segdisp/sixteen" "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/segdisp/sixteen" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // SegmentDisplay displays ASCII content by simulating a segment display. diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index 953106e..4bf286b 100644 --- a/widgets/segmentdisplay/segmentdisplay_test.go +++ b/widgets/segmentdisplay/segmentdisplay_test.go @@ -21,13 +21,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw/segdisp/sixteen" - "github.com/mum4k/termdash/draw/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/segdisp/sixteen" + "github.com/mum4k/termdash/internal/segdisp/sixteen/testsixteen" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // mustDrawChar draws the provided character in the area of the canvas or panics. diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index bc62ec7..0ef3168 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index 884cb70..c81e14b 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // SparkLine draws a graph showing a series of values as vertical bars. diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index dfeae3d..76f9095 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index 73e8c9f..bc0332c 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" ) diff --git a/widgets/sparkline/sparks.go b/widgets/sparkline/sparks.go index 2b8526e..9e7f900 100644 --- a/widgets/sparkline/sparks.go +++ b/widgets/sparkline/sparks.go @@ -20,8 +20,8 @@ package sparkline import ( "fmt" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/internal/runewidth" ) // sparks are the characters used to draw the SparkLine. diff --git a/widgets/text/line_scanner.go b/widgets/text/line_scanner.go index e2f65af..0a6ab3d 100644 --- a/widgets/text/line_scanner.go +++ b/widgets/text/line_scanner.go @@ -20,7 +20,7 @@ import ( "strings" "text/scanner" - "github.com/mum4k/termdash/cell/runewidth" + "github.com/mum4k/termdash/internal/runewidth" ) // wrapNeeded returns true if wrapping is needed for the rune at the horizontal diff --git a/widgets/text/line_trim.go b/widgets/text/line_trim.go index f431d41..47f7b79 100644 --- a/widgets/text/line_trim.go +++ b/widgets/text/line_trim.go @@ -18,8 +18,8 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/cell/runewidth" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/runewidth" ) // line_trim.go contains code that trims lines that are too long. diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 38e1cf9..1e3e7cb 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -19,10 +19,10 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/internal/testdraw" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text.go b/widgets/text/text.go index b545ac6..0318e8d 100644 --- a/widgets/text/text.go +++ b/widgets/text/text.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) // Text displays a block of text. diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index 881ec98..a20741b 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -21,14 +21,14 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" - "github.com/mum4k/termdash/draw/testdraw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" ) func TestTextDraws(t *testing.T) { diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index 13372e2..6d3880d 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -27,7 +27,7 @@ import ( "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/text" ) From ff614b89e7cabcbdb9aa6f231170add909d2b7b5 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:42:34 -0500 Subject: [PATCH 07/14] Factoring linestyle into its own package. So that draw can be made internal. --- CHANGELOG.md | 12 ++ draw/border.go | 7 +- draw/border_test.go | 267 +++++++++++++++++++------------------ draw/hv_line.go | 13 +- draw/hv_line_graph.go | 4 +- draw/hv_line_graph_test.go | 53 ++++---- draw/hv_line_test.go | 41 +++--- draw/line_style.go | 37 +---- linestyle/linestyle.go | 34 +++++ 9 files changed, 248 insertions(+), 220 deletions(-) create mode 100644 linestyle/linestyle.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 79cfb81..725978b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.7.1] - 24-Feb-2019 + +### Fixed + +- Some of the packages moved into internal are required externally. This + release makes them available again. + +#### Breaking API changes + +- The draw.LineStyle enum was refactored into its own package + linestyle.LineStyle. + ## [0.7.0] - 24-Feb-2019 ### Added diff --git a/draw/border.go b/draw/border.go index 79d793b..833bd8c 100644 --- a/draw/border.go +++ b/draw/border.go @@ -23,6 +23,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/linestyle" ) // BorderOption is used to provide options to Border(). @@ -34,7 +35,7 @@ type BorderOption interface { // borderOptions stores the provided options. type borderOptions struct { cellOpts []cell.Option - lineStyle LineStyle + lineStyle linestyle.LineStyle title string titleOM OverrunMode titleCellOpts []cell.Option @@ -50,10 +51,10 @@ func (bo borderOption) set(bOpts *borderOptions) { } // DefaultBorderLineStyle is the default value for the BorderLineStyle option. -const DefaultBorderLineStyle = LineStyleLight +const DefaultBorderLineStyle = linestyle.Light // BorderLineStyle sets the style of the line used to draw the border. -func BorderLineStyle(ls LineStyle) BorderOption { +func BorderLineStyle(ls linestyle.LineStyle) BorderOption { return borderOption(func(bOpts *borderOptions) { bOpts.lineStyle = ls }) diff --git a/draw/border_test.go b/draw/border_test.go index 0a0eb58..a9d2cc8 100644 --- a/draw/border_test.go +++ b/draw/border_test.go @@ -23,6 +23,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/linestyle" ) func TestBorder(t *testing.T) { @@ -57,7 +58,7 @@ func TestBorder(t *testing.T) { canvas: image.Rect(0, 0, 4, 4), border: image.Rect(0, 0, 2, 2), opts: []BorderOption{ - BorderLineStyle(LineStyle(-1)), + BorderLineStyle(linestyle.LineStyle(-1)), }, want: func(size image.Point) *faketerm.Terminal { return faketerm.MustNew(size) @@ -72,21 +73,21 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -97,27 +98,27 @@ func TestBorder(t *testing.T) { canvas: image.Rect(0, 0, 4, 4), border: image.Rect(0, 0, 4, 4), opts: []BorderOption{ - BorderLineStyle(LineStyleDouble), + BorderLineStyle(linestyle.Double), }, want: func(size image.Point) *faketerm.Terminal { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleDouble][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleDouble][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleDouble][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleDouble][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Double][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Double][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Double][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Double][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[LineStyleDouble][hLine]) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleDouble][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[linestyle.Double][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Double][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[LineStyleDouble][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleDouble][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[linestyle.Double][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Double][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleDouble][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleDouble][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleDouble][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleDouble][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Double][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Double][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Double][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Double][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -128,27 +129,27 @@ func TestBorder(t *testing.T) { canvas: image.Rect(0, 0, 4, 4), border: image.Rect(0, 0, 4, 4), opts: []BorderOption{ - BorderLineStyle(LineStyleRound), + BorderLineStyle(linestyle.Round), }, want: func(size image.Point) *faketerm.Terminal { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleRound][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleRound][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleRound][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleRound][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Round][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Round][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Round][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Round][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[LineStyleRound][hLine]) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleRound][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[linestyle.Round][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Round][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[LineStyleRound][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleRound][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[linestyle.Round][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Round][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleRound][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleRound][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleRound][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleRound][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Round][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Round][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Round][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Round][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -162,11 +163,11 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{1, 1}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 2}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{1, 1}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{1, 2}, lineStyleChars[linestyle.Light][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{2, 1}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{2, 2}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{2, 1}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{2, 2}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -184,14 +185,14 @@ func TestBorder(t *testing.T) { c := testcanvas.MustNew(ft.Area()) testcanvas.MustSetCell(c, image.Point{1, 1}, - lineStyleChars[LineStyleLight][topLeftCorner], cell.FgColor(cell.ColorRed)) + lineStyleChars[linestyle.Light][topLeftCorner], cell.FgColor(cell.ColorRed)) testcanvas.MustSetCell(c, image.Point{1, 2}, - lineStyleChars[LineStyleLight][bottomLeftCorner], cell.FgColor(cell.ColorRed)) + lineStyleChars[linestyle.Light][bottomLeftCorner], cell.FgColor(cell.ColorRed)) testcanvas.MustSetCell(c, image.Point{2, 1}, - lineStyleChars[LineStyleLight][topRightCorner], cell.FgColor(cell.ColorRed)) + lineStyleChars[linestyle.Light][topRightCorner], cell.FgColor(cell.ColorRed)) testcanvas.MustSetCell(c, image.Point{2, 2}, - lineStyleChars[LineStyleLight][bottomRightCorner], cell.FgColor(cell.ColorRed)) + lineStyleChars[linestyle.Light][bottomRightCorner], cell.FgColor(cell.ColorRed)) testcanvas.MustApply(c, ft) return ft @@ -208,21 +209,21 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, 'b') - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -239,21 +240,21 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, 'a', cell.FgColor(cell.ColorRed)) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, 'b', cell.FgColor(cell.ColorRed)) - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -282,11 +283,11 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{1, 1}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 2}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{1, 1}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{1, 2}, lineStyleChars[linestyle.Light][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{2, 1}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{2, 2}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{2, 1}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{2, 2}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -303,21 +304,21 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, 'b') - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -334,21 +335,21 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, '…') - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{3, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -366,27 +367,27 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, 'b') - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{3, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{4, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{4, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -404,27 +405,27 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{3, 0}, 'b') - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{4, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{4, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft @@ -442,27 +443,27 @@ func TestBorder(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[LineStyleLight][topLeftCorner]) - testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[LineStyleLight][bottomLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 0}, lineStyleChars[linestyle.Light][topLeftCorner]) + testcanvas.MustSetCell(c, image.Point{0, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{0, 3}, lineStyleChars[linestyle.Light][bottomLeftCorner]) - testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{1, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[LineStyleLight][hLine]) - testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 0}, lineStyleChars[linestyle.Light][hLine]) + testcanvas.MustSetCell(c, image.Point{2, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{3, 0}, 'a') - testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{3, 3}, lineStyleChars[linestyle.Light][hLine]) testcanvas.MustSetCell(c, image.Point{4, 0}, 'b') - testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[LineStyleLight][hLine]) + testcanvas.MustSetCell(c, image.Point{4, 3}, lineStyleChars[linestyle.Light][hLine]) - testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[LineStyleLight][topRightCorner]) - testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[LineStyleLight][vLine]) - testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[LineStyleLight][bottomRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 0}, lineStyleChars[linestyle.Light][topRightCorner]) + testcanvas.MustSetCell(c, image.Point{5, 1}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 2}, lineStyleChars[linestyle.Light][vLine]) + testcanvas.MustSetCell(c, image.Point{5, 3}, lineStyleChars[linestyle.Light][bottomRightCorner]) testcanvas.MustApply(c, ft) return ft diff --git a/draw/hv_line.go b/draw/hv_line.go index 0eb757a..22ea1a8 100644 --- a/draw/hv_line.go +++ b/draw/hv_line.go @@ -22,6 +22,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/linestyle" ) // HVLineOption is used to provide options to HVLine(). @@ -33,13 +34,13 @@ type HVLineOption interface { // hVLineOptions stores the provided options. type hVLineOptions struct { cellOpts []cell.Option - lineStyle LineStyle + lineStyle linestyle.LineStyle } // newHVLineOptions returns a new hVLineOptions instance. func newHVLineOptions() *hVLineOptions { return &hVLineOptions{ - lineStyle: DefaultHVLineStyle, + lineStyle: DefaultLineStyle, } } @@ -51,12 +52,12 @@ func (o hVLineOption) set(opts *hVLineOptions) { o(opts) } -// DefaultHVLineStyle is the default value for the HVLineStyle option. -const DefaultHVLineStyle = LineStyleLight +// DefaultLineStyle is the default value for the HVLineStyle option. +const DefaultLineStyle = linestyle.Light // HVLineStyle sets the style of the line. -// Defaults to DefaultHVLineStyle. -func HVLineStyle(ls LineStyle) HVLineOption { +// Defaults to DefaultLineStyle. +func HVLineStyle(ls linestyle.LineStyle) HVLineOption { return hVLineOption(func(opts *hVLineOptions) { opts.lineStyle = ls }) diff --git a/draw/hv_line_graph.go b/draw/hv_line_graph.go index f151b6e..ccbc72a 100644 --- a/draw/hv_line_graph.go +++ b/draw/hv_line_graph.go @@ -19,6 +19,8 @@ package draw import ( "fmt" "image" + + "github.com/mum4k/termdash/linestyle" ) // hVLineEdge is an edge between two points on the graph. @@ -90,7 +92,7 @@ func (n *hVLineNode) hasRight() bool { // rune, given the selected line style returns the correct line character to // represent this node. // Only handles nodes with two or more edges, as returned by multiEdgeNodes(). -func (n *hVLineNode) rune(ls LineStyle) (rune, error) { +func (n *hVLineNode) rune(ls linestyle.LineStyle) (rune, error) { parts, err := lineParts(ls) if err != nil { return -1, err diff --git a/draw/hv_line_graph_test.go b/draw/hv_line_graph_test.go index 28332af..384ac01 100644 --- a/draw/hv_line_graph_test.go +++ b/draw/hv_line_graph_test.go @@ -21,6 +21,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/linestyle" ) func TestMultiEdgeNodes(t *testing.T) { @@ -180,7 +181,7 @@ func TestNodeRune(t *testing.T) { tests := []struct { desc string node *hVLineNode - ls LineStyle + ls linestyle.LineStyle want rune wantErr bool }{ @@ -197,7 +198,7 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 1}, image.Point{2, 2}): true, }, }, - ls: LineStyleLight, + ls: linestyle.Light, wantErr: true, }, { @@ -209,13 +210,13 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 1}, image.Point{2, 2}): true, }, }, - ls: LineStyleLight, + ls: linestyle.Light, wantErr: true, }, { desc: "fails on unsupported line style", node: &hVLineNode{}, - ls: LineStyle(-1), + ls: linestyle.LineStyle(-1), wantErr: true, }, { @@ -227,8 +228,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 1}, image.Point{2, 1}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][hLine], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][hLine], }, { desc: "vertical line", @@ -239,8 +240,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 1}, image.Point{1, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][vLine], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][vLine], }, { desc: "top left corner", @@ -251,8 +252,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{0, 0}, image.Point{0, 1}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][topLeftCorner], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][topLeftCorner], }, { desc: "top right corner", @@ -263,8 +264,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{2, 0}, image.Point{2, 1}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][topRightCorner], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][topRightCorner], }, { desc: "bottom left corner", @@ -275,8 +276,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{0, 2}, image.Point{1, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][bottomLeftCorner], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][bottomLeftCorner], }, { desc: "bottom right corner", @@ -287,8 +288,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{2, 1}, image.Point{2, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][bottomRightCorner], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][bottomRightCorner], }, { desc: "T horizontal and up", @@ -300,8 +301,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 2}, image.Point{2, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][hAndUp], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][hAndUp], }, { desc: "T horizontal and down", @@ -313,8 +314,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 0}, image.Point{1, 1}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][hAndDown], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][hAndDown], }, { desc: "T vertical and right", @@ -326,8 +327,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{0, 1}, image.Point{0, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][vAndRight], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][vAndRight], }, { desc: "T vertical and left", @@ -339,8 +340,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{2, 1}, image.Point{2, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][vAndLeft], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][vAndLeft], }, { desc: "cross", @@ -353,8 +354,8 @@ func TestNodeRune(t *testing.T) { newHVLineEdge(image.Point{1, 1}, image.Point{1, 2}): true, }, }, - ls: LineStyleLight, - want: lineStyleChars[LineStyleLight][vAndH], + ls: linestyle.Light, + want: lineStyleChars[linestyle.Light][vAndH], }, } diff --git a/draw/hv_line_test.go b/draw/hv_line_test.go index 126fc9b..e8dce65 100644 --- a/draw/hv_line_test.go +++ b/draw/hv_line_test.go @@ -22,6 +22,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/faketerm" + "github.com/mum4k/termdash/linestyle" ) func TestHVLines(t *testing.T) { @@ -102,7 +103,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, parts[hLine]) @@ -121,13 +122,13 @@ func TestHVLines(t *testing.T) { }, }, opts: []HVLineOption{ - HVLineStyle(LineStyleLight), + HVLineStyle(linestyle.Light), }, want: func(size image.Point) *faketerm.Terminal { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, parts[hLine]) @@ -155,7 +156,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine], cell.FgColor(cell.ColorYellow), cell.BgColor(cell.ColorBlue), @@ -186,7 +187,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hLine]) @@ -207,7 +208,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{1, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{1, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{1, 2}, parts[vLine]) @@ -229,7 +230,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{1, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{1, 1}, parts[vLine]) @@ -254,7 +255,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{2, 0}, parts[hLine]) @@ -284,7 +285,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 2}, parts[vLine]) @@ -314,7 +315,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 2}, parts[vLine]) @@ -343,7 +344,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[topLeftCorner]) testcanvas.MustSetCell(c, image.Point{0, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 2}, parts[vLine]) @@ -372,7 +373,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{2, 0}, parts[topRightCorner]) testcanvas.MustSetCell(c, image.Point{2, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{2, 2}, parts[vLine]) @@ -401,7 +402,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{0, 2}, parts[bottomLeftCorner]) @@ -430,7 +431,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{2, 0}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{2, 1}, parts[vLine]) testcanvas.MustSetCell(c, image.Point{2, 2}, parts[bottomRightCorner]) @@ -459,7 +460,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 2}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 2}, parts[hAndUp]) testcanvas.MustSetCell(c, image.Point{2, 2}, parts[hLine]) @@ -488,7 +489,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hAndDown]) testcanvas.MustSetCell(c, image.Point{2, 0}, parts[hLine]) @@ -517,7 +518,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 1}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 1}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{2, 1}, parts[vAndLeft]) @@ -546,7 +547,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 1}, parts[vAndRight]) testcanvas.MustSetCell(c, image.Point{1, 1}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{2, 1}, parts[hLine]) @@ -575,7 +576,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 1}, parts[hLine]) testcanvas.MustSetCell(c, image.Point{1, 1}, parts[vAndH]) testcanvas.MustSetCell(c, image.Point{2, 1}, parts[hLine]) @@ -622,7 +623,7 @@ func TestHVLines(t *testing.T) { ft := faketerm.MustNew(size) c := testcanvas.MustNew(ft.Area()) - parts := lineStyleChars[LineStyleLight] + parts := lineStyleChars[linestyle.Light] testcanvas.MustSetCell(c, image.Point{0, 0}, parts[topLeftCorner]) testcanvas.MustSetCell(c, image.Point{1, 0}, parts[hAndDown]) testcanvas.MustSetCell(c, image.Point{2, 0}, parts[topRightCorner]) diff --git a/draw/line_style.go b/draw/line_style.go index 6c5d7c0..aed26a8 100644 --- a/draw/line_style.go +++ b/draw/line_style.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/mum4k/termdash/internal/runewidth" + "github.com/mum4k/termdash/linestyle" ) // line_style.go contains the Unicode characters used for drawing lines of @@ -25,8 +26,8 @@ import ( // lineStyleChars maps the line styles to the corresponding component characters. // Source: http://en.wikipedia.org/wiki/Box-drawing_character. -var lineStyleChars = map[LineStyle]map[linePart]rune{ - LineStyleLight: { +var lineStyleChars = map[linestyle.LineStyle]map[linePart]rune{ + linestyle.Light: { hLine: '─', vLine: '│', topLeftCorner: '┌', @@ -39,7 +40,7 @@ var lineStyleChars = map[LineStyle]map[linePart]rune{ vAndRight: '├', vAndH: '┼', }, - LineStyleDouble: { + linestyle.Double: { hLine: '═', vLine: '║', topLeftCorner: '╔', @@ -52,7 +53,7 @@ var lineStyleChars = map[LineStyle]map[linePart]rune{ vAndRight: '╠', vAndH: '╬', }, - LineStyleRound: { + linestyle.Round: { hLine: '─', vLine: '│', topLeftCorner: '╭', @@ -80,7 +81,7 @@ func init() { } // lineParts returns the line component characters for the provided line style. -func lineParts(ls LineStyle) (map[linePart]rune, error) { +func lineParts(ls linestyle.LineStyle) (map[linePart]rune, error) { parts, ok := lineStyleChars[ls] if !ok { return nil, fmt.Errorf("unsupported line style %d", ls) @@ -88,32 +89,6 @@ func lineParts(ls LineStyle) (map[linePart]rune, error) { return parts, nil } -// LineStyle defines the supported line styles.Q -type LineStyle int - -// String implements fmt.Stringer() -func (ls LineStyle) String() string { - if n, ok := lineStyleNames[ls]; ok { - return n - } - return "LineStyleUnknown" -} - -// lineStyleNames maps LineStyle values to human readable names. -var lineStyleNames = map[LineStyle]string{ - LineStyleLight: "LineStyleLight", - LineStyleDouble: "LineStyleDouble", - LineStyleRound: "LineStyleRound", -} - -// Supported line styles. -const ( - LineStyleNone LineStyle = iota - LineStyleLight - LineStyleDouble - LineStyleRound -) - // linePart identifies individual line parts. type linePart int diff --git a/linestyle/linestyle.go b/linestyle/linestyle.go new file mode 100644 index 0000000..a32623c --- /dev/null +++ b/linestyle/linestyle.go @@ -0,0 +1,34 @@ +// Package linestyle defines various line styles. +package linestyle + +// LineStyle defines the supported line styles.Q +type LineStyle int + +// String implements fmt.Stringer() +func (ls LineStyle) String() string { + if n, ok := lineStyleNames[ls]; ok { + return n + } + return "LineStyleUnknown" +} + +// lineStyleNames maps LineStyle values to human readable names. +var lineStyleNames = map[LineStyle]string{ + Light: "LineStyleLight", + Double: "LineStyleDouble", + Round: "LineStyleRound", +} + +// Supported line styles. +// See https://en.wikipedia.org/wiki/Box-drawing_character. +const ( + None LineStyle = iota + // Light is line style using the '─' characters. + Light + + // Double is line style using the '═' characters. + Double + + // Round is line style using the rounded corners '╭' characters. + Round +) From e4726e4240e99ac93c5689658f2e54941a92b946 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:51:50 -0500 Subject: [PATCH 08/14] Changing all call sites to linestyle. --- container/container.go | 4 +- container/container_test.go | 85 ++++++++++--------- container/draw_test.go | 37 ++++---- container/focus_test.go | 6 +- container/options.go | 6 +- linestyle/linestyle.go | 3 + termdashdemo/termdashdemo.go | 18 ++-- widgets/barchart/barchartdemo/barchartdemo.go | 4 +- widgets/button/buttondemo/buttondemo.go | 4 +- widgets/donut/donutdemo/donutdemo.go | 4 +- widgets/gauge/gauge.go | 3 +- widgets/gauge/gauge_test.go | 21 ++--- widgets/gauge/gaugedemo/gaugedemo.go | 10 +-- widgets/gauge/options.go | 5 +- .../linechart/linechartdemo/linechartdemo.go | 4 +- .../segmentdisplaydemo/segmentdisplaydemo.go | 4 +- .../sparkline/sparklinedemo/sparklinedemo.go | 8 +- widgets/text/textdemo/textdemo.go | 12 +-- 18 files changed, 123 insertions(+), 115 deletions(-) diff --git a/container/container.go b/container/container.go index 2b43511..584135b 100644 --- a/container/container.go +++ b/container/container.go @@ -27,10 +27,10 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" ) @@ -103,7 +103,7 @@ func newChild(parent *Container, area image.Rectangle) *Container { // hasBorder determines if this container has a border. func (c *Container) hasBorder() bool { - return c.opts.border != draw.LineStyleNone + return c.opts.border != linestyle.None } // hasWidget determines if this container has a widget. diff --git a/container/container_test.go b/container/container_test.go index 48d6871..da24801 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -32,6 +32,7 @@ import ( "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" @@ -49,15 +50,15 @@ func Example() { Left( SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ), @@ -65,7 +66,7 @@ func Example() { ), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(bc), ), ), @@ -98,7 +99,7 @@ func TestNew(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), ) }, want: func(size image.Point) *faketerm.Terminal { @@ -121,10 +122,10 @@ func TestNew(t *testing.T) { ft, SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -146,10 +147,10 @@ func TestNew(t *testing.T) { ft, SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(0), ), @@ -168,10 +169,10 @@ func TestNew(t *testing.T) { ft, SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(100), ), @@ -190,10 +191,10 @@ func TestNew(t *testing.T) { ft, SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(20), ), @@ -214,13 +215,13 @@ func TestNew(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -247,10 +248,10 @@ func TestNew(t *testing.T) { ft, SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -272,10 +273,10 @@ func TestNew(t *testing.T) { ft, SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(0), ), @@ -294,10 +295,10 @@ func TestNew(t *testing.T) { ft, SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(100), ), @@ -316,10 +317,10 @@ func TestNew(t *testing.T) { ft, SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), SplitPercent(20), ), @@ -340,13 +341,13 @@ func TestNew(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -375,22 +376,22 @@ func TestNew(t *testing.T) { Left( SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( SplitHorizontal( Top( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Bottom( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ), ), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -412,15 +413,15 @@ func TestNew(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderColor(cell.ColorRed), FocusedColor(cell.ColorBlue), SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -453,14 +454,14 @@ func TestNew(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{})), SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), ) @@ -487,10 +488,10 @@ func TestNew(t *testing.T) { ft, SplitVertical( Left( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), Right( - Border(draw.LineStyleLight), + Border(linestyle.Light), ), ), PlaceWidget(fakewidget.New(widgetapi.Options{})), @@ -964,7 +965,7 @@ func TestMouse(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget( fakewidget.New(widgetapi.Options{WantMouse: widgetapi.MouseScopeWidget}), ), @@ -999,7 +1000,7 @@ func TestMouse(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget( fakewidget.New(widgetapi.Options{WantMouse: widgetapi.MouseScopeContainer}), ), @@ -1035,7 +1036,7 @@ func TestMouse(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget( fakewidget.New(widgetapi.Options{WantMouse: widgetapi.MouseScopeGlobal}), ), diff --git a/container/draw_test.go b/container/draw_test.go index 5c6f349..afc5d1d 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -25,6 +25,7 @@ import ( "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/widgets/fakewidget" ) @@ -42,7 +43,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{})), ) }, @@ -69,7 +70,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderTitle("ab"), BorderTitleAlignLeft(), PlaceWidget(fakewidget.New(widgetapi.Options{})), @@ -103,7 +104,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderTitle("ab"), BorderTitleAlignCenter(), PlaceWidget(fakewidget.New(widgetapi.Options{})), @@ -138,7 +139,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderTitle("ab"), BorderTitleAlignRight(), PlaceWidget(fakewidget.New(widgetapi.Options{})), @@ -173,7 +174,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderTitle("abcdefgh"), BorderTitleAlignRight(), PlaceWidget(fakewidget.New(widgetapi.Options{})), @@ -228,7 +229,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{})), ) }, @@ -243,7 +244,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), ) }, want: func(size image.Point) *faketerm.Terminal { @@ -279,7 +280,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{ MaximumSize: image.Point{10, 10}, })), @@ -311,7 +312,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{ MaximumSize: image.Point{10, 0}, })), @@ -343,7 +344,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{ MaximumSize: image.Point{0, 10}, })), @@ -375,7 +376,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{1, 2}}, )), @@ -407,7 +408,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), PlaceWidget(fakewidget.New(widgetapi.Options{ MaximumSize: image.Point{20, 19}, Ratio: image.Point{1, 1}, @@ -439,7 +440,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignHorizontal(align.HorizontalLeft), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{1, 2}}, @@ -470,7 +471,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignHorizontal(align.HorizontalCenter), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{1, 2}}, @@ -501,7 +502,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignHorizontal(align.HorizontalRight), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{1, 2}}, @@ -532,7 +533,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignVertical(align.VerticalTop), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{2, 1}}, @@ -563,7 +564,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignVertical(align.VerticalMiddle), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{2, 1}}, @@ -594,7 +595,7 @@ func TestDrawWidget(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), AlignVertical(align.VerticalBottom), PlaceWidget(fakewidget.New(widgetapi.Options{ Ratio: image.Point{2, 1}}, diff --git a/container/focus_test.go b/container/focus_test.go index 58212b6..a0bb77e 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -21,11 +21,11 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" ) @@ -97,7 +97,7 @@ func TestPointCont(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderColor(cell.ColorBlue), ) }, @@ -167,7 +167,7 @@ func TestPointCont(t *testing.T) { container: func(ft *faketerm.Terminal) (*Container, error) { return New( ft, - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderColor(cell.ColorBlack), SplitVertical( Left( diff --git a/container/options.go b/container/options.go index 3cd9ed8..0b38a53 100644 --- a/container/options.go +++ b/container/options.go @@ -21,8 +21,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" ) // applyOptions applies the options to the container. @@ -60,7 +60,7 @@ type options struct { vAlign align.Vertical // border is the border around the container. - border draw.LineStyle + border linestyle.LineStyle borderTitle string borderTitleHAlign align.Horizontal } @@ -224,7 +224,7 @@ func AlignVertical(v align.Vertical) Option { } // Border configures the container to have a border of the specified style. -func Border(ls draw.LineStyle) Option { +func Border(ls linestyle.LineStyle) Option { return option(func(c *Container) error { c.opts.border = ls return nil diff --git a/linestyle/linestyle.go b/linestyle/linestyle.go index a32623c..9218814 100644 --- a/linestyle/linestyle.go +++ b/linestyle/linestyle.go @@ -14,6 +14,7 @@ func (ls LineStyle) String() string { // lineStyleNames maps LineStyle values to human readable names. var lineStyleNames = map[LineStyle]string{ + None: "LineStyleNone", Light: "LineStyleLight", Double: "LineStyleDouble", Round: "LineStyleRound", @@ -22,7 +23,9 @@ var lineStyleNames = map[LineStyle]string{ // Supported line styles. // See https://en.wikipedia.org/wiki/Box-drawing_character. const ( + // None indicates that no line should be present. None LineStyle = iota + // Light is line style using the '─' characters. Light diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 5a30d54..c63c7c4 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -28,7 +28,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" @@ -62,19 +62,19 @@ func layout(ctx context.Context, t terminalapi.Terminal) (*container.Container, segmentTextSpark := []container.Option{ container.SplitHorizontal( container.Top( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("Press Q to quit"), container.PlaceWidget(sd), ), container.Bottom( container.SplitVertical( container.Left( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("A rolling text"), container.PlaceWidget(rollT), ), container.Right( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("A SparkLine group"), container.SplitHorizontal( container.Top(container.PlaceWidget(spGreen)), @@ -99,13 +99,13 @@ func layout(ctx context.Context, t terminalapi.Terminal) (*container.Container, gaugeAndHeartbeat := []container.Option{ container.SplitHorizontal( container.Top( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("A Gauge"), container.BorderColor(cell.ColorNumber(39)), container.PlaceWidget(g), ), container.Bottom( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("A LineChart"), container.PlaceWidget(heartLC), ), @@ -138,7 +138,7 @@ func layout(ctx context.Context, t terminalapi.Terminal) (*container.Container, lcAndButtons := []container.Option{ container.SplitHorizontal( container.Top( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("Multiple series"), container.BorderTitleAlignRight(), container.PlaceWidget(sineLC), @@ -162,7 +162,7 @@ func layout(ctx context.Context, t terminalapi.Terminal) (*container.Container, rightSide := []container.Option{ container.SplitHorizontal( container.Top( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("BarChart"), container.PlaceWidget(bc), container.BorderTitleAlignRight(), @@ -170,7 +170,7 @@ func layout(ctx context.Context, t terminalapi.Terminal) (*container.Container, container.Bottom( container.SplitHorizontal( container.Top( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("A Donut"), container.BorderTitleAlignRight(), container.PlaceWidget(don), diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index ac2012f..3ecb316 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" @@ -98,7 +98,7 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.PlaceWidget(bc), ) diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 3fae80b..2df1530 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/button" @@ -79,7 +79,7 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitHorizontal( container.Top( diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index e89a4b7..f1af14a 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/donut" @@ -112,7 +112,7 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitVertical( container.Left( diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 9ef760e..4665665 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -29,6 +29,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" ) @@ -145,7 +146,7 @@ func (g *Gauge) width(ar image.Rectangle) int { // hasBorder determines of the gauge has a border. func (g *Gauge) hasBorder() bool { - return g.opts.border != draw.LineStyleNone + return g.opts.border != linestyle.None } // usable determines the usable area for the gauge itself. diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index cac1a98..26903e1 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -27,6 +27,7 @@ import ( "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/linestyle" ) // percentCall contains arguments for a call to GaugePercent(). @@ -89,7 +90,7 @@ func TestGauge(t *testing.T) { desc: "draws resize needed character when canvas is smaller than requested", opts: []Option{ Char('o'), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 35}, canvas: image.Rect(0, 0, 1, 1), @@ -126,7 +127,7 @@ func TestGauge(t *testing.T) { Char('o'), HorizontalTextAlign(align.HorizontalLeft), VerticalTextAlign(align.VerticalTop), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 0}, canvas: image.Rect(0, 0, 10, 4), @@ -164,7 +165,7 @@ func TestGauge(t *testing.T) { Char('o'), HorizontalTextAlign(align.HorizontalRight), VerticalTextAlign(align.VerticalBottom), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 0}, canvas: image.Rect(0, 0, 10, 4), @@ -182,7 +183,7 @@ func TestGauge(t *testing.T) { desc: "gauge showing percentage with border", opts: []Option{ Char('o'), - Border(draw.LineStyleLight), + Border(linestyle.Light), BorderTitle("title"), }, percent: &percentCall{p: 35}, @@ -207,7 +208,7 @@ func TestGauge(t *testing.T) { desc: "respects border options", opts: []Option{ Char('o'), - Border(draw.LineStyleLight, cell.FgColor(cell.ColorBlue)), + Border(linestyle.Light, cell.FgColor(cell.ColorBlue)), BorderTitle("title"), BorderTitleAlign(align.HorizontalRight), }, @@ -273,7 +274,7 @@ func TestGauge(t *testing.T) { desc: "gauge showing 100 percent with border", opts: []Option{ Char('o'), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 100}, canvas: image.Rect(0, 0, 10, 3), @@ -622,7 +623,7 @@ func TestGauge(t *testing.T) { opts: []Option{ Char('o'), TextLabel("long label"), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 0}, canvas: image.Rect(0, 0, 10, 3), @@ -666,7 +667,7 @@ func TestGauge(t *testing.T) { opts: []Option{ Char('o'), TextLabel("long label"), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 100}, canvas: image.Rect(0, 0, 10, 3), @@ -717,7 +718,7 @@ func TestGauge(t *testing.T) { opts: []Option{ Char('o'), TextLabel("long label"), - Border(draw.LineStyleLight), + Border(linestyle.Light), }, percent: &percentCall{p: 50}, canvas: image.Rect(0, 0, 10, 4), @@ -832,7 +833,7 @@ func TestOptions(t *testing.T) { { desc: "border is accounted for in maximum and minimum size", opts: []Option{ - Border(draw.LineStyleLight), + Border(linestyle.Light), Height(2), }, want: widgetapi.Options{ diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index b0260d3..c65651f 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/gauge" @@ -88,7 +88,7 @@ func main() { ctx, cancel := context.WithCancel(context.Background()) slim, err := gauge.New( gauge.Height(1), - gauge.Border(draw.LineStyleLight), + gauge.Border(linestyle.Light), gauge.BorderTitle("Percentage progress"), ) if err != nil { @@ -99,7 +99,7 @@ func main() { absolute, err := gauge.New( gauge.Height(1), gauge.Color(cell.ColorBlue), - gauge.Border(draw.LineStyleLight), + gauge.Border(linestyle.Light), gauge.BorderTitle("Absolute progress"), ) if err != nil { @@ -109,7 +109,7 @@ func main() { noProgress, err := gauge.New( gauge.Height(1), - gauge.Border(draw.LineStyleLight, cell.FgColor(cell.ColorMagenta)), + gauge.Border(linestyle.Light, cell.FgColor(cell.ColorMagenta)), gauge.BorderTitle("Without progress text"), gauge.HideTextProgress(), ) @@ -134,7 +134,7 @@ func main() { t, container.SplitVertical( container.Left( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitHorizontal( container.Top( diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index e743f07..0a0a69d 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -22,6 +22,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" ) // Option is used to provide options. @@ -42,7 +43,7 @@ type options struct { filledTextColor cell.Color emptyTextColor cell.Color // If set, draws a border around the gauge. - border draw.LineStyle + border linestyle.LineStyle borderCellOpts []cell.Option borderTitle string borderTitleHAlign align.Horizontal @@ -179,7 +180,7 @@ func VerticalTextAlign(v align.Vertical) Option { } // Border configures the gauge to have a border of the specified style. -func Border(ls draw.LineStyle, cOpts ...cell.Option) Option { +func Border(ls linestyle.LineStyle, cOpts ...cell.Option) Option { return option(func(opts *options) { opts.border = ls opts.borderCellOpts = cOpts diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index e95d936..9402623 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart" @@ -93,7 +93,7 @@ func main() { go playLineChart(ctx, lc, redrawInterval/3) c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.PlaceWidget(lc), ) diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index 0ef3168..d8162e1 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" @@ -134,7 +134,7 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitHorizontal( container.Top( diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index bc0332c..dfe249a 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" @@ -86,14 +86,14 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitVertical( container.Left( container.SplitHorizontal( container.Top(), container.Bottom( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("SparkLine group"), container.SplitHorizontal( container.Top( @@ -107,7 +107,7 @@ func main() { ), ), container.Right( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.PlaceWidget(yellow), ), ), diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index 6d3880d..50634a8 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash" "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/text" @@ -123,7 +123,7 @@ func main() { c, err := container.New( t, - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("PRESS Q TO QUIT"), container.SplitVertical( container.Left( @@ -136,28 +136,28 @@ func main() { container.PlaceWidget(borderless), ), container.Right( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("你好，世界!"), container.PlaceWidget(unicode), ), ), ), container.Bottom( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("Trims lines"), container.PlaceWidget(trimmed), ), ), ), container.Bottom( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("Wraps lines at rune boundaries"), container.PlaceWidget(wrapped), ), ), ), container.Right( - container.Border(draw.LineStyleLight), + container.Border(linestyle.Light), container.BorderTitle("Rolls and scrolls content"), container.PlaceWidget(rolled), ), From 98394c921a6f507a68028ac2d071ae6d4536c5c1 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:54:37 -0500 Subject: [PATCH 09/14] Moving draw back to internal. Adding test for linestyle. --- container/container_test.go | 4 +- container/draw.go | 2 +- container/draw_test.go | 4 +- {draw => internal/draw}/border.go | 0 {draw => internal/draw}/border_test.go | 0 {draw => internal/draw}/braille_circle.go | 0 .../draw}/braille_circle_test.go | 0 {draw => internal/draw}/braille_fill.go | 0 {draw => internal/draw}/braille_fill_test.go | 0 {draw => internal/draw}/braille_line.go | 0 {draw => internal/draw}/braille_line_test.go | 0 {draw => internal/draw}/draw.go | 0 {draw => internal/draw}/hv_line.go | 0 {draw => internal/draw}/hv_line_graph.go | 0 {draw => internal/draw}/hv_line_graph_test.go | 0 {draw => internal/draw}/hv_line_test.go | 0 {draw => internal/draw}/line_style.go | 0 {draw => internal/draw}/rectangle.go | 0 {draw => internal/draw}/rectangle_test.go | 0 internal/{ => draw}/testdraw/testdraw.go | 2 +- {draw => internal/draw}/text.go | 0 {draw => internal/draw}/text_test.go | 0 {draw => internal/draw}/vertical_text.go | 0 {draw => internal/draw}/vertical_text_test.go | 0 internal/segdisp/segment/segment.go | 2 +- internal/segdisp/segment/segment_test.go | 4 +- linestyle/linestyle_test.go | 46 +++++++++++++++++++ widgets/barchart/barchart.go | 2 +- widgets/barchart/barchart_test.go | 4 +- widgets/barchart/options.go | 2 +- widgets/button/button.go | 2 +- widgets/button/button_test.go | 4 +- widgets/donut/donut.go | 2 +- widgets/donut/donut_test.go | 4 +- widgets/fakewidget/fakewidget.go | 2 +- widgets/fakewidget/fakewidget_test.go | 2 +- widgets/gauge/gauge.go | 2 +- widgets/gauge/gauge_test.go | 4 +- widgets/gauge/options.go | 2 +- widgets/linechart/linechart.go | 2 +- widgets/linechart/linechart_test.go | 4 +- widgets/sparkline/sparkline.go | 2 +- widgets/sparkline/sparkline_test.go | 4 +- widgets/text/line_trim_test.go | 2 +- widgets/text/text_test.go | 4 +- 45 files changed, 80 insertions(+), 34 deletions(-) rename {draw => internal/draw}/border.go (100%) rename {draw => internal/draw}/border_test.go (100%) rename {draw => internal/draw}/braille_circle.go (100%) rename {draw => internal/draw}/braille_circle_test.go (100%) rename {draw => internal/draw}/braille_fill.go (100%) rename {draw => internal/draw}/braille_fill_test.go (100%) rename {draw => internal/draw}/braille_line.go (100%) rename {draw => internal/draw}/braille_line_test.go (100%) rename {draw => internal/draw}/draw.go (100%) rename {draw => internal/draw}/hv_line.go (100%) rename {draw => internal/draw}/hv_line_graph.go (100%) rename {draw => internal/draw}/hv_line_graph_test.go (100%) rename {draw => internal/draw}/hv_line_test.go (100%) rename {draw => internal/draw}/line_style.go (100%) rename {draw => internal/draw}/rectangle.go (100%) rename {draw => internal/draw}/rectangle_test.go (100%) rename internal/{ => draw}/testdraw/testdraw.go (98%) rename {draw => internal/draw}/text.go (100%) rename {draw => internal/draw}/text_test.go (100%) rename {draw => internal/draw}/vertical_text.go (100%) rename {draw => internal/draw}/vertical_text_test.go (100%) create mode 100644 linestyle/linestyle_test.go diff --git a/container/container_test.go b/container/container_test.go index da24801..fe8c5eb 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -23,14 +23,14 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" diff --git a/container/draw.go b/container/draw.go index 14bc08c..c23a35c 100644 --- a/container/draw.go +++ b/container/draw.go @@ -22,9 +22,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" ) // drawTree draws this container and all of its sub containers. diff --git a/container/draw_test.go b/container/draw_test.go index afc5d1d..38bed22 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -20,10 +20,10 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/widgets/fakewidget" diff --git a/draw/border.go b/internal/draw/border.go similarity index 100% rename from draw/border.go rename to internal/draw/border.go diff --git a/draw/border_test.go b/internal/draw/border_test.go similarity index 100% rename from draw/border_test.go rename to internal/draw/border_test.go diff --git a/draw/braille_circle.go b/internal/draw/braille_circle.go similarity index 100% rename from draw/braille_circle.go rename to internal/draw/braille_circle.go diff --git a/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go similarity index 100% rename from draw/braille_circle_test.go rename to internal/draw/braille_circle_test.go diff --git a/draw/braille_fill.go b/internal/draw/braille_fill.go similarity index 100% rename from draw/braille_fill.go rename to internal/draw/braille_fill.go diff --git a/draw/braille_fill_test.go b/internal/draw/braille_fill_test.go similarity index 100% rename from draw/braille_fill_test.go rename to internal/draw/braille_fill_test.go diff --git a/draw/braille_line.go b/internal/draw/braille_line.go similarity index 100% rename from draw/braille_line.go rename to internal/draw/braille_line.go diff --git a/draw/braille_line_test.go b/internal/draw/braille_line_test.go similarity index 100% rename from draw/braille_line_test.go rename to internal/draw/braille_line_test.go diff --git a/draw/draw.go b/internal/draw/draw.go similarity index 100% rename from draw/draw.go rename to internal/draw/draw.go diff --git a/draw/hv_line.go b/internal/draw/hv_line.go similarity index 100% rename from draw/hv_line.go rename to internal/draw/hv_line.go diff --git a/draw/hv_line_graph.go b/internal/draw/hv_line_graph.go similarity index 100% rename from draw/hv_line_graph.go rename to internal/draw/hv_line_graph.go diff --git a/draw/hv_line_graph_test.go b/internal/draw/hv_line_graph_test.go similarity index 100% rename from draw/hv_line_graph_test.go rename to internal/draw/hv_line_graph_test.go diff --git a/draw/hv_line_test.go b/internal/draw/hv_line_test.go similarity index 100% rename from draw/hv_line_test.go rename to internal/draw/hv_line_test.go diff --git a/draw/line_style.go b/internal/draw/line_style.go similarity index 100% rename from draw/line_style.go rename to internal/draw/line_style.go diff --git a/draw/rectangle.go b/internal/draw/rectangle.go similarity index 100% rename from draw/rectangle.go rename to internal/draw/rectangle.go diff --git a/draw/rectangle_test.go b/internal/draw/rectangle_test.go similarity index 100% rename from draw/rectangle_test.go rename to internal/draw/rectangle_test.go diff --git a/internal/testdraw/testdraw.go b/internal/draw/testdraw/testdraw.go similarity index 98% rename from internal/testdraw/testdraw.go rename to internal/draw/testdraw/testdraw.go index 6887266..e29f499 100644 --- a/internal/testdraw/testdraw.go +++ b/internal/draw/testdraw/testdraw.go @@ -19,9 +19,9 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" ) // MustBorder draws border on the canvas or panics. diff --git a/draw/text.go b/internal/draw/text.go similarity index 100% rename from draw/text.go rename to internal/draw/text.go diff --git a/draw/text_test.go b/internal/draw/text_test.go similarity index 100% rename from draw/text_test.go rename to internal/draw/text_test.go diff --git a/draw/vertical_text.go b/internal/draw/vertical_text.go similarity index 100% rename from draw/vertical_text.go rename to internal/draw/vertical_text.go diff --git a/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go similarity index 100% rename from draw/vertical_text_test.go rename to internal/draw/vertical_text_test.go diff --git a/internal/segdisp/segment/segment.go b/internal/segdisp/segment/segment.go index 99f242a..2d4553b 100644 --- a/internal/segdisp/segment/segment.go +++ b/internal/segdisp/segment/segment.go @@ -20,8 +20,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" ) // Type identifies the type of the segment that is drawn. diff --git a/internal/segdisp/segment/segment_test.go b/internal/segdisp/segment/segment_test.go index b5c9f51..012cffd 100644 --- a/internal/segdisp/segment/segment_test.go +++ b/internal/segdisp/segment/segment_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" ) func TestHV(t *testing.T) { diff --git a/linestyle/linestyle_test.go b/linestyle/linestyle_test.go new file mode 100644 index 0000000..1e5e585 --- /dev/null +++ b/linestyle/linestyle_test.go @@ -0,0 +1,46 @@ +package linestyle + +import "testing" + +func TestLineStyleName(t *testing.T) { + tests := []struct { + desc string + ls LineStyle + want string + }{ + { + desc: "unknown", + ls: LineStyle(-1), + want: "LineStyleUnknown", + }, + { + desc: "none", + ls: None, + want: "LineStyleNone", + }, + { + desc: "light", + ls: Light, + want: "LineStyleLight", + }, + { + desc: "double", + ls: Double, + want: "LineStyleDouble", + }, + { + desc: "round", + ls: Round, + want: "LineStyleRound", + }, + } + + for _, tc := range tests { + t.Run(tc.desc, func(t *testing.T) { + if got := tc.ls.String(); got != tc.want { + t.Errorf("String => %q, want %q", got, tc.want) + } + + }) + } +} diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index 9d35acb..e65e5d1 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index e3c6a27..ce9d146 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/barchart/options.go b/widgets/barchart/options.go index 5b941c9..1bdb770 100644 --- a/widgets/barchart/options.go +++ b/widgets/barchart/options.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/internal/draw" ) // Option is used to provide options. diff --git a/widgets/button/button.go b/widgets/button/button.go index 7c25d8e..8fc793e 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 1254f17..db9ea00 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -23,13 +23,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index 2f97a8b..b88c7eb 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -23,9 +23,9 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 830bcb0..003b241 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -20,12 +20,12 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index 24ca384..5f195d8 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -21,9 +21,9 @@ import ( "image" "sync" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index c73151c..b36ff8b 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 4665665..d22641d 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 26903e1..18b795c 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -21,11 +21,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" ) diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index 0a0a69d..62f1e43 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/linestyle" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 226cd6f..6e934a5 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -23,10 +23,10 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 9092f75..dce7ce2 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -21,13 +21,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index c81e14b..ce83e4c 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -22,9 +22,9 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index 76f9095..2af5c4c 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 1e3e7cb..bfb2099 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -21,8 +21,8 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index a20741b..f3b9ebf 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -20,13 +20,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) From ba4256139da4ea1e4765a58fb6b02ece75d440a0 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:56:48 -0500 Subject: [PATCH 10/14] Updating CHANGELOG. --- CHANGELOG.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 725978b..cdcd807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,13 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Some of the packages moved into internal are required externally. This - release makes them available again. +- Some of the packages that were moved into internal are required externally. + This release makes them available again. #### Breaking API changes - The draw.LineStyle enum was refactored into its own package - linestyle.LineStyle. + linestyle.LineStyle. Users will have to replace: + draw.LineStyleNone -> linestyle.None + draw.LineStyleLight -> linestyle.Light + draw.LineStyleDouble -> linestyle.Double + draw.LineStyleRound -> linestyle.Round ## [0.7.0] - 24-Feb-2019 @@ -180,7 +184,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The Gauge widget. - The Text widget. -[Unreleased]: https://github.com/mum4k/termdash/compare/v0.7.0...devel +[Unreleased]: https://github.com/mum4k/termdash/compare/v0.7.1...devel +[0.7.1]: https://github.com/mum4k/termdash/compare/v0.7.0...v0.7.1 [0.7.0]: https://github.com/mum4k/termdash/compare/v0.6.1...v0.7.0 [0.6.1]: https://github.com/mum4k/termdash/compare/v0.6.0...v0.6.1 [0.6.0]: https://github.com/mum4k/termdash/compare/v0.5.0...v0.6.0 From bd6e3db7c10b4e5ca8ccd28f65c6b0395162f70b Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 01:58:12 -0500 Subject: [PATCH 11/14] Formatting CHANGELOG. --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdcd807..6e79c62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,10 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The draw.LineStyle enum was refactored into its own package linestyle.LineStyle. Users will have to replace: - draw.LineStyleNone -> linestyle.None - draw.LineStyleLight -> linestyle.Light - draw.LineStyleDouble -> linestyle.Double - draw.LineStyleRound -> linestyle.Round + + - draw.LineStyleNone -> linestyle.None + - draw.LineStyleLight -> linestyle.Light + - draw.LineStyleDouble -> linestyle.Double + - draw.LineStyleRound -> linestyle.Round ## [0.7.0] - 24-Feb-2019 From 99f9ddb047bf6f062c2911898f6eec73a25a6efc Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 02:01:31 -0500 Subject: [PATCH 12/14] Adding licences. --- linestyle/linestyle.go | 14 ++++++++++++++ linestyle/linestyle_test.go | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/linestyle/linestyle.go b/linestyle/linestyle.go index 9218814..0bcd4a4 100644 --- a/linestyle/linestyle.go +++ b/linestyle/linestyle.go @@ -1,3 +1,17 @@ +// Copyright 2019 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Package linestyle defines various line styles. package linestyle diff --git a/linestyle/linestyle_test.go b/linestyle/linestyle_test.go index 1e5e585..91b6cc4 100644 --- a/linestyle/linestyle_test.go +++ b/linestyle/linestyle_test.go @@ -1,3 +1,17 @@ +// Copyright 2019 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package linestyle import "testing" From b25d20c8aef585c52b337b4d35aae41869f08a4b Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 02:08:48 -0500 Subject: [PATCH 13/14] Mouse and keyboard are also public. --- container/container_test.go | 4 ++-- container/focus.go | 4 ++-- container/focus_test.go | 2 +- internal/event/event_test.go | 2 +- {internal/keyboard => keyboard}/keyboard.go | 0 {internal/mouse => mouse}/button/button.go | 2 +- {internal/mouse => mouse}/button/button_test.go | 2 +- {internal/mouse => mouse}/mouse.go | 0 termdash_test.go | 4 ++-- terminal/termbox/event.go | 4 ++-- terminal/termbox/event_test.go | 4 ++-- terminal/terminalapi/event.go | 4 ++-- widgets/button/button.go | 4 ++-- widgets/button/button_test.go | 4 ++-- widgets/button/options.go | 2 +- widgets/fakewidget/fakewidget.go | 4 ++-- widgets/fakewidget/fakewidget_test.go | 4 ++-- widgets/linechart/internal/zoom/zoom.go | 4 ++-- widgets/linechart/internal/zoom/zoom_test.go | 2 +- widgets/linechart/linechart_test.go | 2 +- widgets/text/options.go | 4 ++-- widgets/text/text_test.go | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) rename {internal/keyboard => keyboard}/keyboard.go (100%) rename {internal/mouse => mouse}/button/button.go (98%) rename {internal/mouse => mouse}/button/button_test.go (99%) rename {internal/mouse => mouse}/mouse.go (100%) diff --git a/container/container_test.go b/container/container_test.go index fe8c5eb..0bf8ea4 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -29,10 +29,10 @@ import ( "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/fakewidget" diff --git a/container/focus.go b/container/focus.go index 03e72c6..3dccfbe 100644 --- a/container/focus.go +++ b/container/focus.go @@ -19,8 +19,8 @@ package container import ( "image" - "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/mouse/button" + "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/container/focus_test.go b/container/focus_test.go index a0bb77e..fe62212 100644 --- a/container/focus_test.go +++ b/container/focus_test.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/linestyle" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/internal/event/event_test.go b/internal/event/event_test.go index 953b6b8..ae8e84d 100644 --- a/internal/event/event_test.go +++ b/internal/event/event_test.go @@ -24,7 +24,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/event/testevent" - "github.com/mum4k/termdash/internal/keyboard" + "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/internal/keyboard/keyboard.go b/keyboard/keyboard.go similarity index 100% rename from internal/keyboard/keyboard.go rename to keyboard/keyboard.go diff --git a/internal/mouse/button/button.go b/mouse/button/button.go similarity index 98% rename from internal/mouse/button/button.go rename to mouse/button/button.go index ba81940..d4e0601 100644 --- a/internal/mouse/button/button.go +++ b/mouse/button/button.go @@ -18,7 +18,7 @@ package button import ( "image" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/internal/mouse/button/button_test.go b/mouse/button/button_test.go similarity index 99% rename from internal/mouse/button/button_test.go rename to mouse/button/button_test.go index ae59a5e..0e4a59c 100644 --- a/internal/mouse/button/button_test.go +++ b/mouse/button/button_test.go @@ -19,7 +19,7 @@ import ( "image" "testing" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/internal/mouse/mouse.go b/mouse/mouse.go similarity index 100% rename from internal/mouse/mouse.go rename to mouse/mouse.go diff --git a/termdash_test.go b/termdash_test.go index e560d53..6d72ad7 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -29,9 +29,9 @@ import ( "github.com/mum4k/termdash/internal/event/eventqueue" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/termbox" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" diff --git a/terminal/termbox/event.go b/terminal/termbox/event.go index 8a32101..d4deae7 100644 --- a/terminal/termbox/event.go +++ b/terminal/termbox/event.go @@ -19,8 +19,8 @@ package termbox import ( "image" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event_test.go b/terminal/termbox/event_test.go index 904c3e3..7746520 100644 --- a/terminal/termbox/event_test.go +++ b/terminal/termbox/event_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" tbx "github.com/nsf/termbox-go" diff --git a/terminal/terminalapi/event.go b/terminal/terminalapi/event.go index f5fc8f8..a543e84 100644 --- a/terminal/terminalapi/event.go +++ b/terminal/terminalapi/event.go @@ -19,8 +19,8 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" ) // event.go defines events that can be received through the terminal API. diff --git a/widgets/button/button.go b/widgets/button/button.go index 8fc793e..1d21375 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -26,9 +26,9 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index db9ea00..f67263b 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -28,9 +28,9 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/button/options.go b/widgets/button/options.go index 522b2d3..080cf34 100644 --- a/widgets/button/options.go +++ b/widgets/button/options.go @@ -21,9 +21,9 @@ import ( "time" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" ) // Option is used to provide options. diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index 5f195d8..0d8df92 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index b36ff8b..c39c599 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -23,9 +23,9 @@ import ( "github.com/mum4k/termdash/internal/canvas/testcanvas" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/linechart/internal/zoom/zoom.go b/widgets/linechart/internal/zoom/zoom.go index 5c6bb5c..c60eb3c 100644 --- a/widgets/linechart/internal/zoom/zoom.go +++ b/widgets/linechart/internal/zoom/zoom.go @@ -20,9 +20,9 @@ import ( "image" "reflect" - "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/numbers" + "github.com/mum4k/termdash/mouse" + "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/internal/zoom/zoom_test.go b/widgets/linechart/internal/zoom/zoom_test.go index f435bc6..80bfc46 100644 --- a/widgets/linechart/internal/zoom/zoom_test.go +++ b/widgets/linechart/internal/zoom/zoom_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" ) diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index dce7ce2..b588fc2 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -27,8 +27,8 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/text/options.go b/widgets/text/options.go index 342b5c1..d68bf2c 100644 --- a/widgets/text/options.go +++ b/widgets/text/options.go @@ -17,8 +17,8 @@ package text import ( "fmt" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" ) // options.go contains configurable options for Text. diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index f3b9ebf..b5485b6 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -25,9 +25,9 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" + "github.com/mum4k/termdash/keyboard" + "github.com/mum4k/termdash/mouse" "github.com/mum4k/termdash/terminal/terminalapi" ) From 85902cf11a6ef77ae57a32389cc860b6d5eea51d Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 24 Feb 2019 02:09:27 -0500 Subject: [PATCH 14/14] Button is internal. --- container/focus.go | 2 +- {mouse => internal}/button/button.go | 0 {mouse => internal}/button/button_test.go | 0 widgets/button/button.go | 2 +- widgets/linechart/internal/zoom/zoom.go | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename {mouse => internal}/button/button.go (100%) rename {mouse => internal}/button/button_test.go (100%) diff --git a/container/focus.go b/container/focus.go index 3dccfbe..3b5713b 100644 --- a/container/focus.go +++ b/container/focus.go @@ -19,8 +19,8 @@ package container import ( "image" + "github.com/mum4k/termdash/internal/button" "github.com/mum4k/termdash/mouse" - "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/mouse/button/button.go b/internal/button/button.go similarity index 100% rename from mouse/button/button.go rename to internal/button/button.go diff --git a/mouse/button/button_test.go b/internal/button/button_test.go similarity index 100% rename from mouse/button/button_test.go rename to internal/button/button_test.go diff --git a/widgets/button/button.go b/widgets/button/button.go index 1d21375..8944709 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -24,11 +24,11 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" + "github.com/mum4k/termdash/internal/button" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/mouse" - "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/linechart/internal/zoom/zoom.go b/widgets/linechart/internal/zoom/zoom.go index c60eb3c..bcde567 100644 --- a/widgets/linechart/internal/zoom/zoom.go +++ b/widgets/linechart/internal/zoom/zoom.go @@ -20,9 +20,9 @@ import ( "image" "reflect" + "github.com/mum4k/termdash/internal/button" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/mouse" - "github.com/mum4k/termdash/mouse/button" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/internal/axes" )