diff --git a/container/container.go b/container/container.go index 705fd61..e6ce8b2 100644 --- a/container/container.go +++ b/container/container.go @@ -30,8 +30,8 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/event" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 efc3c93..77ea229 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -30,9 +30,9 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/draw_test.go b/container/draw_test.go index c8d4a91..2b18d62 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/terminal/faketerm" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/fakewidget" ) diff --git a/container/focus.go b/container/focus.go index 18fc189..38b4f06 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/internal/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 a4d6339..306fadd 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" ) // pointCase is a test case for the pointCont function. diff --git a/container/options.go b/container/options.go index 555930b..3e6aa27 100644 --- a/container/options.go +++ b/container/options.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/align" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // applyOptions applies the options to the container. diff --git a/container/traversal_test.go b/container/traversal_test.go index fb0f2d1..6b26d60 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/terminal/faketerm" ) func TestRoot(t *testing.T) { diff --git a/internal/README.md b/internal/README.md new file mode 100644 index 0000000..a989273 --- /dev/null +++ b/internal/README.md @@ -0,0 +1,4 @@ +# Internal termdash libraries + +The packages under this directory are private to termdash. Stability of the +private packages isn't guaranteed and changes won't be backward compatible. diff --git a/internal/canvas/braille/braille.go b/internal/canvas/braille/braille.go index 7523814..7799509 100644 --- a/internal/canvas/braille/braille.go +++ b/internal/canvas/braille/braille.go @@ -47,7 +47,7 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/cell" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminalapi" ) const ( diff --git a/internal/canvas/braille/braille_test.go b/internal/canvas/braille/braille_test.go index 6807b68..786e483 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/terminal/faketerm" ) func Example_copiedToCanvas() { diff --git a/internal/canvas/braille/testbraille/testbraille.go b/internal/canvas/braille/testbraille/testbraille.go index c8dfd0d..355fd6c 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/terminal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/canvas/canvas.go b/internal/canvas/canvas.go index 18ef5d0..b2bbc1f 100644 --- a/internal/canvas/canvas.go +++ b/internal/canvas/canvas.go @@ -22,7 +22,7 @@ import ( "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/cell/runewidth" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/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 1ca8117..ac0781b 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/terminal/faketerm" ) func TestNew(t *testing.T) { diff --git a/internal/canvas/testcanvas/testcanvas.go b/internal/canvas/testcanvas/testcanvas.go index 399cf2c..a80e6ae 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/terminal/faketerm" ) // MustNew returns a new canvas or panics. diff --git a/internal/draw/border_test.go b/internal/draw/border_test.go index f8ef267..478a1d8 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/terminal/faketerm" ) func TestBorder(t *testing.T) { diff --git a/internal/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go index bc184fa..0be67e9 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/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 ef069bb..367a045 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/terminal/faketerm" ) func TestBrailleFill(t *testing.T) { diff --git a/internal/draw/braille_line_test.go b/internal/draw/braille_line_test.go index 5becae6..4d1e7a6 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/terminal/faketerm" ) func TestBrailleLine(t *testing.T) { diff --git a/internal/draw/hv_line_test.go b/internal/draw/hv_line_test.go index 87df93d..6816af6 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/terminal/faketerm" ) func TestHVLines(t *testing.T) { diff --git a/internal/draw/rectangle_test.go b/internal/draw/rectangle_test.go index 13b7e0c..ede962f 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/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 fdff00c..9238877 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/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 47cafb2..0175f2e 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/terminal/faketerm" ) func TestDraw(t *testing.T) { diff --git a/internal/draw/text_test.go b/internal/draw/text_test.go index 99255e3..dc05ff0 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/terminal/faketerm" ) func TestTrimText(t *testing.T) { diff --git a/internal/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go index 0d41046..3d97c33 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/terminal/faketerm" ) func TestVerticalText(t *testing.T) { diff --git a/internal/event/event.go b/internal/event/event.go index 62406bb..b9e04d8 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/internal/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..9b12be5 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/internal/terminalapi" ) // receiverMode defines how the receiver behaves. diff --git a/internal/event/eventqueue/eventqueue.go b/internal/event/eventqueue/eventqueue.go index 815db8d..589b987 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/internal/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..5868dd3 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/internal/terminalapi" ) func TestQueue(t *testing.T) { diff --git a/internal/mouse/button/button.go b/internal/mouse/button/button.go index 7de620b..b25e252 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/internal/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..ceec635 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/internal/terminalapi" ) // eventTestCase is one mouse event and the output expectation. diff --git a/terminal/faketerm/diff.go b/internal/terminal/faketerm/diff.go similarity index 100% rename from terminal/faketerm/diff.go rename to internal/terminal/faketerm/diff.go diff --git a/terminal/faketerm/faketerm.go b/internal/terminal/faketerm/faketerm.go similarity index 98% rename from terminal/faketerm/faketerm.go rename to internal/terminal/faketerm/faketerm.go index 60fcbcd..12b3e51 100644 --- a/terminal/faketerm/faketerm.go +++ b/internal/terminal/faketerm/faketerm.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminalapi" ) // Option is used to provide options. diff --git a/terminal/termbox/cell_options.go b/internal/terminal/termbox/cell_options.go similarity index 100% rename from terminal/termbox/cell_options.go rename to internal/terminal/termbox/cell_options.go diff --git a/terminal/termbox/cell_options_test.go b/internal/terminal/termbox/cell_options_test.go similarity index 100% rename from terminal/termbox/cell_options_test.go rename to internal/terminal/termbox/cell_options_test.go diff --git a/terminal/termbox/color_mode.go b/internal/terminal/termbox/color_mode.go similarity index 95% rename from terminal/termbox/color_mode.go rename to internal/terminal/termbox/color_mode.go index 0e42ee7..8d830ca 100644 --- a/terminal/termbox/color_mode.go +++ b/internal/terminal/termbox/color_mode.go @@ -17,7 +17,7 @@ package termbox import ( "fmt" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event.go b/internal/terminal/termbox/event.go similarity index 99% rename from terminal/termbox/event.go rename to internal/terminal/termbox/event.go index 4e57738..f33ccb8 100644 --- a/terminal/termbox/event.go +++ b/internal/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/internal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/event_test.go b/internal/terminal/termbox/event_test.go similarity index 99% rename from terminal/termbox/event_test.go rename to internal/terminal/termbox/event_test.go index 99ccb95..22535df 100644 --- a/terminal/termbox/event_test.go +++ b/internal/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/internal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox.go b/internal/terminal/termbox/termbox.go similarity index 98% rename from terminal/termbox/termbox.go rename to internal/terminal/termbox/termbox.go index 4735ff2..7c5889a 100644 --- a/terminal/termbox/termbox.go +++ b/internal/terminal/termbox/termbox.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/event/eventqueue" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminalapi" tbx "github.com/nsf/termbox-go" ) diff --git a/terminal/termbox/termbox_test.go b/internal/terminal/termbox/termbox_test.go similarity index 96% rename from terminal/termbox/termbox_test.go rename to internal/terminal/termbox/termbox_test.go index 355ddad..641b84e 100644 --- a/terminal/termbox/termbox_test.go +++ b/internal/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/internal/terminalapi" ) func TestNewTerminal(t *testing.T) { diff --git a/terminalapi/color_mode.go b/internal/terminalapi/color_mode.go similarity index 100% rename from terminalapi/color_mode.go rename to internal/terminalapi/color_mode.go diff --git a/terminalapi/event.go b/internal/terminalapi/event.go similarity index 100% rename from terminalapi/event.go rename to internal/terminalapi/event.go diff --git a/terminalapi/terminalapi.go b/internal/terminalapi/terminalapi.go similarity index 100% rename from terminalapi/terminalapi.go rename to internal/terminalapi/terminalapi.go diff --git a/widgetapi/widgetapi.go b/internal/widgetapi/widgetapi.go similarity index 99% rename from widgetapi/widgetapi.go rename to internal/widgetapi/widgetapi.go index 29077e5..8f72bfb 100644 --- a/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/internal/terminalapi" ) // KeyScope indicates the scope at which the widget wants to receive keyboard diff --git a/termdash.go b/termdash.go index 24a2af1..fd71e00 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/internal/terminalapi" ) // DefaultRedrawInterval is the default for the RedrawInterval option. diff --git a/termdash_test.go b/termdash_test.go index 03bc533..9e2423b 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -30,10 +30,10 @@ import ( "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/terminal/faketerm" - "github.com/mum4k/termdash/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "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/widgets/fakewidget" ) diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index f86abbc..7ba9252 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/donut" diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index a3ffdca..bc425eb 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -27,8 +27,8 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // BarChart displays multiple bars showing relative ratios of values. diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index a6507e5..fe83e67 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/terminal/faketerm" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/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 5211376..5086191 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" ) diff --git a/widgets/button/button.go b/widgets/button/button.go index fa930b4..2ae5603 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -28,8 +28,8 @@ import ( "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 790c771..72f1af6 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // callbackTracker tracks whether callback was called. diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 46e77af..1029019 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/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 223341d..1bc2ed4 100644 --- a/widgets/button/options.go +++ b/widgets/button/options.go @@ -23,7 +23,7 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/cell/runewidth" "github.com/mum4k/termdash/internal/keyboard" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // Option is used to provide options. diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index d7a46e1..ed6ea28 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -28,8 +28,8 @@ import ( "github.com/mum4k/termdash/internal/cell/runewidth" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 c0cda3e..1f30720 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) func TestDonut(t *testing.T) { diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index 722965e..3b79818 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/donut" ) diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index b890380..c936f71 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/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 c9e2a48..6985f1e 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // keyEvents are keyboard events to send to the widget. diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index e1b3051..16f9874 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -28,8 +28,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/cell/runewidth" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 551f858..2264565 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/terminal/faketerm" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/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 5b56ed0..936fe78 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/gauge" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 8fc2f3b..ce976dd 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -28,8 +28,8 @@ import ( "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/widgets/linechart/axes" "github.com/mum4k/termdash/widgets/linechart/zoom" ) diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 8e63188..2e94086 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) func TestLineChartDraws(t *testing.T) { diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index a7f62e1..b7951a3 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/linechart" ) diff --git a/widgets/linechart/zoom/zoom.go b/widgets/linechart/zoom/zoom.go index e6c378c..58a1d25 100644 --- a/widgets/linechart/zoom/zoom.go +++ b/widgets/linechart/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/internal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/axes" ) diff --git a/widgets/linechart/zoom/zoom_test.go b/widgets/linechart/zoom/zoom_test.go index 5f10fda..b76045b 100644 --- a/widgets/linechart/zoom/zoom_test.go +++ b/widgets/linechart/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/internal/terminalapi" "github.com/mum4k/termdash/widgets/linechart/axes" ) diff --git a/widgets/segmentdisplay/segmentdisplay.go b/widgets/segmentdisplay/segmentdisplay.go index 5a4ee1e..7706659 100644 --- a/widgets/segmentdisplay/segmentdisplay.go +++ b/widgets/segmentdisplay/segmentdisplay.go @@ -27,8 +27,8 @@ import ( "github.com/mum4k/termdash/internal/attrrange" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/draw/segdisp/sixteen" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // SegmentDisplay displays ASCII content by simulating a segment display. diff --git a/widgets/segmentdisplay/segmentdisplay_test.go b/widgets/segmentdisplay/segmentdisplay_test.go index 7330275..0bade4a 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 7611143..a0229cc 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" ) diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index 258e51c..0c55fb7 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -25,8 +25,8 @@ import ( "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/cell" "github.com/mum4k/termdash/internal/draw" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // 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 bec8586..cece593 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/terminal/faketerm" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/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 4df9f20..d4ce883 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" ) diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 336fa7f..5719427 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/terminal/faketerm" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text.go b/widgets/text/text.go index dd6f251..a3802b5 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/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) // Text displays a block of text. diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index 075126d..93077ff 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/terminal/faketerm" - "github.com/mum4k/termdash/terminalapi" - "github.com/mum4k/termdash/widgetapi" + "github.com/mum4k/termdash/internal/terminal/faketerm" + "github.com/mum4k/termdash/internal/terminalapi" + "github.com/mum4k/termdash/internal/widgetapi" ) func TestTextDraws(t *testing.T) { diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index 8625ebf..faf1ff6 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/terminal/termbox" - "github.com/mum4k/termdash/terminalapi" + "github.com/mum4k/termdash/internal/terminal/termbox" + "github.com/mum4k/termdash/internal/terminalapi" "github.com/mum4k/termdash/widgets/text" )