17 files changed, 548 insertions, 21 deletions

diff --git a/toolkit/andlabs/box.go b/toolkit/andlabs/box.go
index ac31f0d..8347bab 100644
--- a/toolkit/andlabs/box.go
+++ b/toolkit/andlabs/box.go
@@ -37,6 +37,19 @@ func (t *Toolkit) NewBox() *Toolkit {
 
 		return &newTK
 	}
+	if (t.uiWindow != nil) {
+		log.Println("\tgui.Toolbox.NewBox() is a Window")
+		var newT Toolkit
+
+		vbox := ui.NewVerticalBox()
+		vbox.SetPadded(padded)
+		t.uiWindow.SetChild(vbox)
+		newT.uiBox = vbox
+		newT.Name = t.Name
+
+		// panic("WTF")
+		return &newT
+	}
 	log.Println("\tgui.Toolbox.NewBox() FAILED. Couldn't figure out where to make a box")
 	t.Dump()
 	return nil
diff --git a/toolkit/andlabs/button.go b/toolkit/andlabs/button.go
index 4e6ff52..e0b7d97 100644
--- a/toolkit/andlabs/button.go
+++ b/toolkit/andlabs/button.go
@@ -1,7 +1,7 @@
 package toolkit
 
 import "log"
-import "os"
+// import "os"
 
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
@@ -11,15 +11,12 @@ func (t Toolkit) NewButton(name string) *Toolkit {
 	var newt Toolkit
 	var b *ui.Button
 
-	if (t.uiBox == nil) {
-		log.Println("gui.ToolboxNode.NewButton() node.UiBox == nil. I can't add a range UI element without a place to put it")
-		log.Println("probably could just make a box here?")
-		os.Exit(0)
+	if t.broken() {
 		return nil
 	}
 
 	if (DebugToolkit) {
-		log.Println("gui.Toolbox.NewGroup() create", name)
+		log.Println("gui.Toolbox.NewButton() create", name)
 	}
 	b = ui.NewButton(name)
 	newt.uiButton = b
@@ -40,6 +37,7 @@ func (t Toolkit) NewButton(name string) *Toolkit {
 				log.Println("wit/gui/toolkit NewButton() toolkit.Custom() START")
 			}
 			newt.Custom()
+			return
 			if (DebugToolkit) {
 				log.Println("wit/gui/toolkit NewButton() toolkit.Custom() END")
 			}
@@ -53,14 +51,29 @@ func (t Toolkit) NewButton(name string) *Toolkit {
 				log.Println("wit/gui/toolkit NewButton() running parent toolkit.Custom() START (IS THIS A BAD IDEA?)")
 			}
 			t.Custom()
+			return
 			if (DebugToolkit) {
 				log.Println("wit/gui/toolkit NewButton() running parent toolkit.Custom() END   (IS THIS A BAD IDEA?)")
 			}
 		}
-		log.Println("TODO: LEFT TOOLKIT GOROUTINE button name =", name)
+		log.Println("TODO: LEFT TOOLKIT GOROUTINE WITH NOTHING TO DO button name =", name)
 	})
 
-	t.uiBox.Append(b, stretchy)
+	if (DebugToolkit) {
+		log.Println("gui.Toolbox.NewButton() about to append to Box parent t:", name)
+		t.Dump()
+		log.Println("gui.Toolbox.NewButton() about to append to Box new t:", name)
+		newt.Dump()
+	}
+	if (t.uiBox != nil) {
+		t.uiBox.Append(b, stretchy)
+	} else if (t.uiWindow != nil) {
+		t.uiWindow.SetChild(b)
+	} else {
+		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
+		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
+		return &t
+	}
 
 	return &newt
 }
diff --git a/toolkit/andlabs/common.go b/toolkit/andlabs/common.go
index 569621d..e997aca 100644
--- a/toolkit/andlabs/common.go
+++ b/toolkit/andlabs/common.go
@@ -2,9 +2,6 @@ package toolkit
 
 import "log"
 
