From 75c89281ebac49ae21a69024758879f9caee141a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 28 Aug 2025 04:26:32 -0500 Subject: try to make --restore work --- Makefile | 4 +- argv.go | 1 + argvAutoshell.go | 82 ++++++++++++++++++++++-------------- doDumpX.go | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 16 ++++++-- stuff.go.disabled | 121 ------------------------------------------------------ 6 files changed, 189 insertions(+), 156 deletions(-) create mode 100644 doDumpX.go delete mode 100644 stuff.go.disabled diff --git a/Makefile b/Makefile index 035f59c..f9f0a90 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d) -default: goimports verbose +default: install build: GO111MODULE=off go build \ @@ -14,7 +14,7 @@ verbose: GO111MODULE=off go install -v -x \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" -install: +install: goimports GO111MODULE=off go install \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" diff --git a/argv.go b/argv.go index 8f1971e..7b5f0ad 100644 --- a/argv.go +++ b/argv.go @@ -12,6 +12,7 @@ var argv args type args struct { Restore string `arg:"--restore" help:"restore terminal windows from a config file"` 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"` Force bool `arg:"--force" help:"try to strong arm things"` Verbose bool `arg:"--verbose" help:"show more output"` diff --git a/argvAutoshell.go b/argvAutoshell.go index 85d841b..37937ec 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -6,6 +6,9 @@ package main import ( "fmt" "os" + "path/filepath" + + "go.wit.com/lib/gui/shell" ) /* @@ -28,7 +31,7 @@ func (args) doBashAuto() { default: if argv.BashAuto[0] == ARGNAME { // list the subcommands here - fmt.Println("--restore save dump") + fmt.Println("--restore save dump dumpx") } } os.Exit(0) @@ -36,6 +39,10 @@ func (args) doBashAuto() { // 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 @@ -55,33 +62,48 @@ func (args) doBashHelp() { // complete -F forge --bash forge func (args) doBash() { - fmt.Println("# add this in your bashrc:") - fmt.Println("") - fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash") - fmt.Println("#") - fmt.Println("# Put the below in the file: ~/.local/share/bash-completion/completions/" + ARGNAME) - fmt.Println("#") - fmt.Println("# todo: make this output work/parse with:") - fmt.Println("# complete -C " + ARGNAME + " --bash go") - fmt.Println("") - fmt.Println("_" + ARGNAME + "_complete()") - fmt.Println("{") - fmt.Println(" # sets local to this func vars") - fmt.Println(" local cur prev all") - fmt.Println(" cur=${COMP_WORDS[COMP_CWORD]}") - fmt.Println(" prev=${COMP_WORDS[COMP_CWORD-1]}") - fmt.Println(" all=${COMP_WORDS[@]}") - fmt.Println("") - fmt.Println(" # this is where we generate the go-arg output") - fmt.Println(" GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)") - fmt.Println("") - fmt.Println(" # this compares the command line input from the user") - fmt.Println(" # to whatever strings we output") - fmt.Println(" COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) ) # THIS WORKS") - fmt.Println(" return 0") - fmt.Println("}") - fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME) - fmt.Println("") - fmt.Println("# copy and paste the above into your bash shell should work") - os.Exit(0) + if homeDir, err := os.UserHomeDir(); err == nil { + filename := filepath.Join(homeDir, ".local/share/bash-completion/completions", ARGNAME) + if !shell.Exists(filename) { + if f, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644); err == nil { + f.Write([]byte(makeBashCompletionText(ARGNAME))) + f.Close() + } + } + } + fmt.Println(makeBashCompletionText(ARGNAME)) +} + +func makeBashCompletionText(argname string) string { + var out string + + out += fmt.Sprintf("# add this in your bashrc:\n") + out += fmt.Sprintf("\n") + out += fmt.Sprintf("# todo: add this to go-arg as a 'hidden' go-arg option --bash\n") + out += fmt.Sprintf("#\n") + out += fmt.Sprintf("# Put the below in the file: ~/.local/share/bash-completion/completions/%s\n", argname) + out += fmt.Sprintf("#\n") + out += fmt.Sprintf("# todo: make this output work/parse with:\n") + out += fmt.Sprintf("# complete -C " + argname + " --bash go\n") + out += fmt.Sprintf("\n") + out += fmt.Sprintf("_" + argname + "_complete()\n") + out += fmt.Sprintf("{\n") + out += fmt.Sprintf(" # sets local to this func vars\n") + out += fmt.Sprintf(" local cur prev all\n") + out += fmt.Sprintf(" cur=${COMP_WORDS[COMP_CWORD]}\n") + out += fmt.Sprintf(" prev=${COMP_WORDS[COMP_CWORD-1]}\n") + out += fmt.Sprintf(" all=${COMP_WORDS[@]}\n") + out += fmt.Sprintf("\n") + out += fmt.Sprintf(" # this is where we generate the go-arg output\n") + out += fmt.Sprintf(" GOARGS=$(" + argname + " --auto-complete $prev \\'$cur\\' $all)\n") + out += fmt.Sprintf("\n") + out += fmt.Sprintf(" # this compares the command line input from the user\n") + out += fmt.Sprintf(" # to whatever strings we output\n") + out += fmt.Sprintf(" COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) ) # THIS WORKS\n") + out += fmt.Sprintf(" return 0\n") + out += fmt.Sprintf("}\n") + out += fmt.Sprintf("complete -F _%s_complete %s\n", argname, argname) + out += fmt.Sprintf("\n") + out += fmt.Sprintf("# copy and paste the above into your bash shell should work\n") + return out } diff --git a/doDumpX.go b/doDumpX.go new file mode 100644 index 0000000..3925c7d --- /dev/null +++ b/doDumpX.go @@ -0,0 +1,121 @@ +package main + +import ( + "fmt" + "os" + "reflect" + + "github.com/BurntSushi/xgb" + "github.com/BurntSushi/xgb/xproto" +) + +func doDumpX() { + conn, err := xgb.NewConn() + if err != nil { + fmt.Println("Failed to connect to X server:", err) + os.Exit(1) + } + defer conn.Close() + + /* + // Start the terminal (replace with your app) + go func() { + if err := exec.Command("mate-terminal", "--title", "Workspace1-Terminal").Start(); err != nil { + fmt.Println("Error starting terminal:", err) + } + }() + + // Wait for the window to appear + time.Sleep(2 * time.Second) + */ + + // Get the root window + setup := xproto.Setup(conn) + root := setup.DefaultScreen(conn).Root + + // List children windows + reply, err := xproto.QueryTree(conn, root).Reply() + if err != nil { + fmt.Println("Failed to query windows:", err) + os.Exit(1) + } + + // Find the window with the specified title + var target xproto.Window + for _, child := range reply.Children { + // fmt.Printf("child: %+v\n", child) + /* + // Get the atom for _NET_WM_NAME + atomReply, err := xproto.InternAtom(conn, true, uint16(len("_NET_WM_NAME")), "_NET_WM_NAME").Reply() + if err != nil { + log.Fatalf("Failed to intern atom _NET_WM_NAME: %v", err) + } + netWmNameAtom := atomReply.Atom // Correct field to use + */ + + /* + // Get the property for _NET_WM_NAME + nameReply, err := xproto.GetProperty(conn, false, child, netWmNameAtom, xproto.AtomString, 0, (1<<32)-1).Reply() + if err != nil { + log.Printf("Failed to get property _NET_WM_NAME: %v", err) + } else if len(nameReply.Value) > 0 { + fmt.Printf("Window name: %s\n", string(nameReply.Value)) + } + */ + + /* + // Get the atom for _NET_WM_NAME + atomReply, err := xproto.InternAtom(conn, true, uint16(len("_NET_WM_NAME")), "_NET_WM_NAME").Reply() + if err != nil { + log.Fatalf("Failed to intern atom _NET_WM_NAME: %v", err) + } else { + fmt.Printf("found atomic name: %s\n", string(atomReply.Value)) + } + netWmNameAtom := atomReply.Atom + */ + + /* + // Get the property for _NET_WM_NAME + nameReply, err := xproto.GetProperty(conn, false, child, netWmNameAtom, xproto.AtomString, 0, (1<<32)-1).Reply() + if err != nil { + log.Printf("Failed to get property _NET_WM_NAME: %v", err) + } else if len(nameReply.Value) > 0 { + fmt.Printf("Window name: %s\n", string(nameReply.Value)) + } + */ + + geomReply, err := xproto.GetGeometry(conn, xproto.Drawable(child)).Reply() + if err != nil { + fmt.Printf("err: %+v\n", err) + // fmt.Printf("child geomReply: %+v\n", geomReply) + } else { + fmt.Printf("child geomReply: %+v\n", geomReply) + } + + nameReply, err := xproto.GetProperty(conn, false, child, xproto.AtomWmName, xproto.AtomString, 0, (1<<32)-1).Reply() + if err != nil { + // fmt.Printf("child err: %+v\n", err) + } else { + fmt.Printf("child %+v nameReply: %+v %s\n", reflect.TypeOf(child), nameReply, string(nameReply.Value)) + } + if err != nil || len(nameReply.Value) == 0 { + continue + } + + name := string(nameReply.Value) + if name == "Terminal" { + target = child + break + } + } + + if target == 0 { + fmt.Println("Window not found.") + os.Exit(1) + } + + // Move the window to workspace 1 and set its geometry + xproto.ConfigureWindow(conn, target, xproto.ConfigWindowX|xproto.ConfigWindowY|xproto.ConfigWindowWidth|xproto.ConfigWindowHeight, + []uint32{100, 100, 800, 600}) + fmt.Println("Window moved and resized.") +} diff --git a/main.go b/main.go index 26bba0b..b295ba0 100644 --- a/main.go +++ b/main.go @@ -6,6 +6,7 @@ package main // An app to submit patches for the 30 GO GUI repos import ( + "fmt" "os" "go.wit.com/dev/alexflint/arg" @@ -18,7 +19,7 @@ var VERSION string var BUILDTIME string // used for shell auto completion -var ARGNAME string = "startxplacment" +var ARGNAME string = "startxplacement" // using this for now. triggers config save var configSave bool @@ -39,9 +40,18 @@ func main() { os.Exit(0) } + if argv.DumpX != nil { + doDumpX() + } + if argv.Dump != nil { - // doDump() - log.Info("dump here") + // 2. Get the current state of all terminal windows. + currentStates, err := getCurrentState() + if err != nil { + fmt.Printf("Error getting current window state: %v\n", err) + return + } + fmt.Printf("%v\n", currentStates) okExit("") } diff --git a/stuff.go.disabled b/stuff.go.disabled deleted file mode 100644 index e50ff3d..0000000 --- a/stuff.go.disabled +++ /dev/null @@ -1,121 +0,0 @@ -package main - -import ( - "fmt" - "os" - "reflect" - - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" -) - -func main() { - conn, err := xgb.NewConn() - if err != nil { - fmt.Println("Failed to connect to X server:", err) - os.Exit(1) - } - defer conn.Close() - - /* - // Start the terminal (replace with your app) - go func() { - if err := exec.Command("mate-terminal", "--title", "Workspace1-Terminal").Start(); err != nil { - fmt.Println("Error starting terminal:", err) - } - }() - - // Wait for the window to appear - time.Sleep(2 * time.Second) - */ - - // Get the root window - setup := xproto.Setup(conn) - root := setup.DefaultScreen(conn).Root - - // List children windows - reply, err := xproto.QueryTree(conn, root).Reply() - if err != nil { - fmt.Println("Failed to query windows:", err) - os.Exit(1) - } - - // Find the window with the specified title - var target xproto.Window - for _, child := range reply.Children { - // fmt.Printf("child: %+v\n", child) - /* - // Get the atom for _NET_WM_NAME - atomReply, err := xproto.InternAtom(conn, true, uint16(len("_NET_WM_NAME")), "_NET_WM_NAME").Reply() - if err != nil { - log.Fatalf("Failed to intern atom _NET_WM_NAME: %v", err) - } - netWmNameAtom := atomReply.Atom // Correct field to use - */ - - /* - // Get the property for _NET_WM_NAME - nameReply, err := xproto.GetProperty(conn, false, child, netWmNameAtom, xproto.AtomString, 0, (1<<32)-1).Reply() - if err != nil { - log.Printf("Failed to get property _NET_WM_NAME: %v", err) - } else if len(nameReply.Value) > 0 { - fmt.Printf("Window name: %s\n", string(nameReply.Value)) - } - */ - - /* - // Get the atom for _NET_WM_NAME - atomReply, err := xproto.InternAtom(conn, true, uint16(len("_NET_WM_NAME")), "_NET_WM_NAME").Reply() - if err != nil { - log.Fatalf("Failed to intern atom _NET_WM_NAME: %v", err) - } else { - fmt.Printf("found atomic name: %s\n", string(atomReply.Value)) - } - netWmNameAtom := atomReply.Atom - */ - - /* - // Get the property for _NET_WM_NAME - nameReply, err := xproto.GetProperty(conn, false, child, netWmNameAtom, xproto.AtomString, 0, (1<<32)-1).Reply() - if err != nil { - log.Printf("Failed to get property _NET_WM_NAME: %v", err) - } else if len(nameReply.Value) > 0 { - fmt.Printf("Window name: %s\n", string(nameReply.Value)) - } - */ - - geomReply, err := xproto.GetGeometry(conn, xproto.Drawable(child)).Reply() - if err != nil { - fmt.Printf("err: %+v\n", err) - // fmt.Printf("child geomReply: %+v\n", geomReply) - } else { - fmt.Printf("child geomReply: %+v\n", geomReply) - } - - nameReply, err := xproto.GetProperty(conn, false, child, xproto.AtomWmName, xproto.AtomString, 0, (1<<32)-1).Reply() - if err != nil { - // fmt.Printf("child err: %+v\n", err) - } else { - fmt.Printf("child %+v nameReply: %+v %s\n", reflect.TypeOf(child), nameReply, string(nameReply.Value)) - } - if err != nil || len(nameReply.Value) == 0 { - continue - } - - name := string(nameReply.Value) - if name == "Terminal" { - target = child - break - } - } - - if target == 0 { - fmt.Println("Window not found.") - os.Exit(1) - } - - // Move the window to workspace 1 and set its geometry - xproto.ConfigureWindow(conn, target, xproto.ConfigWindowX|xproto.ConfigWindowY|xproto.ConfigWindowWidth|xproto.ConfigWindowHeight, - []uint32{100, 100, 800, 600}) - fmt.Println("Window moved and resized.") -} -- cgit v1.2.3