update swayipc, go, add linter cfg, satisfy linter

update to go 1.26, update to SwayIPC v2
migrate to codeberg (#1 )
2026-08-24 06:44:18 +02:00 · 2026-08-22 20:51:17 +02:00 · 2026-08-22 20:26:53 +02:00 · 2025-11-10 20:14:32 +01:00 · 2025-09-19 07:56:48 +02:00 · 2025-08-25 09:53:53 +02:00
12 changed files with 529 additions and 294 deletions
--- a/.github/assets/screenshot.png
+++ b/.github/assets/screenshot.png
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,87 +0,0 @@
-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/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,104 @@
+version: "2"
+
+linters:
+  enable:
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    - arangolint
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - canonicalheader
+    - clickhouselint
+    - containedctx
+    - copyloopvar
+    - cyclop
+    - decorder
+    - dogsled
+    - dupword
+    - durationcheck
+    - embeddedstructfieldcheck
+    - errchkjson
+    - errname
+    - exhaustive
+    - exptostd
+    - fatcontext
+    - funcorder
+    - funlen
+    - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecksumtype
+    - gocritic
+    - gocyclo
+    - godoclint
+    - goheader
+    - gomoddirectives
+    - gomodguard_v2
+    - goprintffuncname
+    - gosmopolitan
+    - grouper
+    - iface
+    - importas
+    - inamedparam
+    - interfacebloat
+    - intrange
+    - iotamixing
+    - lll
+    - loggercheck
+    - makezero
+    - misspell
+    - modernize
+    - nakedret
+    - nestif
+    - nilerr
+    - nilnesserr
+    - nlreturn
+    - nonamedreturns
+    - nosprintfhostport
+    - paralleltest
+    - perfsprint
+    - prealloc
+    - promlinter
+    - protogetter
+    - reassign
+    - recvcheck
+    - rowserrcheck
+    - sloglint
+    - spancheck
+    - sqlclosecheck
+    - tagalign
+    - testableexamples
+    - testifylint
+    - testpackage
+    - thelper
+    - tparallel
+    - unconvert
+    - unparam
+    - unqueryvet
+    - usestdlibvars
+    - usetesting
+    - varnamelen
+    - wastedassign
+    - whitespace
+    - wsl_v5
+    - zerologlint
+
+  settings:
+    varnamelen:
+      ignore-names:
+        - err
+        - wg
+        - mu
+        - ts
+        - to
+        - es
+        - op
+        - fd
+        - id
+        - fn
+      
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -0,0 +1,65 @@
+# 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
@@ -0,0 +1,38 @@
+matrix:
+  platform:
+    - linux/amd64
+  goversion:
+    - 1.26
+  lintversion:
+    - v2.12.2
+
+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 ${lintversion}
+      - 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
@@ -0,0 +1,15 @@
+# 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/5
+++ b/5
@@ -46,10 +46,7 @@ test: clean
 testlint: test lint

 lint:
-	golangci-lint run
-
-lint-full:
-	golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
+	golangci-lint run --show-stats=false

 testfuzzy: clean
 	go test -fuzz ./... $(ARGS)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -0,0 +1,18 @@
+# -*-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,3 +1,7 @@
+[![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
@@ -5,12 +9,16 @@ floating  ones or  windows  in sub-containers.   So  it simulates  the
 behavior of other window managers  and desktop environments. Just bind
 the tool to `ALT-tab` and there you go.

-![Screenshot](https://github.com/TLINDEN/swaycycle/blob/main/.github/assets/screenshot.png)

 ## Installation

-Checkout the repo and execute `make`. You'll need the go toolkit. Then
-copy the binary `swaycycle` to some location within your `$PATH`.
+Download  the   binary  for   your  architecture  from   the  [release
+page](https://codeberg.org/scip/swaycycle/releases) and copy to
+some location within your `$PATH`.
+
+To  build  the  tool  from  source,  checkout  the  repo  and  execute
+`make`. You'll need  the go toolkit. Then copy  the binary `swaycycle`
+to some location within your `$PATH`.

 ## Configuration

@@ -20,6 +28,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
@@ -35,6 +50,29 @@ It's also possible to debug an instance executed by sway using the
 bindsym $mod+Tab exec ~/bin/swaycycle -d -l /tmp/cycle.log
 ```

+## How does it work?
+
+`swaycycle` is being executed by sway when the user presses a key
+(e.g. `ALT-tab`). It then connects to the running sway instance via
+the provided IPC unix domain socket as available in the environment
+variable `SWAYSOCK`. Via that connection it sends the `GET_TREE`
+command and processes the retrieved JSON response. This JSON tree
+contains all information about the running instance such as outputs,
+workspaces and containers.
+
+Then it determines which workspace is the current active one and
+builds a list of all windows visible on that workspace, whether
+floating or not.
+
+Next it determines which window is following the one in the list with
+the current active focus. If the active one is at the end of the list,
+it starts from the top.
+
+Finally `swaycycle` sends the propper switch focus command via the IPC
+connection to sway, e.g.:
+
+`[con_id=14] focus`
+
 ## Getting help

 Although I'm happy to hear from swaycycle users in private email, that's the
@@ -42,7 +80,13 @@ 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://github.com/tlinden/swaycycle/issues.
+https://codeberg.org/scip/swaycycle/issues.
+
+## See also
+
+- [sway-ipc(7)](https://www.mankier.com/7/sway-ipc)
+- [swaywm](https://github.com/swaywm/sway/)
+- [swayfx](https://github.com/WillPower3309/swayfx)

 ## Copyright and license

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

 ## Project homepage

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

 ## Copyright and License

--- a/go.mod
+++ b/go.mod
@@ -1,15 +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/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
 )
--- a/go.sum
+++ b/go.sum
@@ -1,23 +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/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=
--- 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
@@ -18,16 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main

 import (
-	"bytes"
-	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log"
 	"log/slog"
 	"os"
-	"os/exec"
 	"runtime/debug"
+	"sort"

+	"codeberg.org/scip/swayipc/v2"
 	"github.com/lmittmann/tint"
 	"github.com/mattn/go-isatty"
 	"github.com/tlinden/yadu"
@@ -35,18 +35,6 @@ import (
 	flag "github.com/spf13/pflag"
 )

-type Node struct {
-	Id                int    `json:"id"`
-	Nodetype          string `json:"type"` // output, workspace or container
-	Name              string `json:"name"` // workspace number or app name
-	Nodes             []Node `json:"nodes"`
-	FloatingNodes     []Node `json:"floating_nodes"`
-	Focused           bool   `json:"focused"`
-	Window            int    `json:"window"` // wayland native
-	X11Window         string `json:"app_id"` // x11 compat
-	Current_workspace string `json:"current_workspace"`
-}
-
 const (
 	root = iota + 1
 	output
@@ -56,14 +44,16 @@ const (

 	LevelNotice = slog.Level(2)

-	VERSION = "v0.1.3"
+	VERSION = "v0.3.2"
 )

 var (
-	Visibles         = []Node{}
+	Visibles         = []*swayipc.Node{}
 	CurrentWorkspace = ""
+	Previous         = false
 	Debug            = false
 	Dumptree         = false
+	Dumpvisibles     = false
 	Version          = false
 	Verbose          = false
 	Notswitch        = false
@@ -73,26 +63,27 @@ var (

 const Usage string = `This is swaycycle - cycle focus through all visible windows on a sway workspace.

-Usage: swaycycle [-vVdDn] [-l <log>]
+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, --verbose          enable verbose logging
-  -V, --version          show program version
+  -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(&Verbose, "verbose", "v", false, "enable verbose logging")
+	flag.BoolVarP(&Dumpvisibles, "dump-visibles", "", false, "dump the sway tree (needs -d as well)")
 	flag.BoolVarP(&Notswitch, "no-switch", "n", false, "do not switch windows")
-	flag.BoolVarP(&Version, "version", "V", false, "show program version")
+	flag.BoolVarP(&Version, "version", "v", false, "show program version")
 	flag.BoolVarP(&Showhelp, "help", "h", Showhelp, "show help")

 	flag.StringVarP(&Logfile, "logfile", "l", "", "write output to logfile")
@@ -114,26 +105,200 @@ func main() {
 		if err != nil {
 			log.Fatalf("Failed to open logfile %s: %s", Logfile, err)
 		}
-		defer file.Close()
+		defer func() {
+			if err := file.Close(); err != nil {
+				log.Fatalf("failed to close log file: %s", err)
+			}
+		}()
+
 		setupLogging(file)
 	} else {
 		setupLogging(os.Stdout)
 	}

-	// fills Visibles node list
-	fetchSwayTree()
-
-	if len(Visibles) == 0 {
-		os.Exit(0)
-	}
-
-	id := findNextWindow()
-
-	if id > 0 && !Notswitch {
-		switchFocus(id)
+	if err := cycle(); err != nil {
+		log.Fatal(err) // nolint:gocritic
 	}
 }

+func cycle() error {
+	// connect to sway unix socket
+	ipc := swayipc.NewSwayIPC()
+
+	err := ipc.Connect()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := ipc.Close(); err != nil {
+			log.Fatal(err)
+		}
+	}()
+
+	sway, err := ipc.GetTree()
+	if err != nil {
+		return err
+	}
+
+	// traverse the tree and find visible windows
+	if err := processJSON(sway); err != nil {
+		return err
+	}
+
+	if len(Visibles) == 0 {
+		return nil
+	}
+
+	var id int
+	if Previous {
+		id = findPrevWindow()
+		slog.Debug("findPrevWindow", "nextid", id)
+	} else {
+		id = findNextWindow()
+		slog.Debug("findNextWindow", "nextid", id)
+	}
+
+	if id > 0 && !Notswitch {
+		if err := switchFocus(id, ipc); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// get into the sway tree, determine current workspace and extract all
+// its visible windows, store them in the global var Visibles
+func processJSON(sway *swayipc.Node) error {
+	if !istype(sway, root) && len(sway.Nodes) == 0 {
+		return errors.New("invalid or empty JSON structure")
+	}
+
+	if Dumptree {
+		slog.Debug("processed sway tree", "sway", sway)
+	}
+
+	for _, node := range sway.Nodes {
+		if node.CurrentWorkspace != "" {
+			// this is an output node containing the current workspace
+			CurrentWorkspace = node.CurrentWorkspace
+			recurseNodes(node.Nodes)
+
+			break
+		}
+	}
+
+	if Dumpvisibles {
+		dumpVisibles()
+	}
+
+	return nil
+}
+
+// find the next window after the  one with current focus. if the last
+// one has focus, return the first
+func findNextWindow() int {
+	if len(Visibles) == 0 {
+		return 0
+	}
+
+	seenfocused := false
+
+	for _, node := range Visibles {
+		if node.Focused {
+			seenfocused = true
+
+			continue
+		}
+
+		if seenfocused {
+			return node.ID
+		}
+	}
+
+	if seenfocused {
+		return Visibles[0].ID
+	}
+
+	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 *swayipc.SwayIPC) error {
+	responses, err := ipc.RunContainerCommand(id, "focus")
+	if err != nil {
+		return fmt.Errorf("failed to send focus command to container %d: %s (%s)",
+			id, responses[0].Error, err)
+	}
+
+	slog.Info("switched focus", "con_id", id)
+
+	return nil
+}
+
+// iterate recursively over given node list extracting visible windows
+func recurseNodes(nodes []*swayipc.Node) {
+	for _, node := range nodes {
+		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
+			}
+
+			// ignore other workspaces
+			continue
+		}
+
+		// the first nodes seen are workspaces, so if we see a con
+		// node, we are already inside the current workspace
+		if (istype(node, con) || istype(node, floating)) &&
+			(node.Window > 0 || node.X11Window != "") {
+			Visibles = append(Visibles, node)
+		} else {
+			recurseNodes(node.Nodes)
+		}
+	}
+}
+
+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{}

@@ -145,11 +310,7 @@ func setupLogging(output io.Writer) {
 			NoColor:   IsNoTty(),
 		}

-		if Verbose {
 		logLevel.Set(slog.LevelInfo)
-		} else {
-			logLevel.Set(LevelNotice)
-		}

 		handler := tint.NewHandler(output, opts)
 		logger := slog.New(handler)
@@ -172,165 +333,30 @@ func setupLogging(output io.Writer) {
 				slog.String("go_version", buildInfo.GoVersion),
 			),
 		)
+
 		slog.SetDefault(debuglogger)
 	}
 }

-// find the next window after the  one with current focus. if the last
-// one has focus, return the first
-func findNextWindow() int {
-	if len(Visibles) == 0 {
-		return 0
-	}
-
-	seenfocused := false
-
-	for _, node := range Visibles {
-		if node.Focused {
-			seenfocused = true
-			continue
-		}
-
-		if seenfocused {
-			return node.Id
-		}
-	}
-
-	if seenfocused {
-		return Visibles[0].Id
-	}
-
-	return 0
-}
-
-// actually switch focus using a swaymsg command
-func switchFocus(id int) {
-	var cmd *exec.Cmd
-	arg := fmt.Sprintf("[con_id=%d]", id)
-
-	slog.Debug("executing", "command", "swaymsg "+arg+" focus")
-
-	cmd = exec.Command("swaymsg", arg, "focus")
-
-	errbuf := &bytes.Buffer{}
-	cmd.Stderr = errbuf
-
-	out, err := cmd.Output()
-
-	if err != nil {
-		slog.Debug("failed to execute swaymsg", "output", out)
-		log.Fatalf("Failed to execute swaymsg to switch focus: %s", err)
-	}
-
-	if errbuf.String() != "" {
-		log.Fatalf("swaymsg error: %s", errbuf.String())
-	}
-
-	slog.Info("switched focus", "con_id", id)
-}
-
-// execute swaymsg to get its internal tree
-func fetchSwayTree() {
-	var cmd *exec.Cmd
-
-	slog.Debug("executing", "command", "swaymsg -t get_tree -r")
-
-	cmd = exec.Command("swaymsg", "-t", "get_tree", "-r")
-
-	errbuf := &bytes.Buffer{}
-	cmd.Stderr = errbuf
-
-	out, err := cmd.Output()
-
-	if err != nil {
-		log.Fatalf("Failed to execute swaymsg to get json tree: %s", err)
-	}
-
-	if errbuf.String() != "" {
-		log.Fatalf("swaymsg error: %s", errbuf.String())
-	}
-
-	if err := processJSON(out); err != nil {
-		log.Fatalf("%s", err)
-	}
-}
-
-func istype(nd Node, which int) bool {
-	switch nd.Nodetype {
+// istype is a little helper to distinguish sway tree node types
+func istype(nd *swayipc.Node, which int) bool {
+	switch nd.Type {
 	case "root":
-		return which == root
+		return which == swayipc.NodeTypeRoot
 	case "output":
-		return which == output
+		return which == swayipc.NodeTypeOutput
 	case "workspace":
-		return which == workspace
+		return which == swayipc.NodeTypeWorkspace
 	case "con":
-		return which == con
+		return which == swayipc.NodeTypeCon
 	case "floating_con":
-		return which == floating
+		return which == swayipc.NodeTypeFloating
 	}

 	return false
 }

-// get into the sway tree, determine current workspace and extract all
-// its visible windows, store them in the global var Visibles
-func processJSON(jsoncode []byte) error {
-	sway := Node{}
-
-	if err := json.Unmarshal(jsoncode, &sway); err != nil {
-		return fmt.Errorf("Failed to unmarshal json: %w", err)
-	}
-
-	if !istype(sway, root) && len(sway.Nodes) == 0 {
-		return fmt.Errorf("Invalid or empty JSON structure")
-	}
-
-	if Dumptree {
-		slog.Debug("processed sway tree", "sway", sway)
-	}
-
-	for _, node := range sway.Nodes {
-		if node.Current_workspace != "" {
-			// this is an output node containing the current workspace
-			CurrentWorkspace = node.Current_workspace
-			recurseNodes(node.Nodes)
-			break
-		}
-	}
-
-	slog.Debug("processed visible windows", "visibles", Visibles)
-
-	return nil
-}
-
-// iterate recursively over given node list extracting visible windows
-func recurseNodes(nodes []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 {
-				recurseNodes(node.Nodes)
-				return
-			}
-
-			// ignore other workspaces
-			continue
-		}
-
-		// the first nodes seen are workspaces, so if we see a con
-		// node, we are already inside the current workspace
-		if (istype(node, con) || istype(node, floating)) &&
-			(node.Window > 0 || node.X11Window != "") {
-			Visibles = append(Visibles, node)
-		} else {
-			recurseNodes(node.Nodes)
-		}
-	}
-}
-
-// returns TRUE if stdout is NOT a tty or windows
+// IsNoTty returns TRUE if stdout is NOT a tty or windows
 func IsNoTty() bool {
 	if !isatty.IsTerminal(os.Stdout.Fd()) {
 		return true
Author	SHA1	Message	Date
Thomas von Dein	25d5c571ec	update swayipc, go, add linter cfg, satisfy linter	2026-08-22 20:51:17 +02:00
Thomas von Dein	60081f9dce	update to go 1.26, update to SwayIPC v2	2026-08-22 20:26:53 +02:00
T. von Dein	9703fd4ad0	migrate to codeberg (#1 )	2025-11-10 20:14:32 +01:00
dependabot[bot]	85a1e6530c	Bump actions/checkout from 4 to 5 (#5 )	2025-09-19 07:56:48 +02:00
Thomas von Dein	feba0f3580	bump version	2025-08-25 09:53:53 +02:00
Thomas von Dein	2fbb3ebc59	add doc about prev flag	2025-08-25 09:53:40 +02:00
T.v.Dein	8e48b42bad	enhance window switch debugging (#4 )	2025-08-25 09:02:14 +02:00
kkvark	7a5657b778	add --prev option and sort floating_nodes (#3 ) * add --prev option * sort floating_nodes to avoid skipping floating windows	2025-08-25 08:59:21 +02:00
Thomas von Dein	0bdef90f97	swich to i3ipc library	2025-08-15 12:32:33 +02:00
Thomas von Dein	3402df69b4	Merge branch 'main' of github.com:TLINDEN/swaycycle	2025-08-14 20:51:39 +02:00
Thomas von Dein	b21d8ebed9	duplicate error check	2025-08-14 20:51:14 +02:00
Thomas von Dein	a481cc7172	get rid screenshot, doesnt help anyone	2025-08-12 21:39:17 +02:00
Thomas von Dein	cb8421e6f6	cleanup doc	2025-08-12 21:38:24 +02:00
Thomas von Dein	051b68c266	little doc tweaks	2025-08-12 18:34:26 +02:00
Thomas von Dein	bde1301e2c	added links	2025-08-12 18:20:18 +02:00
Thomas von Dein	977c374197	get rid of os/exec and talk with sway directly via IPC	2025-08-12 18:20:18 +02:00
Thomas von Dein	4741481527	updated docs	2025-08-12 18:20:18 +02:00
Thomas von Dein	dacdc5c214	add doc about inner workings	2025-08-11 11:38:56 +02:00
Thomas von Dein	1bc1b2a963	added release hint	2025-08-11 09:41:17 +02:00