diff --git a/Makefile b/Makefile index cc95b40..559910d 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,12 @@ GOVERSION = $(shell go version | cut -d' ' -f 3) BUILDTIME = $(shell date -u --iso-8601=seconds) VERSION = $(shell cat resources/VERSION) -# PATH=/usr/bin:$PATH go version +# export GO111MODULE="off" build: - # -git pull - -cp ~/go/src/git.wit.org/wit/gui/toolkit/*.so plugins/ + -cp ~/go/src/go.wit.com/gui/toolkits/*.so plugins/ go build -v - ./wit-new-machine --gui gocui >/tmp/witgui.log.stderr 2>&1 + ./wit-new-machine --debugging nocui: ./wit-new-machine --gui-toolkit nocui diff --git a/args.go b/args.go index 7a277ce..d5d3124 100644 --- a/args.go +++ b/args.go @@ -1,10 +1,28 @@ -// This creates a simple hello world window package main +/* + this enables command line options from other packages like 'gui' and 'log' +*/ + import ( - arg "github.com/alexflint/go-arg" + "go.wit.com/log" + "go.wit.com/arg" + "go.wit.com/gui/debugger" ) -func init() { - arg.MustParse() +var argGui ArgsGui + +// This struct can be used with the go-arg package +type ArgsGui struct { + Test bool `arg:"--test" help:"enable all logging"` +} + +func init() { + arg.MustParse(&argGui) + + if debugger.ArgDebug() { + log.Log(true, "INIT() gui debug == true") + } else { + log.Log(true, "INIT() gui debug == false") + } } diff --git a/go.mod b/go.mod index 79c5342..8cc638e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,8 @@ go 1.21.4 require ( github.com/alexflint/go-arg v1.4.3 - go.wit.com/gui v0.9.2 + go.wit.com/gui/gui v0.9.8 + go.wit.com/log v0.0.0-20240102010317-907893ba7b4b golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a ) @@ -13,6 +14,7 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.9.0 // indirect + go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 // indirect golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/image v0.14.0 // indirect golang.org/x/sys v0.15.0 // indirect diff --git a/go.sum b/go.sum index 0314cec..569c5f6 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,12 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= -go.wit.com/gui v0.9.2 h1:QHMYdwpV6MzKwmFUMGevKUDn2a6GAqHN2Ltx8V3HufI= -go.wit.com/gui v0.9.2/go.mod h1:asRXEYKmdjhtg1yiBi5A8YEY2YG4lWPS0gvNz4NXGDE= +go.wit.com/gui/gui v0.9.8 h1:oMqM4sfucMnZxh9e2F0DKxNTuVxl2JZGXcuTRnGW+xI= +go.wit.com/gui/gui v0.9.8/go.mod h1:H2+uDT6qoQ8UkV6QUNIC1MQsgy6/aAop0zWBHnwACso= +go.wit.com/log v0.0.0-20240102010317-907893ba7b4b h1:YqDB6AChqjmt5jYN4F79UrjIDoUt58pfCgXJwp+G2wg= +go.wit.com/log v0.0.0-20240102010317-907893ba7b4b/go.mod h1:GmsggfsKrqdZdAj26fEOlcTz6qEIazbV33uyuuktvB8= +go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4= +go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw= golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 h1:3AGKexOYqL+ztdWdkB1bDwXgPBuTS/S8A4WzuTvJ8Cg= golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0= golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= diff --git a/gui.go b/gui.go index cf6e640..d20fba3 100644 --- a/gui.go +++ b/gui.go @@ -1,10 +1,11 @@ package main import ( - "log" "time" "os" "io/ioutil" - "go.wit.com/gui" + "go.wit.com/log" + "go.wit.com/gui/gui" + "go.wit.com/gui/debugger" ) var myGui *gui.Node @@ -94,6 +95,10 @@ func drawWindow() { os.Exit(0) }) + rn.NewButton("DebugWindow()", func () { + debugger.DebugWindow(myGui) + }) + rn.NewLabel("Not yet working stuff") rn.NewButton("resolv.conf", func () { diff --git a/main.go b/main.go index 55f240d..bdfdae6 100644 --- a/main.go +++ b/main.go @@ -3,12 +3,14 @@ package main import ( "os" "os/exec" - "log" "embed" "strings" "bytes" - "go.wit.com/gui" + "go.wit.com/arg" + "go.wit.com/log" + "go.wit.com/gui/gui" + "go.wit.com/gui/debugger" ) var GITCOMMIT string // this is passed in as an ldflag @@ -47,11 +49,17 @@ func doCmd(str string) { func main() { log.Println("starting my Control Panel") + arg.MustParse() // myGui = gui.New().InitEmbed(resToolkit) myGui = gui.New().Default() drawWindow() + if debugger.ArgDebug() { + log.Sleep(2) + debugger.DebugWindow(myGui) + } + gui.Watchdog() } diff --git a/setup.go b/setup.go index d600c77..89c343a 100644 --- a/setup.go +++ b/setup.go @@ -1,7 +1,7 @@ package main import ( - "go.wit.com/gui" + "go.wit.com/gui/gui" ) // setup a new machine