-// import "github.com/andlabs/ui"
-// import _ "github.com/andlabs/ui/winmanifest"
-
 func init() {
 	log.Println("gui/toolkit init() Setting defaultBehavior = true")
 	setDefaultBehavior(true)
@@ -37,8 +34,13 @@ func (t Toolkit) commonChange(widget string) {
 
 // does some sanity checks on the internal structs of the binary tree
 // TODO: probably this should not panic unless it's running in devel mode (?)
-func (t Toolkit) broken() bool {
+func (t *Toolkit) broken() bool {
 	if (t.uiBox == nil) {
+		if (t.uiWindow != nil) {
+			log.Println("gui.Toolkit.UiBox == nil. This is an empty window. Try to add a box")
+			t.NewBox()
+			return false
+		}
 		log.Println("gui.Toolkit.UiBox == nil. I can't add a widget without a place to put it")
 		// log.Println("probably could just make a box here?")
 		// corruption or something horrible?
@@ -48,6 +50,7 @@ func (t Toolkit) broken() bool {
 	}
 	if (t.uiWindow == nil) {
 		log.Println("gui.Toolkit.UiWindow == nil. I can't add a widget without a place to put it (IGNORING FOR NOW)")
+		forceDump(t)
 		return false
 	}
 	return false
diff --git a/toolkit/andlabs/group.go b/toolkit/andlabs/group.go
index f48a78d..5b315a4 100644
--- a/toolkit/andlabs/group.go
+++ b/toolkit/andlabs/group.go
@@ -10,19 +10,21 @@ import _ "github.com/andlabs/ui/winmanifest"
 func (t Toolkit) NewGroup(title string) *Toolkit {
 	var newt Toolkit
 
-	if (t.uiBox == nil) {
-		log.Println("gui.ToolboxNode.NewGroup() node.UiBox == nil. I can't add a range UI element without a place to put it")
-		log.Println("probably could just make a box here?")
-		os.Exit(0)
-		return nil
-	}
-
 	if (DebugToolkit) {
 		log.Println("gui.Toolbox.NewGroup() create", title)
 	}
 	g := ui.NewGroup(title)
 	g.SetMargined(margin)
-	t.uiBox.Append(g, stretchy)
+
+	if (t.uiBox != nil) {
+		t.uiBox.Append(g, stretchy)
+	} else if (t.uiWindow != nil) {
+		t.uiWindow.SetChild(g)
+	} else {
+		log.Println("gui.ToolboxNode.NewGroup() node.UiBox == nil. I can't add a range UI element without a place to put it")
+		log.Println("probably could just make a box here?")
+		os.Exit(0)
+	}
 
 	hbox := ui.NewVerticalBox()
 	hbox.SetPadded(padded)
@@ -30,6 +32,7 @@ func (t Toolkit) NewGroup(title string) *Toolkit {
 
 	newt.uiGroup = g
 	newt.uiBox = hbox
+	newt.uiWindow = t.uiWindow
 	newt.Name = title
 
 	t.Dump()
diff --git a/toolkit/andlabs/main.go b/toolkit/andlabs/main.go
index cea0486..d1dc7e6 100644
--- a/toolkit/andlabs/main.go
+++ b/toolkit/andlabs/main.go
@@ -4,6 +4,7 @@ import (
 	"log"
 
 	"github.com/andlabs/ui"
+	// the _ means we only need this for the init()
 	_ "github.com/andlabs/ui/winmanifest"
 )
 
diff --git a/toolkit/andlabs/structs.go b/toolkit/andlabs/structs.go
index 90f9409..374627c 100644
--- a/toolkit/andlabs/structs.go
+++ b/toolkit/andlabs/structs.go
@@ -87,9 +87,10 @@ func (t *Toolkit) String() string {
 }
 
 func forceDump(t *Toolkit) {
+	tmp := DebugToolkit
 	DebugToolkit = true
 	t.Dump()
-	DebugToolkit = false
+	DebugToolkit = tmp
 }
 
 func (t *Toolkit) GetText() string {
diff --git a/toolkit/gocui/Makefile b/toolkit/gocui/Makefile
new file mode 100644
index 0000000..42798cc
--- /dev/null
+++ b/toolkit/gocui/Makefile
@@ -0,0 +1,8 @@
+all: plugin
+	ldd ../gocli.so
+
+build:
+	GO111MODULE="off" go build
+
+plugin:
+	GO111MODULE="off" go build -buildmode=plugin -o ../gocli.so
diff --git a/toolkit/gocui/gocui b/toolkit/gocui/gocui
new file mode 100755
index 0000000..094619c
--- /dev/null
+++ b/toolkit/gocui/gocui
diff --git a/toolkit/gocui/greeter.go b/toolkit/gocui/greeter.go
new file mode 100644
index 0000000..9d546a7
--- /dev/null
+++ b/toolkit/gocui/greeter.go
@@ -0,0 +1,57 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/awesome-gocui/gocui"
+)
+
+type greeting string
+
+
+// func main() {
+func (g greeting) Greet() {
+	fmt.Println("Hello Universe")
+	Init()
+	// ToolkitMain()
+}
+
+// this is exported
+var Greeter greeting
+
+func AddGroup(name string) {
+	log.Println("addGroup()", name)
+	currentY = 2
+	currentX += groupSize + 6
+}
+
+func AddButton(name string) error {
+	t := len(name)
+	v, err := baseGui.SetView(name, currentX, currentY, currentX+t+3, currentY+2, 0)
+	if err == nil {
+		return err
+	}
+	if !errors.Is(err, gocui.ErrUnknownView) {
+		return err
+	}
+
+	v.Wrap = true
+	fmt.Fprintln(v, " " + name)
+	fmt.Fprintln(v, strings.Repeat("foo\n", 2))
+
+	if _, err := baseGui.SetCurrentView(name); err != nil {
+		return err
+	}
+
+	views = append(views, name)
+	curView = len(views) - 1
+	idxView += 1
+	currentY += 3
+	if (groupSize < len(views)) {
+		groupSize = len(views)
+	}
+	return nil
+}
diff --git a/toolkit/gocui/keybindings.go b/toolkit/gocui/keybindings.go
new file mode 100644
index 0000000..fdac1ff
--- /dev/null
+++ b/toolkit/gocui/keybindings.go
@@ -0,0 +1,130 @@
+// Copyright 2014 The gocui Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+//	"errors"
+//	"fmt"
+	"log"
+//	"strings"
+
+	"github.com/awesome-gocui/gocui"
+)
+
+func initKeybindings(g *gocui.Gui) error {
+	log.Println("got to initKeybindings")
+	if err := g.SetKeybinding("", 'q', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return gocui.ErrQuit
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", 'Q', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return gocui.ErrQuit
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyCtrlC, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return gocui.ErrQuit
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeySpace, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return newView(g)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyBackspace, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return delView(g)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyBackspace2, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return delView(g)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyTab, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			log.Println("tab", v.Name())
+			return nextView(g, true)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyArrowLeft, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return moveView(g, v, -delta, 0)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyArrowRight, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return moveView(g, v, delta, 0)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyArrowDown, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			log.Println("down", v.Name())
+			return moveView(g, v, 0, delta)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyArrowUp, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			log.Println("up", v.Name())
+			return moveView(g, v, 0, -delta)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyEnter, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			log.Println("enter", v.Name())
+			return nil
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", 't', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			_, err := g.SetViewOnTop(views[curView])
+			return err
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", 'b', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			_, err := g.SetViewOnBottom(views[curView])
+			return err
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", 'j', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			return newJ(g)
+		}); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", 'h', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			log.Println("help", v.Name())
+			tmp, _ := g.SetViewOnTop("help")
+			log.Println("help 2", tmp.Name(), "blah")
+//			g.SetView("help", 2, 2, 30, 15, 0);
+			g.SetCurrentView("help")
+//			moveView(g, tmp, 0, -delta)
+			if err := g.DeleteView("help"); err != nil {
+				panic(err)
+			}
+			return nil
+		}); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/toolkit/gocui/main.go b/toolkit/gocui/main.go
new file mode 100644
index 0000000..2439a3a
--- /dev/null
+++ b/toolkit/gocui/main.go
@@ -0,0 +1,97 @@
+// Copyright 2014 The gocui Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"log"
+
+	"github.com/awesome-gocui/gocui"
+)
+
+const delta = 1
+
+var (
+	views   = []string{}
+	curView = -1
+	idxView = 0
+	currentX = 5
+	currentY = 2
+	groupSize = 0
+	baseGui *gocui.Gui
+)
+
+var helpLabel *gocui.View
+
+func Init() {
+	// setup log to write to a file
+//	logInit()
+
+	g, err := gocui.NewGui(gocui.OutputNormal, true)
+	baseGui = g
+	if err != nil {
+		log.Panicln(err)
+	}
+	defer g.Close()
+
+	g.Highlight = true
+	g.SelFgColor = gocui.ColorRed
+	g.SelFrameColor = gocui.ColorRed
+
+	g.SetManagerFunc(layout)
+
+	if err := initKeybindings(g); err != nil {
+		log.Panicln(err)
+	}
+	if err := newView(g); err != nil {
+		log.Panicln(err)
+	}
+
+	AddButton("hello")
+	AddButton("world")
+	AddButton("foo")
+
+	AddGroup("blank")
+	AddButton("bar")
+	AddButton("bar none")
+	AddButton("bar going")
+
+	AddGroup("te")
+	AddButton("world 2")
+	AddButton("foo 2")
+
+	if err := baseGui.MainLoop(); err != nil && !errors.Is(err, gocui.ErrQuit) {
+		log.Panicln(err)
+	}
+}
+
+func ToolkitMain() {
+	if err := baseGui.MainLoop(); err != nil && !errors.Is(err, gocui.ErrQuit) {
+		log.Panicln(err)
+	}
+}
+
+func layout(g *gocui.Gui) error {
+	var err error
+	maxX, _ := g.Size()
+	helpLabel, err = g.SetView("help", maxX-32, 0, maxX-1, 11, 0)
+	if err != nil {
+		if !errors.Is(err, gocui.ErrUnknownView) {
+			return err
+		}
+		fmt.Fprintln(helpLabel, "KEYBINDINGS")
+		fmt.Fprintln(helpLabel, "Enter: Click Button")
+		fmt.Fprintln(helpLabel, "Tab/Space: Switch Buttons")
+		fmt.Fprintln(helpLabel, "")
+		fmt.Fprintln(helpLabel, "h: Help")
+		fmt.Fprintln(helpLabel, "Backspace: Delete Button")
+		fmt.Fprintln(helpLabel, "Arrow keys: Move Button")
+		fmt.Fprintln(helpLabel, "t: Move Button to the top")
+		fmt.Fprintln(helpLabel, "b: Move Button to the button")
+		fmt.Fprintln(helpLabel, "Ctrl-C or Q: Exit")
+	}
+	return nil
+}
diff --git a/toolkit/gocui/newJ.go b/toolkit/gocui/newJ.go
new file mode 100644
index 0000000..47c7439
--- /dev/null
+++ b/toolkit/gocui/newJ.go
@@ -0,0 +1,46 @@
+// Copyright 2014 The gocui Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/awesome-gocui/gocui"
+)
+
+var topX int = 2
+var bottomX int = 20
+var topY int = 2
+var bottomY int = 7
+
+func newJ(g *gocui.Gui) error {
+	// maxX, maxY := g.Size()
+	name := fmt.Sprintf("jcarr %v test ", idxView)
+	v, err := g.SetView(name, topX, topY, bottomX, bottomY, 0)
+	if err == nil {
+		return err
+	}
+	if !errors.Is(err, gocui.ErrUnknownView) {
+		return err
+	}
+
+	v.Wrap = true
+	fmt.Fprintln(v, name)
+	fmt.Fprintln(v, strings.Repeat("foo\n", 2))
+	// fmt.Fprintln(v, strings.Repeat(name+" ", 30))
+	log.Println("newJ added a new view", v.Name())
+
+	if _, err := g.SetCurrentView(name); err != nil {
+		return err
+	}
+
+	views = append(views, name)
+	curView = len(views) - 1
+	idxView += 1
+	return nil
+}
diff --git a/toolkit/gocui/mouse.go b/toolkit/gocui/orig/mouse.go
index 7c77b14..7c77b14 100644
--- a/toolkit/gocui/mouse.go
+++ b/toolkit/gocui/orig/mouse.go
diff --git a/toolkit/gocui/views.go b/toolkit/gocui/views.go
new file mode 100644
index 0000000..6c9c65d
--- /dev/null
+++ b/toolkit/gocui/views.go
@@ -0,0 +1,80 @@
+// Copyright 2014 The gocui Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/awesome-gocui/gocui"
+)
+
+func newView(g *gocui.Gui) error {
+	maxX, maxY := g.Size()
+	name := fmt.Sprintf("v%v", idxView)
+	v, err := g.SetView(name, maxX/2-5, maxY/2-5, maxX/2+5, maxY/2+5, 0)
+	if err == nil {
+		return err
+	}
+	if !errors.Is(err, gocui.ErrUnknownView) {
+		return err
+	}
+
+	v.Wrap = true
+	fmt.Fprintln(v, strings.Repeat(name+" ", 30))
+
+	if _, err := g.SetCurrentView(name); err != nil {
+		return err
+	}
+
+	views = append(views, name)
+	curView = len(views) - 1
+	idxView += 1
+	return nil
+}
+
+func delView(g *gocui.Gui) error {
+	if len(views) <= 1 {
+		return nil
+	}
+
+	if err := g.DeleteView(views[curView]); err != nil {
+		return err
+	}
+	views = append(views[:curView], views[curView+1:]...)
+
+	return nextView(g, false)
+}
+
+func nextView(g *gocui.Gui, disableCurrent bool) error {
+	next := curView + 1
+	if next > len(views)-1 {
+		next = 0
+	}
+
+	if _, err := g.SetCurrentView(views[next]); err != nil {
+		return err
+	}
+
+	curView = next
+	return nil
+}
+
+func moveView(g *gocui.Gui, v *gocui.View, dx, dy int) error {
+	name := v.Name()
+	x0, y0, x1, y1, err := g.ViewPosition(name)
+	if err != nil {
+		return err
+	}
+	log.Println(x0, y0, x1, y1)
+	if _, err := g.SetView(name, x0+dx, y0+dy, x1+dx, y1+dy, 0); err != nil {
+		return err
+	}
+	x0, y0, x1, y1, err = g.ViewPosition(name)
+	log.Println(x0, y0, x1, y1)
+	return nil
+}
diff --git a/toolkit/hello/Makefile b/toolkit/hello/Makefile
new file mode 100644
index 0000000..8271843
--- /dev/null
+++ b/toolkit/hello/Makefile
@@ -0,0 +1,8 @@
+all: plugin
+	ldd ../hello.so
+
+build:
+	GO111MODULE="off" go build
+
+plugin:
+	GO111MODULE="off" go build -buildmode=plugin -o ../hello.so
diff --git a/toolkit/hello/greeter.go b/toolkit/hello/greeter.go
new file mode 100644
index 0000000..1eb3307
--- /dev/null
+++ b/toolkit/hello/greeter.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+//	"errors"
+	"fmt"
+//	"log"
+//	"strings"
+
+//	"github.com/awesome-gocui/gocui"
+)
+
+type greeting string
+
+
+// func main() {
+func (g greeting) Greet() {
+	fmt.Println("Hello Universe")
+	Init()
+	// ToolkitMain()
+}
+
+// this is exported
+var Greeter greeting
diff --git a/toolkit/hello/main.go b/toolkit/hello/main.go
new file mode 100644
index 0000000..3a72d1f
--- /dev/null
+++ b/toolkit/hello/main.go
@@ -0,0 +1,44 @@
+// This creates a simple hello world window
+package main
+
+import 	(
+	"os"
+	"log"
+	"git.wit.org/wit/gui"
+)
+
+func Init() {
+	gui.Main(myGUI)
+}
+
+// This initializes the first window
+func myGUI() {
+	var w *gui.Node
+	gui.Config.Title = "Hello World golang wit/gui Window"
+	gui.Config.Width = 640
+	gui.Config.Height = 480
+	gui.Config.Exit = myExit
+
+	w = gui.NewWindow()
+	addHelloWorld(w, "A Simple Tab")
+}
+
+func addHelloWorld(window *gui.Node, title string) {
+	var newNode, g, tb *gui.Node
+
+	newNode = window.NewTab(title)
+
+	g = newNode.NewGroup("hello")
+	tb = g.NewTextbox("hello world box") // when debugging, this string will be used
+	tb.OnChanged = func(*gui.Node) {
+		s := tb.GetText()
+		log.Println("text box =", s)
+	}
+	tb.SetText("world")
+}
+
+func myExit(n *gui.Node) {
+        log.Println("exit() here")
+	os.Exit(0)
+}
+