From ced398383ee30b7fab4ff9e71cfa9d0ad96705b5 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 29 Dec 2023 17:24:16 -0600 Subject: using args.Register() Signed-off-by: Jeff Carr --- args.go | 18 ++++++++++++------ main.go | 6 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/args.go b/args.go index 886880e..cc973b1 100644 --- a/args.go +++ b/args.go @@ -4,19 +4,25 @@ import ( arg "github.com/alexflint/go-arg" ) -var guiArg GuiArgs +var argGui ArgsGui // This struct can be used with the go-arg package -type GuiArgs struct { - Gui string `arg:"--gui" help:"Use this gui toolkit [andlabs,gocui,nocui]"` +type ArgsGui struct { GuiDebug bool `arg:"--gui-debug" help:"open the GUI debugger"` + GuiPlugin string `arg:"--gui" help:"Use this gui toolkit [andlabs,gocui,nocui]"` GuiVerbose bool `arg:"--gui-verbose" help:"enable all logging"` } func init() { - arg.Register(&guiArg) + arg.Register(&argGui) } -func GetArg(a string) bool { - return guiArg.GuiDebug +// returns the toolkit +func ArgToolkit() string { + return argGui.GuiPlugin +} + +// returns true if --gui-debug was passed from the command line +func ArgDebug() bool { + return argGui.GuiDebug } diff --git a/main.go b/main.go index 09b2bc1..b2054b9 100644 --- a/main.go +++ b/main.go @@ -123,9 +123,9 @@ func New() *Node { // try to load andlabs, if that doesn't work, fall back to the console func (n *Node) Default() *Node { - if (guiArg.Gui != "") { - log(logError, "New.Default() try toolkit =", guiArg.Gui) - return n.LoadToolkit(guiArg.Gui) + if (argGui.GuiPlugin != "") { + log(logError, "New.Default() try toolkit =", argGui.GuiPlugin) + return n.LoadToolkit(argGui.GuiPlugin) } // if DISPLAY isn't set, return since gtk can't load // TODO: figure out how to check what to do in macos and mswindows -- cgit v1.2.3