use swayipc 0.3.0

use renamed ipc module
swich to i3ipc library
2025-12-16 20:11:02 +01:00 · 2025-08-16 21:02:39 +02:00 · 2025-08-16 19:59:32 +02:00 · 2025-08-15 12:31:22 +02:00
9 changed files with 122 additions and 240 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,87 @@
+name: build-release
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  release:
+    name: Build Release Assets
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.23.5
+
+      - name: Build the executables
+        run: ./mkrel.sh swaycycle ${{ github.ref_name}}
+
+      - name: List the executables
+        run: ls -l ./releases
+
+      - name: Upload the binaries
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+          file: ./releases/*
+          file_glob: true
+
+      - name: Build Changelog
+        id: github_release
+        uses: mikepenz/release-changelog-builder-action@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: "PR"
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}",
+              "pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}",
+              "empty_template": "- no changes",
+              "categories": [
+                {
+                    "title": "## New Features",
+                    "labels": ["add", "feature"]
+                },
+                {
+                    "title": "## Bug Fixes",
+                    "labels": ["fix", "bug", "revert"]
+                },
+                {
+                    "title": "## Documentation Enhancements",
+                    "labels": ["doc"]
+                },
+                {
+                    "title": "## Refactoring Efforts",
+                    "labels": ["refactor"]
+                },
+                {
+                    "title": "## Miscellaneus Changes",
+                    "labels": []
+                }
+              ],
+              "ignore_labels": [
+                 "duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix"
+              ],
+              "label_extractor": [
+                 {
+                    "pattern": "(.) (.+)",
+                    "target": "$1"
+                 },
+                 {
+                    "pattern": "(.) (.+)",
+                    "target": "$1",
+                    "on_property": "title"
+                 }
+              ]
+            }
+    
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          body: ${{steps.github_release.outputs.changelog}}
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,65 +0,0 @@
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
-
-version: 2
-
-before:
-  hooks:
-    - go mod tidy
-
-gitea_urls:
-  api: https://codeberg.org/api/v1
-  download: https://codeberg.org
-  
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - freebsd
-
-archives:
-  - formats: [tar.gz]
-    # this name template makes the OS and Arch compatible with the results of `uname`.
-    name_template: >-
-      {{ .ProjectName }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}_{{ .Tag }}
-    # use zip for windows archives
-    format_overrides:
-      - goos: windows
-        formats: [zip]
-      - goos: linux
-        formats: [tar.gz,binary]
-    files:
-      - src: "*.md"
-        strip_parent: true
-      - src: Makefile.dist
-        dst: Makefile
-    wrap_in_directory: true
-
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
-  groups:
-    - title: Improved
-      regexp: '^.*?(feat|add|new)(\([[:word:]]+\))??!?:.+$'
-      order: 0
-    - title: Fixed
-      regexp: '^.*?(bug|fix)(\([[:word:]]+\))??!?:.+$'
-      order: 1
-    - title: Changed
-      order: 999
-
-release:
-  header: "# Release Notes"
-  footer: >-
-
-    ---
-
-    Full Changelog: [{{ .PreviousTag }}...{{ .Tag }}](https://codeberg.org/scip/swaycycle/compare/{{ .PreviousTag }}...{{ .Tag }})
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -1,36 +0,0 @@
-matrix:
-  platform:
-    - linux/amd64
-  goversion:
-    - 1.24
-
-labels:
-  platform: ${platform}
-    
-steps:
-  build:
-    when:
-      event: [push]
-    image: golang:${goversion}
-    commands:
-      - go get
-      - go build
-
-  linter:
-    when:
-      event: [push]
-    image: golang:${goversion}
-    commands:
-      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
-      - golangci-lint --version
-      - golangci-lint run ./...
-    depends_on: [build]
-
-  test:
-    when:
-      event: [push]
-    image: golang:${goversion}
-    commands:
-      - go get
-      - go test -v -cover
-    depends_on: [build,linter]
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -1,15 +0,0 @@
-# build release
-
-labels:
-  platform: linux/amd64
-    
-steps:
-  goreleaser:
-    image: goreleaser/goreleaser
-    when:
-      event: [tag]
-    environment:
-      GITEA_TOKEN:
-        from_secret: DEPLOY_TOKEN
-    commands:
-      - goreleaser release --clean --verbose
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -1,18 +0,0 @@
-# -*-make-*-
-
-.PHONY: install all
-
-tool   = rpn
-PREFIX = /usr/local
-UID    = root
-GID    = 0
-
-all:
-	@echo "Type 'sudo make install' to install the tool."
-	@echo "To change prefix, type 'sudo make install PREFIX=/opt'"
-
-install:
-	install -d -o $(UID) -g $(GID) $(PREFIX)/bin
-	install -d -o $(UID) -g $(GID) $(PREFIX)/share/doc
-	install -o $(UID) -g $(GID) -m 555 $(tool)  $(PREFIX)/sbin/
-	install -o $(UID) -g $(GID) -m 444 *.md $(PREFIX)/share/doc/
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-[![status-badge](https://ci.codeberg.org/api/badges/15562/status.svg)](https://ci.codeberg.org/repos/15562)
-[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/swaycycle/raw/branch/main/LICENSE)
-[![Go Report Card](https://goreportcard.com/badge/codeberg.org/scip/epuppy)](https://goreportcard.com/report/codeberg.org/scip/swaycycle)
-
 # swaycycle

 Cycle through  all visible windows  on a sway[fx]  workspace including
@@ -13,7 +9,7 @@ the tool to `ALT-tab` and there you go.
 ## Installation

 Download  the   binary  for   your  architecture  from   the  [release
-page](https://codeberg.org/scip/swaycycle/releases) and copy to
+page](https://github.com/TLINDEN/swaycycle/releases) and copy to
 some location within your `$PATH`.

 To  build  the  tool  from  source,  checkout  the  repo  and  execute
@@ -28,13 +24,6 @@ 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
@@ -80,7 +69,7 @@ best way for me to forget to do something.

 In order to report a bug,  unexpected behavior, feature requests or to
 submit    a    patch,    please    open   an    issue    on    github:
-https://codeberg.org/scip/swaycycle/issues.
+https://github.com/tlinden/swaycycle/issues.

 ## See also

@@ -98,7 +87,7 @@ T.v.Dein <tom AT vondein DOT org>

 ## Project homepage

-https://codeberg.org/scip/swaycycle
+https://github.com/tlinden/swaycycle

 ## Copyright and License

--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,16 @@ module swaycycle
 go 1.23

 require (
-	github.com/alecthomas/repr v0.5.1 // indirect
+	github.com/lmittmann/tint v1.1.2
+	github.com/mattn/go-isatty v0.0.20
+	github.com/spf13/pflag v1.0.7
+	github.com/tlinden/swayipc v0.3.0
+	github.com/tlinden/yadu v0.1.3
+)
+
+require (
 	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
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
-github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 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=
@@ -11,15 +9,17 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 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/tlinden/swayipc v0.0.0-20250816175030-177eecd4757f h1:SP/fEurr6crxQI+j85L61rMppsHmOlJwxVzXnCvYJ40=
+github.com/tlinden/swayipc v0.0.0-20250816175030-177eecd4757f/go.mod h1:JwlMIC7eBwV8soCt2UDqlAyBudobLo07ZvepIA0irY8=
+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=
+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=
--- a/main.go
+++ b/main.go
@@ -18,18 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main

 import (
-	"errors"
 	"fmt"
 	"io"
 	"log"
 	"log/slog"
 	"os"
 	"runtime/debug"
-	"sort"

 	"github.com/lmittmann/tint"
 	"github.com/mattn/go-isatty"
-	"github.com/tlinden/i3ipc"
+	"github.com/tlinden/swayipc"
 	"github.com/tlinden/yadu"

 	flag "github.com/spf13/pflag"
@@ -44,23 +42,14 @@ const (

 	LevelNotice = slog.Level(2)

-	VERSION = "v0.3.1"
-
-	IPC_HEADER_SIZE = 14
-	IPC_MAGIC       = "i3-ipc"
-
-	// message types
-	IPC_GET_TREE    = 4
-	IPC_RUN_COMMAND = 0
+	VERSION = "v0.4.0"
 )

 var (
-	Visibles         = []*i3ipc.Node{}
+	Visibles         = []*swayipc.Node{}
 	CurrentWorkspace = ""
-	Previous         = false
 	Debug            = false
 	Dumptree         = false
-	Dumpvisibles     = false
 	Version          = false
 	Verbose          = false
 	Notswitch        = false
@@ -73,22 +62,19 @@ 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

 Copyleft (L) 2025 Thomas von Dein.
-Licensed under the terms of the GNU GPL version 3.`
+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")
@@ -112,18 +98,14 @@ func main() {
 		if err != nil {
 			log.Fatalf("Failed to open logfile %s: %s", Logfile, err)
 		}
-		defer func() {
-			if err := file.Close(); err != nil {
-				log.Fatalf("failed to close log file: %s", err)
-			}
-		}()
+		defer file.Close()
 		setupLogging(file)
 	} else {
 		setupLogging(os.Stdout)
 	}

 	// connect to sway unix socket
-	ipc := i3ipc.NewI3ipc()
+	ipc := swayipc.NewSwayIPC()

 	err := ipc.Connect()
 	if err != nil {
@@ -145,27 +127,19 @@ func main() {
 		os.Exit(0)
 	}

-	id := 0
-	if Previous {
-		id = findPrevWindow()
-		slog.Debug("findPrevWindow", "nextid", id)
-	} else {
-		id = findNextWindow()
-		slog.Debug("findNextWindow", "nextid", id)
-	}
+	id := findNextWindow()
+	slog.Debug("findNextWindow", "nextid", id)

 	if id > 0 && !Notswitch {
-		if err := switchFocus(id, ipc); err != nil {
-			log.Fatalf("%s", err)
-		}
+		switchFocus(id, ipc)
 	}
 }

 // 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")
+		return fmt.Errorf("Invalid or empty JSON structure")
 	}

 	if Dumptree {
@@ -181,9 +155,7 @@ func processJSON(sway *i3ipc.Node) error {
 		}
 	}

-	if Dumpvisibles {
-		dumpVisibles()
-	}
+	slog.Debug("processed visible windows", "visibles", Visibles)

 	return nil
 }
@@ -215,29 +187,11 @@ 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 {
+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)",
+		log.Fatalf("failed to send focus command to container %d: %w (%s)",
 			id, responses[0].Error, err)
 	}

@@ -247,19 +201,13 @@ 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 {
+		// 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
 			}
@@ -279,16 +227,6 @@ 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{}
@@ -330,7 +268,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
Author	SHA1	Message	Date
Thomas von Dein	83ab028c66	use swayipc 0.3.0	2025-08-16 21:02:39 +02:00
Thomas von Dein	ab8b3a7816	use renamed ipc module	2025-08-16 19:59:32 +02:00
Thomas von Dein	14cc48feb4	swich to i3ipc library	2025-08-15 12:31:22 +02:00