From 60081f9dced6db7e89f886943d70cca4dc9e45cc Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Sat, 22 Aug 2026 20:26:53 +0200 Subject: [PATCH] update to go 1.26, update to SwayIPC v2 --- go.mod | 20 +++++++++++--------- go.sum | 20 +++++++++++++++----- main.go | 34 +++++++++++++++++----------------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index b9f0774..9206140 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,18 @@ module swaycycle -go 1.23 +go 1.26 + +require ( + codeberg.org/scip/swayipc/v2 v2.1.0 + github.com/lmittmann/tint v1.1.3 + github.com/mattn/go-isatty v0.0.24 + github.com/spf13/pflag v1.0.10 + github.com/tlinden/yadu v0.1.3 +) require ( - github.com/alecthomas/repr v0.5.1 // indirect github.com/fatih/color v1.16.0 // indirect - github.com/lmittmann/tint v1.1.2 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/spf13/pflag v1.0.7 // indirect - github.com/tlinden/i3ipc v0.0.0-20250815101608-4f7e27528be3 // indirect - github.com/tlinden/yadu v0.1.3 // indirect - golang.org/x/sys v0.14.0 // indirect + github.com/mattn/go-colorable v0.1.15 // indirect + golang.org/x/sys v0.29.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index ed36845..8a95376 100644 --- a/go.sum +++ b/go.sum @@ -1,25 +1,35 @@ -github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg= -github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= +codeberg.org/scip/swayipc/v2 v2.1.0 h1:tBiOBOUFDOA38+acZwx4BO5Yo/VVwxbqkL+R2/zmW6c= +codeberg.org/scip/swayipc/v2 v2.1.0/go.mod h1:cqicjgMgPS7tGTJgjqjSMvnLeMA+J3to/YnufcysCns= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/lmittmann/tint v1.1.2 h1:2CQzrL6rslrsyjqLDwD11bZ5OpLBPU+g3G/r5LSfS8w= github.com/lmittmann/tint v1.1.2/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= +github.com/lmittmann/tint v1.1.3 h1:Hv4EaHWXQr+GTFnOU4VKf8UvAtZgn0VuKT+G0wFlO3I= +github.com/lmittmann/tint v1.1.3/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY= +github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/tlinden/i3ipc v0.0.0-20250815101608-4f7e27528be3 h1:/kIZO4852sAVemXtqnsBid0r4Q1h87jDwHa8f7v1h5I= -github.com/tlinden/i3ipc v0.0.0-20250815101608-4f7e27528be3/go.mod h1:mc0toDHmgqgX6FpE69U5yMPnHuLTdekHRslSLDp8xSE= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/tlinden/swayipc v0.3.0 h1:hGNWeEZUZIHfeP+MxpAKsUzPf3YSJ0FYX2XEu/yqNXA= +github.com/tlinden/swayipc v0.3.0/go.mod h1:JwlMIC7eBwV8soCt2UDqlAyBudobLo07ZvepIA0irY8= github.com/tlinden/yadu v0.1.3 h1:5cRCUmj+l5yvlM2irtpFBIJwVV2DPEgYSaWvF19FtcY= github.com/tlinden/yadu v0.1.3/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 8b18307..54498d0 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* -Copyright © 2025 Thomas von Dein +Copyright © 2025-2026 Thomas von Dein This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ import ( "runtime/debug" "sort" + "codeberg.org/scip/swayipc/v2" "github.com/lmittmann/tint" "github.com/mattn/go-isatty" - "github.com/tlinden/i3ipc" "github.com/tlinden/yadu" flag "github.com/spf13/pflag" @@ -44,7 +44,7 @@ const ( LevelNotice = slog.Level(2) - VERSION = "v0.3.1" + VERSION = "v0.3.2" IPC_HEADER_SIZE = 14 IPC_MAGIC = "i3-ipc" @@ -55,7 +55,7 @@ const ( ) var ( - Visibles = []*i3ipc.Node{} + Visibles = []*swayipc.Node{} CurrentWorkspace = "" Previous = false Debug = false @@ -123,7 +123,7 @@ func main() { } // connect to sway unix socket - ipc := i3ipc.NewI3ipc() + ipc := swayipc.NewSwayIPC() err := ipc.Connect() if err != nil { @@ -163,7 +163,7 @@ func main() { // get into the sway tree, determine current workspace and extract all // its visible windows, store them in the global var Visibles -func processJSON(sway *i3ipc.Node) error { +func processJSON(sway *swayipc.Node) error { if !istype(sway, root) && len(sway.Nodes) == 0 { return errors.New("invalid or empty JSON structure") } @@ -173,9 +173,9 @@ func processJSON(sway *i3ipc.Node) error { } for _, node := range sway.Nodes { - if node.Current_workspace != "" { + if node.CurrentWorkspace != "" { // this is an output node containing the current workspace - CurrentWorkspace = node.Current_workspace + CurrentWorkspace = node.CurrentWorkspace recurseNodes(node.Nodes) break } @@ -204,12 +204,12 @@ func findNextWindow() int { } if seenfocused { - return node.Id + return node.ID } } if seenfocused { - return Visibles[0].Id + return Visibles[0].ID } return 0 @@ -221,20 +221,20 @@ func findPrevWindow() int { return 0 } - prevnode := Visibles[vislen-1].Id + prevnode := Visibles[vislen-1].ID for _, node := range Visibles { if node.Focused { return prevnode } - prevnode = node.Id + prevnode = node.ID } return 0 } // actually switch focus using a swaymsg command -func switchFocus(id int, ipc *i3ipc.I3ipc) error { +func switchFocus(id int, ipc *swayipc.SwayIPC) error { responses, err := ipc.RunContainerCommand(id, "focus") if err != nil { log.Fatalf("failed to send focus command to container %d: %s (%s)", @@ -247,7 +247,7 @@ func switchFocus(id int, ipc *i3ipc.I3ipc) error { } // iterate recursively over given node list extracting visible windows -func recurseNodes(nodes []*i3ipc.Node) { +func recurseNodes(nodes []*swayipc.Node) { for _, node := range nodes { if istype(node, workspace) { @@ -256,7 +256,7 @@ func recurseNodes(nodes []*i3ipc.Node) { //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 + return FloatVis[i].ID < FloatVis[j].ID }) //now we can handle nodes and floating_nodes identical node.Nodes = append(node.Nodes, FloatVis...) @@ -283,7 +283,7 @@ 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) + 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) @@ -330,7 +330,7 @@ func setupLogging(output io.Writer) { } // little helper to distinguish sway tree node types -func istype(nd *i3ipc.Node, which int) bool { +func istype(nd *swayipc.Node, which int) bool { switch nd.Type { case "root": return which == root