start converting over to new argv scheme

6 files changed, 135 insertions, 57 deletions

diff --git a/argv.custom.go b/argv.custom.go
new file mode 100644
index 0000000..9665275
--- /dev/null
+++ b/argv.custom.go
@@ -0,0 +1,53 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"os"
+
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
+
+// used for shell auto completion
+var APPNAME string = "startxplacement"
+
+func (a args) Description() string {
+	return `
+startxplacment -- run this after 'startx' to restore all your apps
+
+will attempt to launch your terminal windows on the right Workspaces
+and with the right geometries. TODO: restore the bash working paths
+	`
+}
+
+/*
+	handles shell autocomplete
+*/
+
+func (args) Appname() string {
+	return APPNAME
+}
+
+func (args) Buildtime() (string, string) {
+	return BUILDTIME, VERSION
+}
+
+func (args) Version() string {
+	return argvpb.StandardVersion(APPNAME, VERSION, BUILDTIME)
+}
+
+// sends the strings to bash or zsh that will be your options
+func (a args) SendCompletionStrings(pb *argvpb.Argv) {
+	if pb.Cmd == "" {
+		base := []string{"--restore", "save", "dump", "dumpx", "list", "--version"}
+		pb.SendStrings(base)
+	} else {
+		pb.SubCommand(pb.Goargs...)
+	}
+	os.Exit(0)
+}
diff --git a/argv.go b/argv.struct.go
index 6d48ed9..9650b81 100644
--- a/argv.go
+++ b/argv.struct.go
@@ -3,16 +3,6 @@
 
 package main
 
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-/*
-	this parses the command line arguements using alex flint's go-arg
-*/
-
 var argv args
 
 type args struct {
@@ -29,39 +19,3 @@ type args struct {
 
 type EmptyCmd struct {
 }
-
-func (a args) Description() string {
-	return `
-startxplacment -- run this after 'startx' to restore all your apps
-
-will attempt to launch your terminal windows on the right Workspaces
-and with the right geometries. TODO: restore the bash working paths
-	`
-}
-
-/*
-	handles shell autocomplete
-*/
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-func (args) Version() string {
-	return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME)
-}
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.Cmd == "" {
-		base := []string{"--restore", "save", "dump", "dumpx", "list", "--version"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.template.go b/argv.template.go
new file mode 100644
index 0000000..d438b20
--- /dev/null
+++ b/argv.template.go
@@ -0,0 +1,74 @@
+package main
+
+// these are stubbed in functions needed
+// just copy this file from another working app for now
+// you shouldn't need to change anything here
+// TODO: clean this up in argv
+
+import (
+	"os"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
+	"go.wit.com/log"
+)
+
+func (args) InitArgv() (string, string, string) {
+	return APPNAME, BUILDTIME, VERSION
+}
+
+// this function will send the current argv PB to go-args for parsing
+func (args) ParseFlags(flags []string) error {
+	var err error
+	if me.pp == nil {
+		// log.Info("Parse Flags GOT flags:", flags)
+		me.pp, err = arg.ParseFlags(flags, &argv)
+		// panic("got to the app's ParseFlags()")
+	} else {
+		panic("me.pp was not nil")
+	}
+	return err
+}
+
+// this will print the help for the subcmd
+func (args) WriteHelpForAutocomplete(part string, subcmd ...string) error {
+	return me.pp.WriteHelpForAutocomplete(os.Stderr, os.Stdout, part, subcmd...)
+}
+
+func (args) WriteHelpForAutocompleteDebug(part string, subcmd ...string) error {
+	f, _ := os.OpenFile("/tmp/argv.junk", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	return me.pp.WriteHelpForAutocomplete(f, os.Stdout, part, subcmd...)
+}
+
+// add this funcgion: this will print the help
+func (args) WriteHelp() error {
+	me.pp.WriteHelp(os.Stderr)
+	return nil
+}
+
+func (args) InitGui() error {
+	// panic("got here")
+	arg.Register(&gui.ArgvGui)
+	// me.gui = gui.PreInit()
+	me.myGui = fhelp.Gui()
+	return nil
+}
+
+func (args) Exit() {
+	gui.UnloadToolkits()
+	if argv.Verbose {
+		log.Info("argv.Exit() called", APPNAME+".Exit()")
+	}
+	// remove this from the template for your app (or make one for youself if you need it)
+	// forgeExit() // custom forge shutdown function
+}
+
+func (args) Help() string {
+	return "got app help"
+}
+
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
+}
diff --git a/main.go b/main.go
index 0fdd559..953fb1b 100644
--- a/main.go
+++ b/main.go
@@ -12,13 +12,6 @@ import (
 	"go.wit.com/log"
 )
 
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-// used for shell auto completion
-var ARGNAME string = "startxplacement"
-
 // using this for now. triggers config save
 var configSave bool
 
@@ -26,7 +19,6 @@ var configFile string = "/home/jcarr/.config/startxplacement.out"
 
 func main() {
 	me = new(mainType)
-	me.myGui = argvpb.Gui()              // prepares the GUI package for go-args
 	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
 
 	if argv.DumpX != nil {
diff --git a/placement.config.go b/placement.config.go
index 3293a5a..4ceba86 100644
--- a/placement.config.go
+++ b/placement.config.go
@@ -12,5 +12,5 @@ func (pb *Placements) ConfigSave() error {
 }
 
 func (pb *Placements) ConfigLoad() error {
-	return config.ConfigLoad(pb, ARGNAME, "placements")
+	return config.ConfigLoad(pb, APPNAME, "placements")
 }
diff --git a/structs.go b/structs.go
index 2dadbd6..8034c3b 100644
--- a/structs.go
+++ b/structs.go
@@ -4,6 +4,9 @@
 package main
 
 import (
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/argvpb"
 )
 
@@ -11,6 +14,8 @@ var me *mainType
 
 // this app's variables
 type mainType struct {
-	argv  *argvpb.Argv    // shell autocomplete
-	myGui *argvpb.GuiPrep // the gui toolkit handle
+	argv  *argvpb.Argv   // shell autocomplete
+	pp    *arg.Parser    // for parsing the command line args.  Yay to alexf lint!
+	gui   *gui.Node      // the gui toolkit handle
+	myGui *fhelp.GuiPrep // the gui toolkit handle
 }