Merge branch 'master' into doubleclick

gcla · Jul 9, 2022 · 34ec53c · 34ec53c
2 parents 9b04704 + 35e5bf4
commit 34ec53c
Show file tree

Hide file tree

Showing 116 changed files with 245 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.log
+/go.work
+/go.work.sum
diff --git a/app.go b/app.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 
@@ -101,6 +101,7 @@ type App struct {
 	enableBracketedPaste bool
 	screenInited         bool
 	dontOwnScreen        bool
+	tty                  string
 
 	lastMouse    MouseState    // So I can tell if a button was previously clicked
 	MouseState                 // Track which mouse buttons are currently down
@@ -119,6 +120,7 @@ type AppArgs struct {
 	EnableBracketedPaste bool
 	Log                  log.StdLogger
 	DontActivate         bool
+	Tty                  string
 }
 
 // IUnhandledInput is used as a handler for application user input that is not handled by any
@@ -244,7 +246,7 @@ func newApp(args AppArgs) (rapp *App, rerr error) {
 	screen := args.Screen
 	if screen == nil {
 		var err error
-		screen, err = tcellScreen()
+		screen, err = tcellScreen(args.Tty)
 		if err != nil {
 			rerr = WithKVs(err, map[string]interface{}{"TERM": os.Getenv("TERM")})
 			return
@@ -287,6 +289,7 @@ func newApp(args AppArgs) (rapp *App, rerr error) {
 		enableMouseMotion:    args.EnableMouseMotion,
 		enableBracketedPaste: args.EnableBracketedPaste,
 		dontOwnScreen:        args.Screen != nil,
+		tty:                  args.Tty,
 	}
 
 	if !res.dontOwnScreen && !args.DontActivate {
@@ -818,7 +821,7 @@ func (a *App) Quit() {
 //
 // Assumes we own the screen...
 func (a *App) ActivateScreen() error {
-	screen, err := tcellScreen()
+	screen, err := tcellScreen(a.tty)
 	if err != nil {
 		return WithKVs(err, map[string]interface{}{"TERM": os.Getenv("TERM")})
 	}

diff --git a/callbacks.go b/callbacks.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gowid

diff --git a/callbacks_test.go b/callbacks_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gowid

diff --git a/canvas.go b/canvas.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/canvas_test.go b/canvas_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/cell.go b/cell.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/decoration.go b/decoration.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gowid

diff --git a/decoration_test.go b/decoration_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gowid

diff --git a/examples/gowid-asciigraph/asciigraph.go b/examples/gowid-asciigraph/asciigraph.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // An example of the gowid asciigraph widget which relies upon the

diff --git a/examples/gowid-dir/dir.go b/examples/gowid-dir/dir.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A simple gowid directory browser.

diff --git a/examples/gowid-editor/editor.go b/examples/gowid-editor/editor.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A poor-man's editor using gowid widgets - shows dialog, edit and vscroll.

diff --git a/examples/gowid-fib/fib.go b/examples/gowid-fib/fib.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A port of urwid's fib.py example using gowid widgets.

diff --git a/examples/gowid-graph/graph.go b/examples/gowid-graph/graph.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A port of urwid's graph.py example using gowid widgets.

diff --git a/examples/gowid-helloworld/helloworld.go b/examples/gowid-helloworld/helloworld.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A port of urwid's "Hello World" example from the tutorial, using gowid widgets.

diff --git a/examples/gowid-menu/menu.go b/examples/gowid-menu/menu.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A demonstration of gowid's menu, list and overlay widgets.

diff --git a/examples/gowid-overlay1/overlay1.go b/examples/gowid-overlay1/overlay1.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A demonstration of gowid's overlay and fill widgets.

diff --git a/examples/gowid-overlay2/overlay2.go b/examples/gowid-overlay2/overlay2.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A demonstration of gowid's overlay, fill, asciigraph and radio widgets.

diff --git a/examples/gowid-overlay3/overlay3.go b/examples/gowid-overlay3/overlay3.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A demonstration of gowid's overlay and fill widgets.

diff --git a/examples/gowid-palette/palette.go b/examples/gowid-palette/palette.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A port of urwid's palette_test.py example using gowid widgets.

diff --git a/examples/gowid-table/table.go b/examples/gowid-table/table.go
@@ -1,6 +1,6 @@
 //go:generate statik -src=data
 
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/examples/gowid-terminal/terminal.go b/examples/gowid-terminal/terminal.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A very poor-man's tmux written using gowid's terminal widget.

diff --git a/examples/gowid-tree/tree.go b/examples/gowid-tree/tree.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/examples/gowid-tutorial1/tutorial1.go b/examples/gowid-tutorial1/tutorial1.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The first example from the gowid tutorial.

diff --git a/examples/gowid-tutorial2/tutorial2.go b/examples/gowid-tutorial2/tutorial2.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The second example from the gowid tutorial.

diff --git a/examples/gowid-tutorial3/tutorial3.go b/examples/gowid-tutorial3/tutorial3.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The third example from the gowid tutorial.

diff --git a/examples/gowid-tutorial4/tutorial4.go b/examples/gowid-tutorial4/tutorial4.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The fourth example from the gowid tutorial.

diff --git a/examples/gowid-tutorial5/tutorial5.go b/examples/gowid-tutorial5/tutorial5.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The fifth example from the gowid tutorial.

diff --git a/examples/gowid-tutorial6/tutorial6.go b/examples/gowid-tutorial6/tutorial6.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // The sixth example from the gowid tutorial.

diff --git a/examples/gowid-widgets1/widgets1.go b/examples/gowid-widgets1/widgets1.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the pile, button, edit and progress widgets.

diff --git a/examples/gowid-widgets2/widgets2.go b/examples/gowid-widgets2/widgets2.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the columns, checkbox, edit and styled widgets.

diff --git a/examples/gowid-widgets3/widgets3.go b/examples/gowid-widgets3/widgets3.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the button, grid, progress and radio widgets.

diff --git a/examples/gowid-widgets4/widgets4.go b/examples/gowid-widgets4/widgets4.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the columns, list and framed widgets.

diff --git a/examples/gowid-widgets5/widgets5.go b/examples/gowid-widgets5/widgets5.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the edit and vpadding widgets.

diff --git a/examples/gowid-widgets6/widgets6.go b/examples/gowid-widgets6/widgets6.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the list, edit, columns and styled widgets.

diff --git a/examples/gowid-widgets7/widgets7.go b/examples/gowid-widgets7/widgets7.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the list, edit and framed widgets.

diff --git a/examples/gowid-widgets8/widgets8.go b/examples/gowid-widgets8/widgets8.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // A gowid test app which exercises the checkbox, columns and hpadding widgets.

diff --git a/examples/utils.go b/examples/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package examples

diff --git a/gwtest/support_test.go b/gwtest/support_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gwtest

diff --git a/gwtest/testutils.go b/gwtest/testutils.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/gwutil/utils.go b/gwutil/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 // Package gwutil provides general-purpose utilities that are not used by

diff --git a/gwutil/utils_test.go b/gwutil/utils_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gwutil

diff --git a/screen.go b/screen.go
@@ -14,19 +14,22 @@ import (
 
 //======================================================================
 
-func tcellScreen() (tcell.Screen, error) {
+func tcellScreen(ttys string) (tcell.Screen, error) {
 	var tty tcell.Tty
 	var err error
 
-	tty, err = tcell.NewDevTtyFromDev(bestTty())
+	tty, err = tcell.NewDevTtyFromDev(bestTty(ttys))
 	if err != nil {
-		return nil, WithKVs(err, map[string]interface{}{"GOWID_TTY": os.Getenv("GOWID_TTY")})
+		return nil, WithKVs(err, map[string]interface{}{"tty": ttys})
 	}
 
 	return tcell.NewTerminfoScreenFromTty(tty)
 }
 
-func bestTty() string {
+func bestTty(tty string) string {
+	if tty != "" {
+		return tty
+	}
 	gwtty := os.Getenv("GOWID_TTY")
 	if gwtty != "" {
 		return gwtty

diff --git a/screen_windows.go b/screen_windows.go
@@ -11,7 +11,7 @@ import (
 
 //======================================================================
 
-func tcellScreen() (tcell.Screen, error) {
+func tcellScreen(tty string) (tcell.Screen, error) {
 	return tcell.NewScreen()
 }
 

diff --git a/support.go b/support.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/utils.go b/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package gowid

diff --git a/vim/vim_test.go b/vim/vim_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/widgets/asciigraph/asciigraph.go b/widgets/asciigraph/asciigraph.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/widgets/asciigraph/asciigraph_test.go b/widgets/asciigraph/asciigraph_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/widgets/bargraph/bargraph.go b/widgets/bargraph/bargraph.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/widgets/boxadapter/boxadapter.go b/widgets/boxadapter/boxadapter.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code
 // is governed by the MIT license that can be found in the LICENSE file.
 
 // Package boxadapter provides a widget that will allow a box widget to be used

diff --git a/widgets/boxadapter/boxadapter_test.go b/widgets/boxadapter/boxadapter_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package boxadapter

diff --git a/widgets/button/button.go b/widgets/button/button.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.
 

diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source code is governed by the MIT license
 // that can be found in the LICENSE file.
 
 package button

diff --git a/widgets/cellmod/cellmod.go b/widgets/cellmod/cellmod.go
@@ -1,4 +1,4 @@
-// Copyright 2019 Graham Clark. All rights reserved.  Use of this source
+// Copyright 2019-2022 Graham Clark. All rights reserved.  Use of this source
 // code is governed by the MIT license that can be found in the LICENSE
 // file.