.gitignore

@@ -1,6 +1,6 @@
 *.swp
-go.*
+go.mod
-*.pb.go
+go.sum
 
 files/
 

Makefile

@@ -3,19 +3,19 @@
 VERSION = $(shell git describe --tags)
 BUILDTIME = $(shell date +%Y.%m.%d)
 
-default: placement.pb.go install
+default: install
 
 build:
 	GO111MODULE=off go build \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 	./startxplacement
 
-install: goimports
+verbose:
-	GO111MODULE=off go install \
+	GO111MODULE=off go install -v -x \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-install-verbose: goimports vet
+install: goimports
-	GO111MODULE=off go install -v -x \
+	GO111MODULE=off go install \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
 # makes a .deb package
@@ -35,12 +35,4 @@ redomod:
 
 clean:
 	rm -f go.*
-	rm -f *.pb.go
+	rm -f virtigo*
-	rm -f startxplacement*
-
-vet:
-	GO111MODULE=off go vet
-	@echo 'go vet' worked for this application
-
-placement.pb.go: placement.proto
-	autogenpb --proto placement.proto

argv.go

@@ -19,7 +19,6 @@ type args struct {
 	Save     *EmptyCmd `arg:"subcommand:save"                      help:"save current window geometries to the your config file"`
 	DumpX    *EmptyCmd `arg:"subcommand:dumpx"                      help:"show your current window geometries"`
 	Dump     *EmptyCmd `arg:"subcommand:dump"                      help:"show your current window geometries"`
-	List     *EmptyCmd `arg:"subcommand:list"                      help:"list entries in your config file"`
 	Force    bool      `arg:"--force"                              help:"try to strong arm things"`
 	Verbose  bool      `arg:"--verbose"                            help:"show more output"`
 	Bash     bool      `arg:"--bash"                               help:"generate bash completion"`
@@ -42,14 +41,43 @@ and with the right geometries. TODO: restore the bash working paths
 	`
 }
 
-func (a args) DoAutoComplete(argv []string) {
+func deleteMatch() {
-	switch argv[0] {
+	// f := forgedb.InitSimple()
+	fmt.Println("go.wit.com/lib/gui/repostatus todo: need to do this")
+}
+
+// prints help to STDERR // TODO: move everything below this to go-args
+func (args) doBashHelp() {
+	if len(argv.BashAuto) < 2 {
+		fmt.Fprintf(os.Stderr, "something went wrong with the GO args autocomplete in %s\n", ARGNAME)
+		return
+	}
+	if argv.BashAuto[1] != "''" {
+		// if this is not blank, then the user has typed something
+		return
+	}
+	if argv.BashAuto[0] != ARGNAME {
+		// if this is not the name of the command, the user already started doing something
+		return
+	}
+	if argv.BashAuto[0] == ARGNAME {
+		me.pp.WriteHelp(os.Stderr)
+		return
+	}
+	fmt.Fprintln(os.Stderr, "")
+	fmt.Fprintln(os.Stderr, "something went wrong with the GO args package")
+	fmt.Fprintln(os.Stderr, "")
+}
+
+func (args) doBashAuto() {
+	argv.doBashHelp()
+	switch argv.BashAuto[0] {
 	case "dump":
 		fmt.Println("--terminals")
 	default:
-		if argv[0] == ARGNAME {
+		if argv.BashAuto[0] == ARGNAME {
 			// list the subcommands here
-			fmt.Println("--restore save dump dumpx list")
+			fmt.Println("--restore save dump dumpx")
 		}
 	}
 	os.Exit(0)

main.go

@@ -7,9 +7,11 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/gui/prep"
+	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/log"
 )
 
@@ -27,19 +29,22 @@ var configFile string = "/home/jcarr/.config/startxplacement.out"
 
 func main() {
 	me = new(mainType)
-	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: this line should be:  prep.Bash(argv)
+	gui.InitArg()
-	me.myGui = prep.Gui()                   // prepares the GUI package for go-args
 	me.pp = arg.MustParse(&argv)
 
+	if argv.Bash {
+		fhelp.DoBash(ARGNAME)
+		os.Exit(0)
+	}
+	if len(argv.BashAuto) != 0 {
+		argv.doBashAuto()
+		os.Exit(0)
+	}
+
 	if argv.DumpX != nil {
 		doDumpX()
 	}
 
-	if argv.List != nil {
-		log.Info("list the config")
-		okExit("")
-	}
-
 	if argv.Dump != nil {
 		// 2. Get the current state of all terminal windows.
 		currentStates, err := getCurrentState()

placement.config.go

@@ -1,16 +0,0 @@
-package main
-
-// functions to import and export the protobuf
-// data to and from config files
-
-import (
-	"go.wit.com/lib/config"
-)
-
-func (pb *Placements) ConfigSave() error {
-	return config.ConfigSave(pb)
-}
-
-func (pb *Placements) ConfigLoad() error {
-	return config.ConfigLoad(pb, ARGNAME, "placements")
-}

placement.proto

@@ -1,31 +0,0 @@
-syntax = "proto3";
-
-package main;
-
-message Placement {
-        message Size  {
-                int64    w          = 1;
-                int64    h          = 2;
-        }
-        message Offset  {
-                int64    x          = 1;
-                int64    y          = 2;
-        }
-        message Geom  {
-                Size     size       = 1;
-                Offset   offset     = 2;
-        }
-                                                 // used for grid layouts
-        string               name          = 1;  // `autogenpb:sort` `autogenpb:unique`
-        Geom                 geom          = 2;
-        int32                workspace     = 3;  // what workspace to show the app on
-        string               wd            = 4;  // working dir. Tries to set xterm path at start to this
-        repeated string      argv          = 5;  // argv. argv[0] should be the executable name
-        string               namespace     = 6;  // namespace of the executable (go.wit.com/apps/forge)
-}
-message Placements {                             // `autogenpb:marshal` `autogenpb:mutex`
-        string               uuid          = 1;  // `autogenpb:uuid:31769bcb-5865-4926-b7d6-501083312eea`
-        string               version       = 2;  // `autogenpb:version:v0.0.1`
-        repeated Placement   Placement     = 3;
-        string               filename      = 4;  // used by the config save function
-}

structs.go

@@ -5,7 +5,7 @@ package main
 
 import (
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/gui/prep"
+	"go.wit.com/gui"
 )
 
 var me *mainType
@@ -13,5 +13,5 @@ var me *mainType
 // this app's variables
 type mainType struct {
 	pp    *arg.Parser // for parsing the command line args.  Yay to alexf lint!
-	myGui *prep.GuiPrep // the gui toolkit handle
+	myGui *gui.Node   // the gui toolkit handle
 }