bump version

* add --prev option
* sort floating_nodes to avoid skipping floating windows

README.md

@@ -24,6 +24,13 @@ Add such a line to your sway config file (e.g. in `$HOME/.config/sway/config`):
 bindsym $mod+Tab exec ~/bin/swaycycle
 ```
 
+You may  also add  a second key  binding to do  the reverse,  which is
+sometimes very useful:
+
+```default
+bindsym $mod+Shift+Tab exec ~/bin/swaycycle --prev
+```
+
 ## Debugging
 
 You may call `swaycycle` in a terminal window on a workspace with at

main.go

@@ -24,6 +24,7 @@ import (
 	"log/slog"
 	"os"
 	"runtime/debug"
+	"sort"
 
 	"github.com/lmittmann/tint"
 	"github.com/mattn/go-isatty"
@@ -42,7 +43,7 @@ const (
 
 	LevelNotice = slog.Level(2)
 
-	VERSION = "v0.3.0"
+	VERSION = "v0.3.1"
 
 	IPC_HEADER_SIZE = 14
 	IPC_MAGIC       = "i3-ipc"
@@ -55,8 +56,10 @@ const (
 var (
 	Visibles         = []*i3ipc.Node{}
 	CurrentWorkspace = ""
+	Previous         = false
 	Debug            = false
 	Dumptree         = false
+	Dumpvisibles     = false
 	Version          = false
 	Verbose          = false
 	Notswitch        = false
@@ -69,9 +72,11 @@ const Usage string = `This is swaycycle - cycle focus through all visible window
 Usage: swaycycle [-vdDn] [-l <log>]
 
 Options:
+  -p, --prev             cycle backward
   -n, --no-switch        do not switch windows
   -d, --debug            enable debugging
   -D, --dump             dump the sway tree (needs -d as well)
+      --dump-visibles    dump a list of visible windows on current workspace (needs -d)
   -l, --logfile string   write output to logfile
   -v, --version          show program version
 
@@ -80,8 +85,10 @@ Licensed under the terms of the GNU GPL version 3.
 `
 
 func main() {
+	flag.BoolVarP(&Previous, "prev", "p", false, "cycle backward")
 	flag.BoolVarP(&Debug, "debug", "d", false, "enable debugging")
 	flag.BoolVarP(&Dumptree, "dump", "D", false, "dump the sway tree (needs -d as well)")
+	flag.BoolVarP(&Dumpvisibles, "dump-visibles", "", false, "dump a list of visible windows on current workspace (needs -d)")
 	flag.BoolVarP(&Notswitch, "no-switch", "n", false, "do not switch windows")
 	flag.BoolVarP(&Version, "version", "v", false, "show program version")
 	flag.BoolVarP(&Showhelp, "help", "h", Showhelp, "show help")
@@ -134,8 +141,14 @@ func main() {
 		os.Exit(0)
 	}
 
-	id := findNextWindow()
-	slog.Debug("findNextWindow", "nextid", id)
+	id := 0
+	if Previous {
+		id = findPrevWindow()
+		slog.Debug("findPrevWindow", "nextid", id)
+	} else {
+		id = findNextWindow()
+		slog.Debug("findNextWindow", "nextid", id)
+	}
 
 	if id > 0 && !Notswitch {
 		switchFocus(id, ipc)
@@ -162,7 +175,9 @@ func processJSON(sway *i3ipc.Node) error {
 		}
 	}
 
-	slog.Debug("processed visible windows", "visibles", Visibles)
+	if Dumpvisibles {
+		dumpVisibles()
+	}
 
 	return nil
 }
@@ -194,6 +209,24 @@ func findNextWindow() int {
 	return 0
 }
 
+func findPrevWindow() int {
+	vislen := len(Visibles)
+	if vislen == 0 {
+		return 0
+	}
+
+	prevnode := Visibles[vislen-1].Id
+
+	for _, node := range Visibles {
+		if node.Focused {
+			return prevnode
+		}
+		prevnode = node.Id
+	}
+
+	return 0
+}
+
 // actually switch focus using a swaymsg command
 func switchFocus(id int, ipc *i3ipc.I3ipc) error {
 	responses, err := ipc.RunContainerCommand(id, "focus")
@@ -210,11 +243,17 @@ func switchFocus(id int, ipc *i3ipc.I3ipc) error {
 // iterate recursively over given node list extracting visible windows
 func recurseNodes(nodes []*i3ipc.Node) {
 	for _, node := range nodes {
-		// we handle nodes and floating_nodes identical
-		node.Nodes = append(node.Nodes, node.FloatingNodes...)
 
 		if istype(node, workspace) {
 			if node.Name == CurrentWorkspace {
+				//floating_nodes need to be sorted because
+				//order changes each time they are focused.
+				FloatVis := node.FloatingNodes
+				sort.Slice(FloatVis, func(i, j int) bool {
+					return FloatVis[i].Id < FloatVis[j].Id
+				})
+				//now we can handle nodes and floating_nodes identical
+				node.Nodes = append(node.Nodes, FloatVis...)
 				recurseNodes(node.Nodes)
 				return
 			}
@@ -234,6 +273,16 @@ func recurseNodes(nodes []*i3ipc.Node) {
 	}
 }
 
+func dumpVisibles() {
+	windows := make([]string, len(Visibles))
+
+	for idx, node := range Visibles {
+		windows[idx] = fmt.Sprintf("id: %02d, focus: %5t, name: %s", node.Id, node.Focused, node.Name)
+	}
+
+	slog.Debug("visible windows on current workspace", "visibles", windows)
+}
+
 // we use line wise logging, unless debugging is enabled
 func setupLogging(output io.Writer) {
 	logLevel := &slog.LevelVar{}