detached 6f718b0

refactor(wayland): import protocol bindings from go-wayland-bindings (#85)

Bump purego-libwayland to v0.9.0 (server runtime only) and add
go-wayland-bindings v0.1.0 for the server protocol packages. Rename
kdedecoration, tabletv2, wlrforeigntoplevel and wlroutputpower to their
new package names, and regenerate imagecapture with wlbgen -side server.
commit
6f718b0c4dbfa7bebff8853007af85f70bd487e2
author
bnema · · 2026-10-01 18:13 UTC
committer
GitHub · · 2026-10-01 18:13 UTC
parent
f5f82f7
signature
GPG UnverifiedB5690EEEBB952194 The key is unknown
100 files · +322 -318
Unified
UnifiedSplit
M examples/testime/main.go +1 -1
@@ -12,7 +12,7 @@ import (
1212 "os"
1313 "time"
1414
15- "github.com/bnema/purego-libwayland/protocol/inputmethod"
15+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
1616 "github.com/bnema/wlturbo"
1717 clientcore "github.com/bnema/wlturbo/protocol/core"
1818 clientime "github.com/bnema/wlturbo/protocol/inputmethod"
@@ -12,7 +12,7 @@ import (
12 "os"12 "os"
13 "time"13 "time"
14 14
15- "github.com/bnema/purego-libwayland/protocol/inputmethod"15+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
16 "github.com/bnema/wlturbo"16 "github.com/bnema/wlturbo"
17 clientcore "github.com/bnema/wlturbo/protocol/core"17 clientcore "github.com/bnema/wlturbo/protocol/core"
18 clientime "github.com/bnema/wlturbo/protocol/inputmethod"18 clientime "github.com/bnema/wlturbo/protocol/inputmethod"
M go.mod +2 -1
@@ -3,8 +3,9 @@ module github.com/bnema/neferwl
33 go 1.27
44
55 require (
6+ github.com/bnema/go-wayland-bindings v0.1.0
67 github.com/bnema/purego v0.13.0-bnema.1
7- github.com/bnema/purego-libwayland v0.8.0
8+ github.com/bnema/purego-libwayland v0.9.0
89 github.com/bnema/purego-vulkan v0.6.0
910 github.com/bnema/wlturbo v0.5.0
1011 github.com/bnema/zerowrap v1.4.1
@@ -3,8 +3,9 @@ module github.com/bnema/neferwl
3 go 1.273 go 1.27
4 4
5 require (5 require (
6+ github.com/bnema/go-wayland-bindings v0.1.0
6 github.com/bnema/purego v0.13.0-bnema.17 github.com/bnema/purego v0.13.0-bnema.1
7- github.com/bnema/purego-libwayland v0.8.08+ github.com/bnema/purego-libwayland v0.9.0
8 github.com/bnema/purego-vulkan v0.6.09 github.com/bnema/purego-vulkan v0.6.0
9 github.com/bnema/wlturbo v0.5.010 github.com/bnema/wlturbo v0.5.0
10 github.com/bnema/zerowrap v1.4.111 github.com/bnema/zerowrap v1.4.1
M go.sum +4 -2 generated file: collapsed
load diff
M internal/adapters/wayland/acquire_failure_test.go +1 -1
@@ -7,8 +7,8 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
1011 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "github.com/stretchr/testify/mock"
1313 "golang.org/x/sys/unix"
1414 )
@@ -7,8 +7,8 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "github.com/stretchr/testify/mock"12 "github.com/stretchr/testify/mock"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/activation.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "crypto/rand"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
1010 "github.com/bnema/purego-libwayland/server"
1111 )
1212
@@ -4,9 +4,9 @@ import (
4 "crypto/rand"4 "crypto/rand"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 )11 )
12 12
M internal/adapters/wayland/activation_test.go +1 -1
@@ -4,8 +4,8 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
78 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
99 "github.com/bnema/wlturbo"
1010 )
1111
@@ -4,8 +4,8 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
7 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
9 "github.com/bnema/wlturbo"9 "github.com/bnema/wlturbo"
10 )10 )
11 11
M internal/adapters/wayland/alpha.go +2 -2
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "math"
55
6- "github.com/bnema/purego-libwayland/protocol/alphamodifier"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
6+ "github.com/bnema/go-wayland-bindings/server/alphamodifier"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "math"4 "math"
5 5
6- "github.com/bnema/purego-libwayland/protocol/alphamodifier"6+ "github.com/bnema/go-wayland-bindings/server/alphamodifier"
7- "github.com/bnema/purego-libwayland/protocol/wayland"7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
M internal/adapters/wayland/alpha_test.go +2 -2
@@ -5,9 +5,9 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/alphamodifier"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
810 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/alphamodifier"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
1111 )
1212
1313 // contentMatching waits for a content of the window that matches want.
@@ -5,9 +5,9 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/alphamodifier"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/alphamodifier"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11 )11 )
12 12
13 // contentMatching waits for a content of the window that matches want.13 // contentMatching waits for a content of the window that matches want.
M internal/adapters/wayland/capture_admission_test.go +2 -2
@@ -5,10 +5,10 @@ import (
55 "testing"
66 "time"
77
8+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
810 "github.com/bnema/neferwl/internal/logging"
911 "github.com/bnema/neferwl/internal/ports"
10- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
1212 "github.com/bnema/wlturbo"
1313 "github.com/bnema/zerowrap"
1414 "golang.org/x/sys/unix"
@@ -5,10 +5,10 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
8 "github.com/bnema/neferwl/internal/logging"10 "github.com/bnema/neferwl/internal/logging"
9 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
10- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
12 "github.com/bnema/wlturbo"12 "github.com/bnema/wlturbo"
13 "github.com/bnema/zerowrap"13 "github.com/bnema/zerowrap"
14 "golang.org/x/sys/unix"14 "golang.org/x/sys/unix"
M internal/adapters/wayland/captureauth_test.go +2 -2
@@ -10,11 +10,11 @@ import (
1010 "testing"
1111 "time"
1212
13+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
14+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
1315 "github.com/bnema/neferwl/internal/adapters/captureallow"
1416 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
1517 "github.com/bnema/neferwl/internal/ports"
16- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
17- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
1818 "github.com/bnema/zerowrap"
1919 "github.com/stretchr/testify/mock"
2020 "golang.org/x/sys/unix"
@@ -10,11 +10,11 @@ import (
10 "testing"10 "testing"
11 "time"11 "time"
12 12
13+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
14+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
13 "github.com/bnema/neferwl/internal/adapters/captureallow"15 "github.com/bnema/neferwl/internal/adapters/captureallow"
14 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"16 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
15 "github.com/bnema/neferwl/internal/ports"17 "github.com/bnema/neferwl/internal/ports"
16- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
17- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
18 "github.com/bnema/zerowrap"18 "github.com/bnema/zerowrap"
19 "github.com/stretchr/testify/mock"19 "github.com/stretchr/testify/mock"
20 "golang.org/x/sys/unix"20 "golang.org/x/sys/unix"
M internal/adapters/wayland/clipboard.go +3 -3
@@ -1,9 +1,9 @@
11 package wayland
22
33 import (
4- "github.com/bnema/purego-libwayland/protocol/extdatacontrol"
5- "github.com/bnema/purego-libwayland/protocol/primaryselection"
6- "github.com/bnema/purego-libwayland/protocol/wayland"
4+ "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
5+ "github.com/bnema/go-wayland-bindings/server/primaryselection"
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
77 "github.com/bnema/purego-libwayland/server"
88 "golang.org/x/sys/unix"
99 )
@@ -1,9 +1,9 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4- "github.com/bnema/purego-libwayland/protocol/extdatacontrol"4+ "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
5- "github.com/bnema/purego-libwayland/protocol/primaryselection"5+ "github.com/bnema/go-wayland-bindings/server/primaryselection"
6- "github.com/bnema/purego-libwayland/protocol/wayland"6+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/purego-libwayland/server"7 "github.com/bnema/purego-libwayland/server"
8 "golang.org/x/sys/unix"8 "golang.org/x/sys/unix"
9 )9 )
M internal/adapters/wayland/clipboard_test.go +3 -3
@@ -5,10 +5,10 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
9+ "github.com/bnema/go-wayland-bindings/server/primaryselection"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
811 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/extdatacontrol"
10- "github.com/bnema/purego-libwayland/protocol/primaryselection"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "github.com/bnema/wlturbo"
1313 "golang.org/x/sys/unix"
1414 )
@@ -5,10 +5,10 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
9+ "github.com/bnema/go-wayland-bindings/server/primaryselection"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/extdatacontrol"
10- "github.com/bnema/purego-libwayland/protocol/primaryselection"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "github.com/bnema/wlturbo"12 "github.com/bnema/wlturbo"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/colormanagement.go +2 -2
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "math"
55
6- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
6+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "math"4 "math"
5 5
6- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"6+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
7- "github.com/bnema/purego-libwayland/protocol/wayland"7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
M internal/adapters/wayland/colormanagement_errors_test.go +2 -2
@@ -3,9 +3,9 @@ package wayland
33 import (
44 "testing"
55
6+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
68 "github.com/bnema/neferwl/internal/ports"
7- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
99 )
1010
1111 func TestColorManagerErrors(t *testing.T) {
@@ -3,9 +3,9 @@ package wayland
3 import (3 import (
4 "testing"4 "testing"
5 5
6+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
7- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9 )9 )
10 10
11 func TestColorManagerErrors(t *testing.T) {11 func TestColorManagerErrors(t *testing.T) {
M internal/adapters/wayland/colormanagement_test.go +2 -2
@@ -4,10 +4,10 @@ import (
44 "context"
55 "testing"
66
7+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/logging"
810 "github.com/bnema/neferwl/internal/ports"
9- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
1111 "github.com/bnema/wlturbo"
1212 )
1313
@@ -4,10 +4,10 @@ import (
4 "context"4 "context"
5 "testing"5 "testing"
6 6
7+ cm "github.com/bnema/go-wayland-bindings/server/colormanagement"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/logging"9 "github.com/bnema/neferwl/internal/logging"
8 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
9- cm "github.com/bnema/purego-libwayland/protocol/colormanagement"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11 "github.com/bnema/wlturbo"11 "github.com/bnema/wlturbo"
12 )12 )
13 13
M internal/adapters/wayland/colorrepresentation.go +2 -2
@@ -1,8 +1,8 @@
11 package wayland
22
33 import (
4- "github.com/bnema/purego-libwayland/protocol/colorrepresentation"
5- "github.com/bnema/purego-libwayland/protocol/wayland"
4+ "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
5+ "github.com/bnema/go-wayland-bindings/server/wayland"
66 "github.com/bnema/purego-libwayland/server"
77 )
88
@@ -1,8 +1,8 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4- "github.com/bnema/purego-libwayland/protocol/colorrepresentation"4+ "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
5- "github.com/bnema/purego-libwayland/protocol/wayland"5+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/purego-libwayland/server"6 "github.com/bnema/purego-libwayland/server"
7 )7 )
8 8
M internal/adapters/wayland/colorrepresentation_test.go +2 -2
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "testing"
55
6- cr "github.com/bnema/purego-libwayland/protocol/colorrepresentation"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
6+ cr "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
88 )
99
1010 func TestColorRepresentationProtocol(t *testing.T) {
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "testing"4 "testing"
5 5
6- cr "github.com/bnema/purego-libwayland/protocol/colorrepresentation"6+ cr "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
7- "github.com/bnema/purego-libwayland/protocol/wayland"7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 )8 )
9 9
10 func TestColorRepresentationProtocol(t *testing.T) {10 func TestColorRepresentationProtocol(t *testing.T) {
M internal/adapters/wayland/commit_hotpath_bench_test.go +3 -3
@@ -6,10 +6,10 @@ import (
66 "testing"
77 "time"
88
9+ "github.com/bnema/go-wayland-bindings/server/fifo"
10+ "github.com/bnema/go-wayland-bindings/server/viewporter"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
912 "github.com/bnema/neferwl/internal/logging"
10- "github.com/bnema/purego-libwayland/protocol/fifo"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
1313 "github.com/bnema/wlturbo"
1414 "golang.org/x/sys/unix"
1515 )
@@ -6,10 +6,10 @@ import (
6 "testing"6 "testing"
7 "time"7 "time"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/fifo"
10+ "github.com/bnema/go-wayland-bindings/server/viewporter"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
9 "github.com/bnema/neferwl/internal/logging"12 "github.com/bnema/neferwl/internal/logging"
10- "github.com/bnema/purego-libwayland/protocol/fifo"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13 "github.com/bnema/wlturbo"13 "github.com/bnema/wlturbo"
14 "golang.org/x/sys/unix"14 "golang.org/x/sys/unix"
15 )15 )
M internal/adapters/wayland/commit_lifecycle_test.go +6 -6
@@ -5,13 +5,13 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
10+ "github.com/bnema/go-wayland-bindings/server/viewporter"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
12+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
13+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
814 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/presentationtime"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1515 "github.com/bnema/purego-libwayland/server"
1616 )
1717
@@ -5,13 +5,13 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
10+ "github.com/bnema/go-wayland-bindings/server/viewporter"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
12+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
13+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/neferwl/internal/ports"14 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/presentationtime"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
15 "github.com/bnema/purego-libwayland/server"15 "github.com/bnema/purego-libwayland/server"
16 )16 )
17 17
M internal/adapters/wayland/constraints.go +4 -4
@@ -1,11 +1,11 @@
11 package wayland
22
33 import (
4+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
5+ "github.com/bnema/go-wayland-bindings/server/pointerwarp"
6+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
48 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
6- "github.com/bnema/purego-libwayland/protocol/pointerwarp"
7- "github.com/bnema/purego-libwayland/protocol/relativepointer"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -1,11 +1,11 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
5+ "github.com/bnema/go-wayland-bindings/server/pointerwarp"
6+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
4 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
6- "github.com/bnema/purego-libwayland/protocol/pointerwarp"
7- "github.com/bnema/purego-libwayland/protocol/relativepointer"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/constraints_test.go +5 -5
@@ -4,12 +4,12 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
8+ "github.com/bnema/go-wayland-bindings/server/pointerwarp"
9+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
712 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
9- "github.com/bnema/purego-libwayland/protocol/pointerwarp"
10- "github.com/bnema/purego-libwayland/protocol/relativepointer"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1313 "github.com/bnema/wlturbo"
1414 )
1515
@@ -4,12 +4,12 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
8+ "github.com/bnema/go-wayland-bindings/server/pointerwarp"
9+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
7 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
9- "github.com/bnema/purego-libwayland/protocol/pointerwarp"
10- "github.com/bnema/purego-libwayland/protocol/relativepointer"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"
13 "github.com/bnema/wlturbo"13 "github.com/bnema/wlturbo"
14 )14 )
15 15
M internal/adapters/wayland/cursor.go +4 -4
@@ -3,10 +3,10 @@ package wayland
33 import (
44 "context"
55
6+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
7+ "github.com/bnema/go-wayland-bindings/server/tablet"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
69 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/cursorshape"
8- "github.com/bnema/purego-libwayland/protocol/tabletv2"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 "github.com/bnema/purego-libwayland/server"
1111 )
1212
@@ -43,7 +43,7 @@ func (m cursorShapeManager) GetPointer(r *cursorshape.WpCursorShapeManagerV1, id
4343 }
4444
4545 // GetTabletToolV2 is unreachable: neferwl has no tablet global.
46-func (cursorShapeManager) GetTabletToolV2(*cursorshape.WpCursorShapeManagerV1, uint32, *tabletv2.ZwpTabletToolV2) {
46+func (cursorShapeManager) GetTabletToolV2(*cursorshape.WpCursorShapeManagerV1, uint32, *tablet.ZwpTabletToolV2) {
4747 }
4848
4949 type cursorShapeDevice struct{ server *Server }
@@ -3,10 +3,10 @@ package wayland
3 import (3 import (
4 "context"4 "context"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
7+ "github.com/bnema/go-wayland-bindings/server/tablet"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/cursorshape"
8- "github.com/bnema/purego-libwayland/protocol/tabletv2"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 )11 )
12 12
@@ -43,7 +43,7 @@ func (m cursorShapeManager) GetPointer(r *cursorshape.WpCursorShapeManagerV1, id
43 }43 }
44 44
45 // GetTabletToolV2 is unreachable: neferwl has no tablet global.45 // GetTabletToolV2 is unreachable: neferwl has no tablet global.
46-func (cursorShapeManager) GetTabletToolV2(*cursorshape.WpCursorShapeManagerV1, uint32, *tabletv2.ZwpTabletToolV2) {46+func (cursorShapeManager) GetTabletToolV2(*cursorshape.WpCursorShapeManagerV1, uint32, *tablet.ZwpTabletToolV2) {
47 }47 }
48 48
49 type cursorShapeDevice struct{ server *Server }49 type cursorShapeDevice struct{ server *Server }
M internal/adapters/wayland/cursor_test.go +2 -2
@@ -5,10 +5,10 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
810 "github.com/bnema/neferwl/internal/logging"
911 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/cursorshape"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "golang.org/x/sys/unix"
1313 )
1414
@@ -5,10 +5,10 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/neferwl/internal/logging"10 "github.com/bnema/neferwl/internal/logging"
9 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/cursorshape"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "golang.org/x/sys/unix"12 "golang.org/x/sys/unix"
13 )13 )
14 14
M internal/adapters/wayland/damage_test.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1010 "golang.org/x/sys/unix"
1111 )
1212
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
10 "golang.org/x/sys/unix"10 "golang.org/x/sys/unix"
11 )11 )
12 12
M internal/adapters/wayland/decoration.go +13 -13
@@ -1,10 +1,10 @@
11 package wayland
22
33 import (
4- "github.com/bnema/purego-libwayland/protocol/kdedecoration"
5- "github.com/bnema/purego-libwayland/protocol/wayland"
6- "github.com/bnema/purego-libwayland/protocol/xdgdecoration"
7- "github.com/bnema/purego-libwayland/protocol/xdgshell"
4+ "github.com/bnema/go-wayland-bindings/server/serverdecoration"
5+ "github.com/bnema/go-wayland-bindings/server/wayland"
6+ "github.com/bnema/go-wayland-bindings/server/xdgdecoration"
7+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -21,33 +21,33 @@ func registerDecoration(d *server.Display, s *Server) error {
2121 }
2222 // GTK only speaks KDE's older protocol: without it GTK4 draws its own
2323 // title bar.
24- return kdedecoration.NewOrgKdeKwinServerDecorationManagerGlobal(d, 1, func(c server.Client, v, id uint32) {
25- m, err := kdedecoration.NewOrgKdeKwinServerDecorationManager(c, int32(v), id, kdeManager{})
24+ return serverdecoration.NewOrgKdeKwinServerDecorationManagerGlobal(d, 1, func(c server.Client, v, id uint32) {
25+ m, err := serverdecoration.NewOrgKdeKwinServerDecorationManager(c, int32(v), id, kdeManager{})
2626 if err == nil {
27- m.SendDefaultMode(uint32(kdedecoration.OrgKdeKwinServerDecorationManagerModeServer))
27+ m.SendDefaultMode(uint32(serverdecoration.OrgKdeKwinServerDecorationManagerModeServer))
2828 }
2929 })
3030 }
3131
3232 type kdeManager struct{}
3333
34-func (kdeManager) Create(r *kdedecoration.OrgKdeKwinServerDecorationManager, id uint32, _ *wayland.Surface) {
35- if d, err := kdedecoration.NewOrgKdeKwinServerDecoration(r.Client(), r.Version(), id, kdeDecoration{}); err == nil {
36- d.SendMode(uint32(kdedecoration.OrgKdeKwinServerDecorationModeServer))
34+func (kdeManager) Create(r *serverdecoration.OrgKdeKwinServerDecorationManager, id uint32, _ *wayland.Surface) {
35+ if d, err := serverdecoration.NewOrgKdeKwinServerDecoration(r.Client(), r.Version(), id, kdeDecoration{}); err == nil {
36+ d.SendMode(uint32(serverdecoration.OrgKdeKwinServerDecorationModeServer))
3737 }
3838 }
3939
4040 type kdeDecoration struct{}
4141
42-func (kdeDecoration) Release(*kdedecoration.OrgKdeKwinServerDecoration) {}
42+func (kdeDecoration) Release(*serverdecoration.OrgKdeKwinServerDecoration) {}
4343
4444 // A requested mode is acknowledged as is: the protocol has no way to
4545 // refuse, and answering server to a client that insists on client-side
4646 // (Firefox) makes it ask again forever. The server default already makes
4747 // GTK drop its title bar.
4848 // Unknown modes are ignored: replacing them would restart the loop.
49-func (kdeDecoration) RequestMode(r *kdedecoration.OrgKdeKwinServerDecoration, mode uint32) {
50- if mode > uint32(kdedecoration.OrgKdeKwinServerDecorationModeServer) {
49+func (kdeDecoration) RequestMode(r *serverdecoration.OrgKdeKwinServerDecoration, mode uint32) {
50+ if mode > uint32(serverdecoration.OrgKdeKwinServerDecorationModeServer) {
5151 return
5252 }
5353 r.SendMode(mode)
@@ -1,10 +1,10 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4- "github.com/bnema/purego-libwayland/protocol/kdedecoration"4+ "github.com/bnema/go-wayland-bindings/server/serverdecoration"
5- "github.com/bnema/purego-libwayland/protocol/wayland"5+ "github.com/bnema/go-wayland-bindings/server/wayland"
6- "github.com/bnema/purego-libwayland/protocol/xdgdecoration"6+ "github.com/bnema/go-wayland-bindings/server/xdgdecoration"
7- "github.com/bnema/purego-libwayland/protocol/xdgshell"7+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
@@ -21,33 +21,33 @@ func registerDecoration(d *server.Display, s *Server) error {
21 }21 }
22 // GTK only speaks KDE's older protocol: without it GTK4 draws its own22 // GTK only speaks KDE's older protocol: without it GTK4 draws its own
23 // title bar.23 // title bar.
24- return kdedecoration.NewOrgKdeKwinServerDecorationManagerGlobal(d, 1, func(c server.Client, v, id uint32) {24+ return serverdecoration.NewOrgKdeKwinServerDecorationManagerGlobal(d, 1, func(c server.Client, v, id uint32) {
25- m, err := kdedecoration.NewOrgKdeKwinServerDecorationManager(c, int32(v), id, kdeManager{})25+ m, err := serverdecoration.NewOrgKdeKwinServerDecorationManager(c, int32(v), id, kdeManager{})
26 if err == nil {26 if err == nil {
27- m.SendDefaultMode(uint32(kdedecoration.OrgKdeKwinServerDecorationManagerModeServer))27+ m.SendDefaultMode(uint32(serverdecoration.OrgKdeKwinServerDecorationManagerModeServer))
28 }28 }
29 })29 })
30 }30 }
31 31
32 type kdeManager struct{}32 type kdeManager struct{}
33 33
34-func (kdeManager) Create(r *kdedecoration.OrgKdeKwinServerDecorationManager, id uint32, _ *wayland.Surface) {34+func (kdeManager) Create(r *serverdecoration.OrgKdeKwinServerDecorationManager, id uint32, _ *wayland.Surface) {
35- if d, err := kdedecoration.NewOrgKdeKwinServerDecoration(r.Client(), r.Version(), id, kdeDecoration{}); err == nil {35+ if d, err := serverdecoration.NewOrgKdeKwinServerDecoration(r.Client(), r.Version(), id, kdeDecoration{}); err == nil {
36- d.SendMode(uint32(kdedecoration.OrgKdeKwinServerDecorationModeServer))36+ d.SendMode(uint32(serverdecoration.OrgKdeKwinServerDecorationModeServer))
37 }37 }
38 }38 }
39 39
40 type kdeDecoration struct{}40 type kdeDecoration struct{}
41 41
42-func (kdeDecoration) Release(*kdedecoration.OrgKdeKwinServerDecoration) {}42+func (kdeDecoration) Release(*serverdecoration.OrgKdeKwinServerDecoration) {}
43 43
44 // A requested mode is acknowledged as is: the protocol has no way to44 // A requested mode is acknowledged as is: the protocol has no way to
45 // refuse, and answering server to a client that insists on client-side45 // refuse, and answering server to a client that insists on client-side
46 // (Firefox) makes it ask again forever. The server default already makes46 // (Firefox) makes it ask again forever. The server default already makes
47 // GTK drop its title bar.47 // GTK drop its title bar.
48 // Unknown modes are ignored: replacing them would restart the loop.48 // Unknown modes are ignored: replacing them would restart the loop.
49-func (kdeDecoration) RequestMode(r *kdedecoration.OrgKdeKwinServerDecoration, mode uint32) {49+func (kdeDecoration) RequestMode(r *serverdecoration.OrgKdeKwinServerDecoration, mode uint32) {
50- if mode > uint32(kdedecoration.OrgKdeKwinServerDecorationModeServer) {50+ if mode > uint32(serverdecoration.OrgKdeKwinServerDecorationModeServer) {
51 return51 return
52 }52 }
53 r.SendMode(mode)53 r.SendMode(mode)
M internal/adapters/wayland/decoration_test.go +6 -6
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/serverdecoration"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/kdedecoration"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 "github.com/bnema/wlturbo"
1111 )
1212
@@ -32,14 +32,14 @@ func TestKDEDecorationAcknowledgesMode(t *testing.T) {
3232 proxy := &kdeModeProxy{modes: make(chan uint32, 8)}
3333 proxy.SetID(deco)
3434 registerWireProxy(c, proxy)
35- requestProtocol(t, c, mgr, kdedecoration.OrgKdeKwinServerDecorationManagerRequestCreate, deco, surf)
36- requestProtocol(t, c, deco, kdedecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(kdedecoration.OrgKdeKwinServerDecorationModeClient))
35+ requestProtocol(t, c, mgr, serverdecoration.OrgKdeKwinServerDecorationManagerRequestCreate, deco, surf)
36+ requestProtocol(t, c, deco, serverdecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(serverdecoration.OrgKdeKwinServerDecorationModeClient))
3737 // An undefined mode gets no answer.
38- requestProtocol(t, c, deco, kdedecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(3))
38+ requestProtocol(t, c, deco, serverdecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(3))
3939 if err := c.Roundtrip(); err != nil {
4040 t.Fatal(err)
4141 }
42- for _, want := range []kdedecoration.OrgKdeKwinServerDecorationMode{kdedecoration.OrgKdeKwinServerDecorationModeServer, kdedecoration.OrgKdeKwinServerDecorationModeClient} {
42+ for _, want := range []serverdecoration.OrgKdeKwinServerDecorationMode{serverdecoration.OrgKdeKwinServerDecorationModeServer, serverdecoration.OrgKdeKwinServerDecorationModeClient} {
4343 select {
4444 case got := <-proxy.modes:
4545 if got != uint32(want) {
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/serverdecoration"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/kdedecoration"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 "github.com/bnema/wlturbo"10 "github.com/bnema/wlturbo"
11 )11 )
12 12
@@ -32,14 +32,14 @@ func TestKDEDecorationAcknowledgesMode(t *testing.T) {
32 proxy := &kdeModeProxy{modes: make(chan uint32, 8)}32 proxy := &kdeModeProxy{modes: make(chan uint32, 8)}
33 proxy.SetID(deco)33 proxy.SetID(deco)
34 registerWireProxy(c, proxy)34 registerWireProxy(c, proxy)
35- requestProtocol(t, c, mgr, kdedecoration.OrgKdeKwinServerDecorationManagerRequestCreate, deco, surf)35+ requestProtocol(t, c, mgr, serverdecoration.OrgKdeKwinServerDecorationManagerRequestCreate, deco, surf)
36- requestProtocol(t, c, deco, kdedecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(kdedecoration.OrgKdeKwinServerDecorationModeClient))36+ requestProtocol(t, c, deco, serverdecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(serverdecoration.OrgKdeKwinServerDecorationModeClient))
37 // An undefined mode gets no answer.37 // An undefined mode gets no answer.
38- requestProtocol(t, c, deco, kdedecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(3))38+ requestProtocol(t, c, deco, serverdecoration.OrgKdeKwinServerDecorationRequestRequestMode, uint32(3))
39 if err := c.Roundtrip(); err != nil {39 if err := c.Roundtrip(); err != nil {
40 t.Fatal(err)40 t.Fatal(err)
41 }41 }
42- for _, want := range []kdedecoration.OrgKdeKwinServerDecorationMode{kdedecoration.OrgKdeKwinServerDecorationModeServer, kdedecoration.OrgKdeKwinServerDecorationModeClient} {42+ for _, want := range []serverdecoration.OrgKdeKwinServerDecorationMode{serverdecoration.OrgKdeKwinServerDecorationModeServer, serverdecoration.OrgKdeKwinServerDecorationModeClient} {
43 select {43 select {
44 case got := <-proxy.modes:44 case got := <-proxy.modes:
45 if got != uint32(want) {45 if got != uint32(want) {
M internal/adapters/wayland/dmabuf.go +2 -2
@@ -6,9 +6,9 @@ import (
66 "os"
77 "slices"
88
9+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
911 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "github.com/bnema/purego-libwayland/server"
1313 "golang.org/x/sys/unix"
1414 )
@@ -6,9 +6,9 @@ import (
6 "os"6 "os"
7 "slices"7 "slices"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
9 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "github.com/bnema/purego-libwayland/server"12 "github.com/bnema/purego-libwayland/server"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/dmabuf_test.go +1 -1
@@ -6,9 +6,9 @@ import (
66 "testing"
77 "time"
88
9+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
910 "github.com/bnema/neferwl/internal/logging"
1011 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
1212 "github.com/bnema/wlturbo"
1313 "golang.org/x/sys/unix"
1414 )
@@ -6,9 +6,9 @@ import (
6 "testing"6 "testing"
7 "time"7 "time"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
9 "github.com/bnema/neferwl/internal/logging"10 "github.com/bnema/neferwl/internal/logging"
10 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
12 "github.com/bnema/wlturbo"12 "github.com/bnema/wlturbo"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/dmabuf_yuv_test.go +1 -1
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "testing"
55
6+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
67 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
88 "golang.org/x/sys/unix"
99 )
1010
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "testing"4 "testing"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
6 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
8 "golang.org/x/sys/unix"8 "golang.org/x/sys/unix"
9 )9 )
10 10
M internal/adapters/wayland/drmlease.go +1 -1
@@ -5,8 +5,8 @@ import (
55 "os"
66 "slices"
77
8+ "github.com/bnema/go-wayland-bindings/server/drmlease"
89 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/drmlease"
1010 "github.com/bnema/purego-libwayland/server"
1111 "golang.org/x/sys/unix"
1212 )
@@ -5,8 +5,8 @@ import (
5 "os"5 "os"
6 "slices"6 "slices"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/drmlease"
8 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/drmlease"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 "golang.org/x/sys/unix"11 "golang.org/x/sys/unix"
12 )12 )
M internal/adapters/wayland/drmlease_test.go +1 -1
@@ -7,9 +7,9 @@ import (
77 "testing"
88 "time"
99
10+ dl "github.com/bnema/go-wayland-bindings/server/drmlease"
1011 "github.com/bnema/neferwl/internal/logging"
1112 "github.com/bnema/neferwl/internal/ports"
12- dl "github.com/bnema/purego-libwayland/protocol/drmlease"
1313 "github.com/bnema/purego-libwayland/server"
1414 "github.com/bnema/wlturbo"
1515 "golang.org/x/sys/unix"
@@ -7,9 +7,9 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ dl "github.com/bnema/go-wayland-bindings/server/drmlease"
10 "github.com/bnema/neferwl/internal/logging"11 "github.com/bnema/neferwl/internal/logging"
11 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
12- dl "github.com/bnema/purego-libwayland/protocol/drmlease"
13 "github.com/bnema/purego-libwayland/server"13 "github.com/bnema/purego-libwayland/server"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "golang.org/x/sys/unix"15 "golang.org/x/sys/unix"
M internal/adapters/wayland/exclusion.go +2 -2
@@ -7,10 +7,10 @@ import (
77 "os"
88 "slices"
99
10+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
1012 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
1113 "github.com/bnema/neferwl/internal/ports"
12- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
1414 "github.com/bnema/purego-libwayland/server"
1515 )
1616
@@ -7,10 +7,10 @@ import (
7 "os"7 "os"
8 "slices"8 "slices"
9 9
10+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"12 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
11 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
12- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14 "github.com/bnema/purego-libwayland/server"14 "github.com/bnema/purego-libwayland/server"
15 )15 )
16 16
M internal/adapters/wayland/fifo.go +4 -4
@@ -4,11 +4,11 @@ import (
44 "sync"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/committiming"
8+ "github.com/bnema/go-wayland-bindings/server/contenttype"
9+ "github.com/bnema/go-wayland-bindings/server/fifo"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
711 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/committiming"
9- "github.com/bnema/purego-libwayland/protocol/contenttype"
10- "github.com/bnema/purego-libwayland/protocol/fifo"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "github.com/bnema/purego-libwayland/server"
1313 "golang.org/x/sys/unix"
1414 )
@@ -4,11 +4,11 @@ import (
4 "sync"4 "sync"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/committiming"
8+ "github.com/bnema/go-wayland-bindings/server/contenttype"
9+ "github.com/bnema/go-wayland-bindings/server/fifo"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/committiming"
9- "github.com/bnema/purego-libwayland/protocol/contenttype"
10- "github.com/bnema/purego-libwayland/protocol/fifo"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "github.com/bnema/purego-libwayland/server"12 "github.com/bnema/purego-libwayland/server"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/fifo_test.go +3 -3
@@ -4,10 +4,10 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/committiming"
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
710 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/committiming"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
1111 "github.com/bnema/wlturbo"
1212 "golang.org/x/sys/unix"
1313 )
@@ -4,10 +4,10 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/committiming"
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/committiming"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11 "github.com/bnema/wlturbo"11 "github.com/bnema/wlturbo"
12 "golang.org/x/sys/unix"12 "golang.org/x/sys/unix"
13 )13 )
M internal/adapters/wayland/foreigntoplevel.go +2 -2
@@ -5,9 +5,9 @@ import (
55 "encoding/binary"
66 "slices"
77
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
810 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
1111 "github.com/bnema/purego-libwayland/server"
1212 )
1313
@@ -5,9 +5,9 @@ import (
5 "encoding/binary"5 "encoding/binary"
6 "slices"6 "slices"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
8 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
11 "github.com/bnema/purego-libwayland/server"11 "github.com/bnema/purego-libwayland/server"
12 )12 )
13 13
M internal/adapters/wayland/foreigntoplevel_test.go +3 -3
@@ -7,10 +7,10 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1013 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1414 "github.com/bnema/wlturbo"
1515 )
1616
@@ -7,10 +7,10 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
10 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 )15 )
16 16
M internal/adapters/wayland/frames.go +1 -1
@@ -9,7 +9,7 @@ import (
99
1010 "github.com/bnema/neferwl/internal/ports"
1111
12- "github.com/bnema/purego-libwayland/protocol/wayland"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
1313 )
1414
1515 // Frame callbacks (wl_surface.frame) tell a client when to draw its next
@@ -9,7 +9,7 @@ import (
9 9
10 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
11 11
12- "github.com/bnema/purego-libwayland/protocol/wayland"12+ "github.com/bnema/go-wayland-bindings/server/wayland"
13 )13 )
14 14
15 // Frame callbacks (wl_surface.frame) tell a client when to draw its next15 // Frame callbacks (wl_surface.frame) tell a client when to draw its next
M internal/adapters/wayland/frames_test.go +1 -1
@@ -5,8 +5,8 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
89 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 )
1111
1212 func TestDueFramesAllocations(t *testing.T) {
@@ -5,8 +5,8 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 )10 )
11 11
12 func TestDueFramesAllocations(t *testing.T) {12 func TestDueFramesAllocations(t *testing.T) {
M internal/adapters/wayland/globals.go +1 -1
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "os"
55
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
67 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "os"4 "os"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
M internal/adapters/wayland/idle.go +16 -16
@@ -3,10 +3,10 @@ package wayland
33 import (
44 "time"
55
6+ "github.com/bnema/go-wayland-bindings/server/extidlenotify"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
69 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/extidlenotify"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
1010 "github.com/bnema/purego-libwayland/server"
1111 )
1212
@@ -28,7 +28,7 @@ type idleNotification struct {
2828
2929 // outputPower is one zwlr_output_power_v1.
3030 type outputPower struct {
31- res *wlroutputpower.ZwlrOutputPowerV1
31+ res *wlroutputpowermanagement.ZwlrOutputPowerV1
3232 output string
3333 }
3434
@@ -38,8 +38,8 @@ func registerIdle(d *server.Display, s *Server) error {
3838 }); err != nil {
3939 return err
4040 }
41- return wlroutputpower.NewZwlrOutputPowerManagerV1Global(d, 1, func(c server.Client, v, id uint32) {
42- _, _ = wlroutputpower.NewZwlrOutputPowerManagerV1(c, int32(v), id, powerManager{s})
41+ return wlroutputpowermanagement.NewZwlrOutputPowerManagerV1Global(d, 1, func(c server.Client, v, id uint32) {
42+ _, _ = wlroutputpowermanagement.NewZwlrOutputPowerManagerV1(c, int32(v), id, powerManager{s})
4343 })
4444 }
4545
@@ -138,13 +138,13 @@ func (s *Server) syncIdle(wasHeld bool) {
138138
139139 type powerManager struct{ server *Server }
140140
141-func (powerManager) Destroy(*wlroutputpower.ZwlrOutputPowerManagerV1) {}
141+func (powerManager) Destroy(*wlroutputpowermanagement.ZwlrOutputPowerManagerV1) {}
142142
143-func (m powerManager) GetOutputPower(r *wlroutputpower.ZwlrOutputPowerManagerV1, id uint32, wl *wayland.Output) {
143+func (m powerManager) GetOutputPower(r *wlroutputpowermanagement.ZwlrOutputPowerManagerV1, id uint32, wl *wayland.Output) {
144144 s := m.server
145145 o := s.outputOf(wl)
146146 p := &outputPower{}
147- res, err := wlroutputpower.NewZwlrOutputPowerV1(r.Client(), r.Version(), id, powerHandler{s, p})
147+ res, err := wlroutputpowermanagement.NewZwlrOutputPowerV1(r.Client(), r.Version(), id, powerHandler{s, p})
148148 if err != nil {
149149 return
150150 }
@@ -172,24 +172,24 @@ type powerHandler struct {
172172 p *outputPower
173173 }
174174
175-func (powerHandler) Destroy(*wlroutputpower.ZwlrOutputPowerV1) {}
175+func (powerHandler) Destroy(*wlroutputpowermanagement.ZwlrOutputPowerV1) {}
176176
177-func (h powerHandler) SetMode(r *wlroutputpower.ZwlrOutputPowerV1, mode uint32) {
178- if mode != uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff) && mode != uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn) {
179- r.PostError(uint32(wlroutputpower.ZwlrOutputPowerV1ErrorInvalidMode), "invalid mode")
177+func (h powerHandler) SetMode(r *wlroutputpowermanagement.ZwlrOutputPowerV1, mode uint32) {
178+ if mode != uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff) && mode != uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn) {
179+ r.PostError(uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ErrorInvalidMode), "invalid mode")
180180 return
181181 }
182182 if h.p.output == "" {
183183 return
184184 }
185- h.server.emit(ports.OutputPower{Output: h.p.output, On: mode == uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn)})
185+ h.server.emit(ports.OutputPower{Output: h.p.output, On: mode == uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn)})
186186 }
187187
188188 func powerMode(on bool) uint32 {
189189 if on {
190- return uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn)
190+ return uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn)
191191 }
192- return uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff)
192+ return uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff)
193193 }
194194
195195 // setOutputsOff applies core's power state: each object of an output
@@ -3,10 +3,10 @@ package wayland
3 import (3 import (
4 "time"4 "time"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/extidlenotify"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
6 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/extidlenotify"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 )11 )
12 12
@@ -28,7 +28,7 @@ type idleNotification struct {
28 28
29 // outputPower is one zwlr_output_power_v1.29 // outputPower is one zwlr_output_power_v1.
30 type outputPower struct {30 type outputPower struct {
31- res *wlroutputpower.ZwlrOutputPowerV131+ res *wlroutputpowermanagement.ZwlrOutputPowerV1
32 output string32 output string
33 }33 }
34 34
@@ -38,8 +38,8 @@ func registerIdle(d *server.Display, s *Server) error {
38 }); err != nil {38 }); err != nil {
39 return err39 return err
40 }40 }
41- return wlroutputpower.NewZwlrOutputPowerManagerV1Global(d, 1, func(c server.Client, v, id uint32) {41+ return wlroutputpowermanagement.NewZwlrOutputPowerManagerV1Global(d, 1, func(c server.Client, v, id uint32) {
42- _, _ = wlroutputpower.NewZwlrOutputPowerManagerV1(c, int32(v), id, powerManager{s})42+ _, _ = wlroutputpowermanagement.NewZwlrOutputPowerManagerV1(c, int32(v), id, powerManager{s})
43 })43 })
44 }44 }
45 45
@@ -138,13 +138,13 @@ func (s *Server) syncIdle(wasHeld bool) {
138 138
139 type powerManager struct{ server *Server }139 type powerManager struct{ server *Server }
140 140
141-func (powerManager) Destroy(*wlroutputpower.ZwlrOutputPowerManagerV1) {}141+func (powerManager) Destroy(*wlroutputpowermanagement.ZwlrOutputPowerManagerV1) {}
142 142
143-func (m powerManager) GetOutputPower(r *wlroutputpower.ZwlrOutputPowerManagerV1, id uint32, wl *wayland.Output) {143+func (m powerManager) GetOutputPower(r *wlroutputpowermanagement.ZwlrOutputPowerManagerV1, id uint32, wl *wayland.Output) {
144 s := m.server144 s := m.server
145 o := s.outputOf(wl)145 o := s.outputOf(wl)
146 p := &outputPower{}146 p := &outputPower{}
147- res, err := wlroutputpower.NewZwlrOutputPowerV1(r.Client(), r.Version(), id, powerHandler{s, p})147+ res, err := wlroutputpowermanagement.NewZwlrOutputPowerV1(r.Client(), r.Version(), id, powerHandler{s, p})
148 if err != nil {148 if err != nil {
149 return149 return
150 }150 }
@@ -172,24 +172,24 @@ type powerHandler struct {
172 p *outputPower172 p *outputPower
173 }173 }
174 174
175-func (powerHandler) Destroy(*wlroutputpower.ZwlrOutputPowerV1) {}175+func (powerHandler) Destroy(*wlroutputpowermanagement.ZwlrOutputPowerV1) {}
176 176
177-func (h powerHandler) SetMode(r *wlroutputpower.ZwlrOutputPowerV1, mode uint32) {177+func (h powerHandler) SetMode(r *wlroutputpowermanagement.ZwlrOutputPowerV1, mode uint32) {
178- if mode != uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff) && mode != uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn) {178+ if mode != uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff) && mode != uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn) {
179- r.PostError(uint32(wlroutputpower.ZwlrOutputPowerV1ErrorInvalidMode), "invalid mode")179+ r.PostError(uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ErrorInvalidMode), "invalid mode")
180 return180 return
181 }181 }
182 if h.p.output == "" {182 if h.p.output == "" {
183 return183 return
184 }184 }
185- h.server.emit(ports.OutputPower{Output: h.p.output, On: mode == uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn)})185+ h.server.emit(ports.OutputPower{Output: h.p.output, On: mode == uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn)})
186 }186 }
187 187
188 func powerMode(on bool) uint32 {188 func powerMode(on bool) uint32 {
189 if on {189 if on {
190- return uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn)190+ return uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn)
191 }191 }
192- return uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff)192+ return uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff)
193 }193 }
194 194
195 // setOutputsOff applies core's power state: each object of an output195 // setOutputsOff applies core's power state: each object of an output
M internal/adapters/wayland/idle_test.go +11 -11
@@ -5,12 +5,12 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/extidlenotify"
9+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
10+ "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
811 "github.com/bnema/neferwl/internal/logging"
912 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
1013 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/extidlenotify"
12- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
13- "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
1414 "github.com/bnema/wlturbo"
1515 "github.com/stretchr/testify/mock"
1616 )
@@ -131,14 +131,14 @@ func TestOutputPower(t *testing.T) {
131131 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")
132132 registerProtocol(t, c, mgr)
133133 id, p := newEventProxy(c)
134- requestProtocol(t, c, mgr, wlroutputpower.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
135- modeEv, failed := uint32(wlroutputpower.ZwlrOutputPowerV1EventMode), uint32(wlroutputpower.ZwlrOutputPowerV1EventFailed)
136- on, off := uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn), uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff)
134+ requestProtocol(t, c, mgr, wlroutputpowermanagement.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
135+ modeEv, failed := uint32(wlroutputpowermanagement.ZwlrOutputPowerV1EventMode), uint32(wlroutputpowermanagement.ZwlrOutputPowerV1EventFailed)
136+ on, off := uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn), uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff)
137137 if e := p.next(t, c, 2*time.Second); e != [2]uint32{modeEv, on} {
138138 t.Fatalf("initial %v", e)
139139 }
140140 name := testOutputs[0].Info.Name
141- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, off)
141+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, off)
142142 if v := clientEvent[ports.OutputPower](t, events); v != (ports.OutputPower{Output: name, On: false}) {
143143 t.Fatal(v)
144144 }
@@ -160,7 +160,7 @@ func TestOutputPower(t *testing.T) {
160160 }
161161 // Back with the same name: the failed object controls nothing.
162162 commands <- ports.SetOutputs{Outputs: testOutputs}
163- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, off)
163+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, off)
164164 if err := c.Roundtrip(); err != nil {
165165 t.Fatal(err)
166166 }
@@ -258,7 +258,7 @@ func TestOutputPowerInvalidMode(t *testing.T) {
258258 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")
259259 id := c.AllocateID()
260260 registerProtocol(t, c, id)
261- requestProtocol(t, c, mgr, wlroutputpower.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
262- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, uint32(7))
263- expectProtocolError(t, c, id, uint32(wlroutputpower.ZwlrOutputPowerV1ErrorInvalidMode))
261+ requestProtocol(t, c, mgr, wlroutputpowermanagement.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
262+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, uint32(7))
263+ expectProtocolError(t, c, id, uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ErrorInvalidMode))
264264 }
@@ -5,12 +5,12 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/extidlenotify"
9+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
10+ "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
8 "github.com/bnema/neferwl/internal/logging"11 "github.com/bnema/neferwl/internal/logging"
9 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"12 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
10 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/extidlenotify"
12- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
13- "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "github.com/stretchr/testify/mock"15 "github.com/stretchr/testify/mock"
16 )16 )
@@ -131,14 +131,14 @@ func TestOutputPower(t *testing.T) {
131 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")131 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")
132 registerProtocol(t, c, mgr)132 registerProtocol(t, c, mgr)
133 id, p := newEventProxy(c)133 id, p := newEventProxy(c)
134- requestProtocol(t, c, mgr, wlroutputpower.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)134+ requestProtocol(t, c, mgr, wlroutputpowermanagement.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
135- modeEv, failed := uint32(wlroutputpower.ZwlrOutputPowerV1EventMode), uint32(wlroutputpower.ZwlrOutputPowerV1EventFailed)135+ modeEv, failed := uint32(wlroutputpowermanagement.ZwlrOutputPowerV1EventMode), uint32(wlroutputpowermanagement.ZwlrOutputPowerV1EventFailed)
136- on, off := uint32(wlroutputpower.ZwlrOutputPowerV1ModeOn), uint32(wlroutputpower.ZwlrOutputPowerV1ModeOff)136+ on, off := uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOn), uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ModeOff)
137 if e := p.next(t, c, 2*time.Second); e != [2]uint32{modeEv, on} {137 if e := p.next(t, c, 2*time.Second); e != [2]uint32{modeEv, on} {
138 t.Fatalf("initial %v", e)138 t.Fatalf("initial %v", e)
139 }139 }
140 name := testOutputs[0].Info.Name140 name := testOutputs[0].Info.Name
141- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, off)141+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, off)
142 if v := clientEvent[ports.OutputPower](t, events); v != (ports.OutputPower{Output: name, On: false}) {142 if v := clientEvent[ports.OutputPower](t, events); v != (ports.OutputPower{Output: name, On: false}) {
143 t.Fatal(v)143 t.Fatal(v)
144 }144 }
@@ -160,7 +160,7 @@ func TestOutputPower(t *testing.T) {
160 }160 }
161 // Back with the same name: the failed object controls nothing.161 // Back with the same name: the failed object controls nothing.
162 commands <- ports.SetOutputs{Outputs: testOutputs}162 commands <- ports.SetOutputs{Outputs: testOutputs}
163- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, off)163+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, off)
164 if err := c.Roundtrip(); err != nil {164 if err := c.Roundtrip(); err != nil {
165 t.Fatal(err)165 t.Fatal(err)
166 }166 }
@@ -258,7 +258,7 @@ func TestOutputPowerInvalidMode(t *testing.T) {
258 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")258 mgr := bindProtocol(t, c, "zwlr_output_power_manager_v1")
259 id := c.AllocateID()259 id := c.AllocateID()
260 registerProtocol(t, c, id)260 registerProtocol(t, c, id)
261- requestProtocol(t, c, mgr, wlroutputpower.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)261+ requestProtocol(t, c, mgr, wlroutputpowermanagement.ZwlrOutputPowerManagerV1RequestGetOutputPower, id, output)
262- requestProtocol(t, c, id, wlroutputpower.ZwlrOutputPowerV1RequestSetMode, uint32(7))262+ requestProtocol(t, c, id, wlroutputpowermanagement.ZwlrOutputPowerV1RequestSetMode, uint32(7))
263- expectProtocolError(t, c, id, uint32(wlroutputpower.ZwlrOutputPowerV1ErrorInvalidMode))263+ expectProtocolError(t, c, id, uint32(wlroutputpowermanagement.ZwlrOutputPowerV1ErrorInvalidMode))
264 }264 }
M internal/adapters/wayland/imagecapture/gen.sh +4 -8
@@ -1,12 +1,8 @@
11 #!/bin/sh
2-# Regenerates imagecapture.go from neferwl-image-capture-v1.xml with the wlgen
3-# of the purego-libwayland module in use (offline: go.work or the module cache).
2+# Regenerates imagecapture.go from neferwl-image-capture-v1.xml with the wlbgen
3+# of the go-wayland-bindings module in use (offline: go.work or the module cache).
44 set -eu
55 cd "$(dirname "$0")"
6-mod=$(go list -m -f '{{.Dir}}' github.com/bnema/purego-libwayland)
7-go run github.com/bnema/purego-libwayland/cmd/wlgen -package imagecapture -out imagecapture.go \
8- -import wayland=github.com/bnema/purego-libwayland/protocol/wayland -import-xml wayland="$mod/protocols/wayland.xml" \
9- -import extworkspace=github.com/bnema/purego-libwayland/protocol/extworkspace -import-xml extworkspace="$mod/protocols/ext-workspace-v1.xml" \
10- -import extimagecapturesource=github.com/bnema/purego-libwayland/protocol/extimagecapturesource -import-xml extimagecapturesource="$mod/protocols/ext-image-capture-source-v1.xml" \
11- -import extimagecopycapture=github.com/bnema/purego-libwayland/protocol/extimagecopycapture -import-xml extimagecopycapture="$mod/protocols/ext-image-copy-capture-v1.xml" \
6+go run github.com/bnema/go-wayland-bindings/cmd/wlbgen -side server \
7+ -package imagecapture -out imagecapture.go \
128 neferwl-image-capture-v1.xml
@@ -1,12 +1,8 @@
1 #!/bin/sh1 #!/bin/sh
2-# Regenerates imagecapture.go from neferwl-image-capture-v1.xml with the wlgen2+# Regenerates imagecapture.go from neferwl-image-capture-v1.xml with the wlbgen
3-# of the purego-libwayland module in use (offline: go.work or the module cache).3+# of the go-wayland-bindings module in use (offline: go.work or the module cache).
4 set -eu4 set -eu
5 cd "$(dirname "$0")"5 cd "$(dirname "$0")"
6-mod=$(go list -m -f '{{.Dir}}' github.com/bnema/purego-libwayland)6+go run github.com/bnema/go-wayland-bindings/cmd/wlbgen -side server \
7-go run github.com/bnema/purego-libwayland/cmd/wlgen -package imagecapture -out imagecapture.go \7+ -package imagecapture -out imagecapture.go \
8- -import wayland=github.com/bnema/purego-libwayland/protocol/wayland -import-xml wayland="$mod/protocols/wayland.xml" \
9- -import extworkspace=github.com/bnema/purego-libwayland/protocol/extworkspace -import-xml extworkspace="$mod/protocols/ext-workspace-v1.xml" \
10- -import extimagecapturesource=github.com/bnema/purego-libwayland/protocol/extimagecapturesource -import-xml extimagecapturesource="$mod/protocols/ext-image-capture-source-v1.xml" \
11- -import extimagecopycapture=github.com/bnema/purego-libwayland/protocol/extimagecopycapture -import-xml extimagecopycapture="$mod/protocols/ext-image-copy-capture-v1.xml" \
12 neferwl-image-capture-v1.xml8 neferwl-image-capture-v1.xml
M internal/adapters/wayland/imagecapture/imagecapture.go +10 -5
@@ -1,12 +1,17 @@
1-// Code generated by wlgen; DO NOT EDIT.
1+// Code generated by wlbgen; DO NOT EDIT.
2+
3+// Upstream protocol copyright and license:
4+// neferwl private protocol. No stability promise beyond the version of the
5+// interface.
6+
27 package imagecapture
38
49 import (
510 "fmt"
6- extimagecapturesource "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
7- extimagecopycapture "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
8- extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"
9- wayland "github.com/bnema/purego-libwayland/protocol/wayland"
11+ extimagecapturesource "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
12+ extimagecopycapture "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
13+ extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
14+ wayland "github.com/bnema/go-wayland-bindings/server/wayland"
1015 "github.com/bnema/purego-libwayland/server"
1116 "runtime"
1217 )
@@ -1,12 +1,17 @@
1-// Code generated by wlgen; DO NOT EDIT.1+// Code generated by wlbgen; DO NOT EDIT.
2+
3+// Upstream protocol copyright and license:
4+// neferwl private protocol. No stability promise beyond the version of the
5+// interface.
6+
2 package imagecapture7 package imagecapture
3 8
4 import (9 import (
5 "fmt"10 "fmt"
6- extimagecapturesource "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"11+ extimagecapturesource "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
7- extimagecopycapture "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"12+ extimagecopycapture "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
8- extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"13+ extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
9- wayland "github.com/bnema/purego-libwayland/protocol/wayland"14+ wayland "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/purego-libwayland/server"15 "github.com/bnema/purego-libwayland/server"
11 "runtime"16 "runtime"
12 )17 )
M internal/adapters/wayland/imagecapture_test.go +6 -6
@@ -8,15 +8,15 @@ import (
88 "testing"
99 "time"
1010
11+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
12+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
13+ extws "github.com/bnema/go-wayland-bindings/server/extworkspace"
14+ "github.com/bnema/go-wayland-bindings/server/wayland"
15+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
16+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
1117 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
1218 "github.com/bnema/neferwl/internal/logging"
1319 "github.com/bnema/neferwl/internal/ports"
14- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
15- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
16- extws "github.com/bnema/purego-libwayland/protocol/extworkspace"
17- "github.com/bnema/purego-libwayland/protocol/wayland"
18- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
19- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
2020 "github.com/bnema/purego-libwayland/server"
2121 "github.com/bnema/wlturbo"
2222 "golang.org/x/sys/unix"
@@ -8,15 +8,15 @@ import (
8 "testing"8 "testing"
9 "time"9 "time"
10 10
11+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
12+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
13+ extws "github.com/bnema/go-wayland-bindings/server/extworkspace"
14+ "github.com/bnema/go-wayland-bindings/server/wayland"
15+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
16+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
11 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"17 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
12 "github.com/bnema/neferwl/internal/logging"18 "github.com/bnema/neferwl/internal/logging"
13 "github.com/bnema/neferwl/internal/ports"19 "github.com/bnema/neferwl/internal/ports"
14- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
15- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
16- extws "github.com/bnema/purego-libwayland/protocol/extworkspace"
17- "github.com/bnema/purego-libwayland/protocol/wayland"
18- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
19- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
20 "github.com/bnema/purego-libwayland/server"20 "github.com/bnema/purego-libwayland/server"
21 "github.com/bnema/wlturbo"21 "github.com/bnema/wlturbo"
22 "golang.org/x/sys/unix"22 "golang.org/x/sys/unix"
M internal/adapters/wayland/imagecopy.go +4 -4
@@ -4,12 +4,12 @@ import (
44 "image"
55 "math"
66
7+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
8+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
9+ extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
711 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
812 "github.com/bnema/neferwl/internal/ports"
9- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
10- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
11- extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
1313 "github.com/bnema/purego-libwayland/server"
1414 )
1515
@@ -4,12 +4,12 @@ import (
4 "image"4 "image"
5 "math"5 "math"
6 6
7+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
8+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
9+ extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"11 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
8 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
9- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
10- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
11- extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13 "github.com/bnema/purego-libwayland/server"13 "github.com/bnema/purego-libwayland/server"
14 )14 )
15 15
M internal/adapters/wayland/inhibit.go +3 -3
@@ -1,10 +1,10 @@
11 package wayland
22
33 import (
4+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
5+ "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
47 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
6- "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -1,10 +1,10 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
5+ "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
4 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
6- "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
M internal/adapters/wayland/inhibit_test.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
8+ "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
9- "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
1010 "github.com/bnema/wlturbo"
1111 )
1212
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/idleinhibit"
8+ "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/idleinhibit"
9- "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
10 "github.com/bnema/wlturbo"10 "github.com/bnema/wlturbo"
11 )11 )
12 12
M internal/adapters/wayland/input_region.go +1 -1
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "slices"
55
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
67 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
88 )
99
1010 // intersectRect returns the overlap of two half-open rectangles.
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "slices"4 "slices"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8 )8 )
9 9
10 // intersectRect returns the overlap of two half-open rectangles.10 // intersectRect returns the overlap of two half-open rectangles.
M internal/adapters/wayland/input_region_test.go +4 -4
@@ -5,11 +5,11 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
812 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1313 "golang.org/x/sys/unix"
1414 )
1515
@@ -5,11 +5,11 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/fifo"
9+ "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/fifo"
10- "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
15 15
M internal/adapters/wayland/keyboard_test.go +1 -1
@@ -10,9 +10,9 @@ import (
1010 "testing"
1111 "time"
1212
13+ "github.com/bnema/go-wayland-bindings/server/wayland"
1314 "github.com/bnema/neferwl/internal/logging"
1415 "github.com/bnema/neferwl/internal/ports"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
1616 "github.com/bnema/wlturbo"
1717 "golang.org/x/sys/unix"
1818 )
@@ -10,9 +10,9 @@ import (
10 "testing"10 "testing"
11 "time"11 "time"
12 12
13+ "github.com/bnema/go-wayland-bindings/server/wayland"
13 "github.com/bnema/neferwl/internal/logging"14 "github.com/bnema/neferwl/internal/logging"
14 "github.com/bnema/neferwl/internal/ports"15 "github.com/bnema/neferwl/internal/ports"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
16 "github.com/bnema/wlturbo"16 "github.com/bnema/wlturbo"
17 "golang.org/x/sys/unix"17 "golang.org/x/sys/unix"
18 )18 )
M internal/adapters/wayland/layer.go +3 -3
@@ -3,10 +3,10 @@ package wayland
33 import (
44 "sort"
55
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
7+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
69 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1010 "github.com/bnema/purego-libwayland/server"
1111 )
1212
@@ -3,10 +3,10 @@ package wayland
3 import (3 import (
4 "sort"4 "sort"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
7+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
6 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 )11 )
12 12
M internal/adapters/wayland/layer_scale_test.go +3 -3
@@ -3,10 +3,10 @@ package wayland
33 import (
44 "testing"
55
6+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
69 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
1010 "github.com/bnema/wlturbo"
1111 )
1212
@@ -3,10 +3,10 @@ package wayland
3 import (3 import (
4 "testing"4 "testing"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
6 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
10 "github.com/bnema/wlturbo"10 "github.com/bnema/wlturbo"
11 )11 )
12 12
M internal/adapters/wayland/layer_test.go +3 -3
@@ -7,10 +7,10 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1013 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1414 "github.com/bnema/wlturbo"
1515 "golang.org/x/sys/unix"
1616 )
@@ -7,10 +7,10 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
10 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "golang.org/x/sys/unix"15 "golang.org/x/sys/unix"
16 )16 )
M internal/adapters/wayland/move_request_test.go +2 -2
@@ -6,8 +6,8 @@ import (
66
77 "github.com/bnema/neferwl/internal/ports"
88
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgshell"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1111 "github.com/bnema/wlturbo"
1212 "golang.org/x/sys/unix"
1313 )
@@ -6,8 +6,8 @@ import (
6 6
7 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
8 8
9- "github.com/bnema/purego-libwayland/protocol/wayland"9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgshell"10+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
11 "github.com/bnema/wlturbo"11 "github.com/bnema/wlturbo"
12 "golang.org/x/sys/unix"12 "golang.org/x/sys/unix"
13 )13 )
M internal/adapters/wayland/outputconfiguration.go +1 -1
@@ -4,8 +4,8 @@ import (
44 "image"
55 "math"
66
7+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
78 "github.com/bnema/neferwl/internal/ports"
8- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -4,8 +4,8 @@ import (
4 "image"4 "image"
5 "math"5 "math"
6 6
7+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
7 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
8- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/outputmanagement.go +1 -1
@@ -4,8 +4,8 @@ import (
44 "reflect"
55 "strings"
66
7+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
78 "github.com/bnema/neferwl/internal/ports"
8- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -4,8 +4,8 @@ import (
4 "reflect"4 "reflect"
5 "strings"5 "strings"
6 6
7+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
7 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
8- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/outputmanagement_test.go +1 -1
@@ -5,9 +5,9 @@ import (
55 "testing"
66 "time"
77
8+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
89 "github.com/bnema/neferwl/internal/logging"
910 "github.com/bnema/neferwl/internal/ports"
10- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
1111 "github.com/bnema/wlturbo"
1212 )
1313
@@ -5,9 +5,9 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
8 "github.com/bnema/neferwl/internal/logging"9 "github.com/bnema/neferwl/internal/logging"
9 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
10- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
11 "github.com/bnema/wlturbo"11 "github.com/bnema/wlturbo"
12 )12 )
13 13
M internal/adapters/wayland/outputs.go +2 -2
@@ -5,9 +5,9 @@ import (
55 "slices"
66 "strings"
77
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ "github.com/bnema/go-wayland-bindings/server/xdgoutput"
810 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgoutput"
1111 "github.com/bnema/purego-libwayland/server"
1212 )
1313
@@ -5,9 +5,9 @@ import (
5 "slices"5 "slices"
6 "strings"6 "strings"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ "github.com/bnema/go-wayland-bindings/server/xdgoutput"
8 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgoutput"
11 "github.com/bnema/purego-libwayland/server"11 "github.com/bnema/purego-libwayland/server"
12 )12 )
13 13
M internal/adapters/wayland/outputs_test.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
1010 "github.com/bnema/wlturbo"
1111 )
1212
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
10 "github.com/bnema/wlturbo"10 "github.com/bnema/wlturbo"
11 )11 )
12 12
M internal/adapters/wayland/popup.go +2 -2
@@ -1,9 +1,9 @@
11 package wayland
22
33 import (
4+ "github.com/bnema/go-wayland-bindings/server/wayland"
5+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
46 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/wayland"
6- "github.com/bnema/purego-libwayland/protocol/xdgshell"
77 "github.com/bnema/purego-libwayland/server"
88 )
99
@@ -1,9 +1,9 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4+ "github.com/bnema/go-wayland-bindings/server/wayland"
5+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
4 "github.com/bnema/neferwl/internal/ports"6 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/wayland"
6- "github.com/bnema/purego-libwayland/protocol/xdgshell"
7 "github.com/bnema/purego-libwayland/server"7 "github.com/bnema/purego-libwayland/server"
8 )8 )
9 9
M internal/adapters/wayland/presentation.go +2 -2
@@ -3,9 +3,9 @@ package wayland
33 import (
44 "time"
55
6+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
68 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/presentationtime"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
99 "github.com/bnema/purego-libwayland/server"
1010 "golang.org/x/sys/unix"
1111 )
@@ -3,9 +3,9 @@ package wayland
3 import (3 import (
4 "time"4 "time"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/presentationtime"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 "golang.org/x/sys/unix"10 "golang.org/x/sys/unix"
11 )11 )
M internal/adapters/wayland/presentation_test.go +2 -2
@@ -6,10 +6,10 @@ import (
66 "testing"
77 "time"
88
9+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
911 "github.com/bnema/neferwl/internal/logging"
1012 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/presentationtime"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
1313 "github.com/bnema/wlturbo"
1414 "golang.org/x/sys/unix"
1515 )
@@ -6,10 +6,10 @@ import (
6 "testing"6 "testing"
7 "time"7 "time"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
9 "github.com/bnema/neferwl/internal/logging"11 "github.com/bnema/neferwl/internal/logging"
10 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/presentationtime"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13 "github.com/bnema/wlturbo"13 "github.com/bnema/wlturbo"
14 "golang.org/x/sys/unix"14 "golang.org/x/sys/unix"
15 )15 )
M internal/adapters/wayland/protocol_test.go +2 -2
@@ -11,8 +11,8 @@ import (
1111
1212 "github.com/bnema/neferwl/internal/ports"
1313
14- "github.com/bnema/purego-libwayland/protocol/wayland"
15- "github.com/bnema/purego-libwayland/protocol/xdgshell"
14+ "github.com/bnema/go-wayland-bindings/server/wayland"
15+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1616 "github.com/bnema/wlturbo"
1717 "golang.org/x/sys/unix"
1818 )
@@ -11,8 +11,8 @@ import (
11 11
12 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
13 13
14- "github.com/bnema/purego-libwayland/protocol/wayland"14+ "github.com/bnema/go-wayland-bindings/server/wayland"
15- "github.com/bnema/purego-libwayland/protocol/xdgshell"15+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
16 "github.com/bnema/wlturbo"16 "github.com/bnema/wlturbo"
17 "golang.org/x/sys/unix"17 "golang.org/x/sys/unix"
18 )18 )
M internal/adapters/wayland/release.go +1 -1
@@ -3,8 +3,8 @@ package wayland
33 import (
44 "time"
55
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
67 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
88 )
99
1010 // Buffer release. Outputs read client buffers in place: the renderer
@@ -3,8 +3,8 @@ package wayland
3 import (3 import (
4 "time"4 "time"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8 )8 )
9 9
10 // Buffer release. Outputs read client buffers in place: the renderer10 // Buffer release. Outputs read client buffers in place: the renderer
M internal/adapters/wayland/release_test.go +2 -2
@@ -8,11 +8,11 @@ import (
88 "testing"
99 "time"
1010
11+ "github.com/bnema/go-wayland-bindings/server/fifo"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
1113 "github.com/bnema/neferwl/internal/adapters/capture"
1214 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
1315 "github.com/bnema/neferwl/internal/ports"
14- "github.com/bnema/purego-libwayland/protocol/fifo"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
1616 "github.com/stretchr/testify/mock"
1717 "github.com/stretchr/testify/require"
1818 )
@@ -8,11 +8,11 @@ import (
8 "testing"8 "testing"
9 "time"9 "time"
10 10
11+ "github.com/bnema/go-wayland-bindings/server/fifo"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
11 "github.com/bnema/neferwl/internal/adapters/capture"13 "github.com/bnema/neferwl/internal/adapters/capture"
12 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"14 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
13 "github.com/bnema/neferwl/internal/ports"15 "github.com/bnema/neferwl/internal/ports"
14- "github.com/bnema/purego-libwayland/protocol/fifo"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
16 "github.com/stretchr/testify/mock"16 "github.com/stretchr/testify/mock"
17 "github.com/stretchr/testify/require"17 "github.com/stretchr/testify/require"
18 )18 )
M internal/adapters/wayland/scale.go +3 -3
@@ -3,9 +3,9 @@ package wayland
33 import (
44 "math"
55
6- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
7- "github.com/bnema/purego-libwayland/protocol/viewporter"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
6+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
7+ "github.com/bnema/go-wayland-bindings/server/viewporter"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -3,9 +3,9 @@ package wayland
3 import (3 import (
4 "math"4 "math"
5 5
6- "github.com/bnema/purego-libwayland/protocol/fractionalscale"6+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
7- "github.com/bnema/purego-libwayland/protocol/viewporter"7+ "github.com/bnema/go-wayland-bindings/server/viewporter"
8- "github.com/bnema/purego-libwayland/protocol/wayland"8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/scale_test.go +4 -4
@@ -5,12 +5,12 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
9+ "github.com/bnema/go-wayland-bindings/server/viewporter"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
812 "github.com/bnema/neferwl/internal/logging"
913 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1414 "github.com/bnema/wlturbo"
1515 "golang.org/x/sys/unix"
1616 )
@@ -5,12 +5,12 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
9+ "github.com/bnema/go-wayland-bindings/server/viewporter"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/neferwl/internal/logging"12 "github.com/bnema/neferwl/internal/logging"
9 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
11- "github.com/bnema/purego-libwayland/protocol/viewporter"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13- "github.com/bnema/purego-libwayland/protocol/xdgshell"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "golang.org/x/sys/unix"15 "golang.org/x/sys/unix"
16 )16 )
M internal/adapters/wayland/screencopy.go +2 -2
@@ -6,9 +6,9 @@ import (
66 "os"
77 "time"
88
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
911 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
1212 "github.com/bnema/purego-libwayland/server"
1313 "golang.org/x/sys/unix"
1414 )
@@ -6,9 +6,9 @@ import (
6 "os"6 "os"
7 "time"7 "time"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
9 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
12 "github.com/bnema/purego-libwayland/server"12 "github.com/bnema/purego-libwayland/server"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/screencopy_test.go +4 -4
@@ -10,13 +10,13 @@ import (
1010 "testing"
1111 "time"
1212
13- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
14- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
13+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
14+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
1515
16+ "github.com/bnema/go-wayland-bindings/server/wayland"
17+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
1618 "github.com/bnema/neferwl/internal/logging"
1719 "github.com/bnema/neferwl/internal/ports"
18- "github.com/bnema/purego-libwayland/protocol/wayland"
19- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
2020 "github.com/bnema/wlturbo"
2121 "golang.org/x/sys/unix"
2222 )
@@ -10,13 +10,13 @@ import (
10 "testing"10 "testing"
11 "time"11 "time"
12 12
13- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"13+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
14- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"14+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
15 15
16+ "github.com/bnema/go-wayland-bindings/server/wayland"
17+ wlr "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
16 "github.com/bnema/neferwl/internal/logging"18 "github.com/bnema/neferwl/internal/logging"
17 "github.com/bnema/neferwl/internal/ports"19 "github.com/bnema/neferwl/internal/ports"
18- "github.com/bnema/purego-libwayland/protocol/wayland"
19- wlr "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
20 "github.com/bnema/wlturbo"20 "github.com/bnema/wlturbo"
21 "golang.org/x/sys/unix"21 "golang.org/x/sys/unix"
22 )22 )
M internal/adapters/wayland/seat.go +1 -1
@@ -5,8 +5,8 @@ import (
55 "fmt"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
89 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 "github.com/bnema/purego-libwayland/server"
1111 "golang.org/x/sys/unix"
1212 )
@@ -5,8 +5,8 @@ import (
5 "fmt"5 "fmt"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
8 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 "golang.org/x/sys/unix"11 "golang.org/x/sys/unix"
12 )12 )
M internal/adapters/wayland/securitycontext.go +1 -1
@@ -5,7 +5,7 @@ import (
55 "strings"
66 "time"
77
8- "github.com/bnema/purego-libwayland/protocol/securitycontext"
8+ "github.com/bnema/go-wayland-bindings/server/securitycontext"
99 "github.com/bnema/purego-libwayland/server"
1010 "golang.org/x/sys/unix"
1111 )
@@ -5,7 +5,7 @@ import (
5 "strings"5 "strings"
6 "time"6 "time"
7 7
8- "github.com/bnema/purego-libwayland/protocol/securitycontext"8+ "github.com/bnema/go-wayland-bindings/server/securitycontext"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 "golang.org/x/sys/unix"10 "golang.org/x/sys/unix"
11 )11 )
M internal/adapters/wayland/securitycontext_test.go +1 -1
@@ -9,8 +9,8 @@ import (
99 "testing"
1010 "time"
1111
12+ "github.com/bnema/go-wayland-bindings/server/securitycontext"
1213 "github.com/bnema/neferwl/internal/logging"
13- "github.com/bnema/purego-libwayland/protocol/securitycontext"
1414 "github.com/bnema/wlturbo"
1515 "golang.org/x/sys/unix"
1616 )
@@ -9,8 +9,8 @@ import (
9 "testing"9 "testing"
10 "time"10 "time"
11 11
12+ "github.com/bnema/go-wayland-bindings/server/securitycontext"
12 "github.com/bnema/neferwl/internal/logging"13 "github.com/bnema/neferwl/internal/logging"
13- "github.com/bnema/purego-libwayland/protocol/securitycontext"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "golang.org/x/sys/unix"15 "golang.org/x/sys/unix"
16 )16 )
M internal/adapters/wayland/sensitive_test.go +11 -11
@@ -5,22 +5,22 @@ import (
55 "testing"
66 "time"
77
8+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
10+ screencopy "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
11+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
813 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
914 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
10- "github.com/bnema/purego-libwayland/protocol/cursorshape"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
12- screencopy "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
13- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1515
16+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
17+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
18+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
19+ "github.com/bnema/go-wayland-bindings/server/textinput"
20+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
21+ "github.com/bnema/go-wayland-bindings/server/wayland"
1622 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
1723 "github.com/bnema/neferwl/internal/ports"
18- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
19- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
20- "github.com/bnema/purego-libwayland/protocol/inputmethod"
21- "github.com/bnema/purego-libwayland/protocol/textinput"
22- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
23- "github.com/bnema/purego-libwayland/protocol/wayland"
2424 "golang.org/x/sys/unix"
2525 )
2626
@@ -5,22 +5,22 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/cursorshape"
9+ wlr "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
10+ screencopy "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
11+ "github.com/bnema/go-wayland-bindings/server/xdgactivation"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"13 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
9 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"14 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
10- "github.com/bnema/purego-libwayland/protocol/cursorshape"
11- wlr "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
12- screencopy "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
13- "github.com/bnema/purego-libwayland/protocol/xdgactivation"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
15 15
16+ source "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
17+ ext "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
18+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
19+ "github.com/bnema/go-wayland-bindings/server/textinput"
20+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
21+ "github.com/bnema/go-wayland-bindings/server/wayland"
16 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"22 portsmocks "github.com/bnema/neferwl/internal/mocks/ports"
17 "github.com/bnema/neferwl/internal/ports"23 "github.com/bnema/neferwl/internal/ports"
18- source "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
19- ext "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
20- "github.com/bnema/purego-libwayland/protocol/inputmethod"
21- "github.com/bnema/purego-libwayland/protocol/textinput"
22- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
23- "github.com/bnema/purego-libwayland/protocol/wayland"
24 "golang.org/x/sys/unix"24 "golang.org/x/sys/unix"
25 )25 )
26 26
M internal/adapters/wayland/server.go +3 -3
@@ -8,15 +8,15 @@ import (
88 "sync/atomic"
99 "time"
1010
11- "github.com/bnema/purego-libwayland/protocol/relativepointer"
11+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
1212
13+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
14+ "github.com/bnema/go-wayland-bindings/server/wayland"
1315 "github.com/bnema/neferwl/internal/adapters/captureallow"
1416 "github.com/bnema/neferwl/internal/adapters/clock"
1517 "github.com/bnema/neferwl/internal/adapters/workspaceid"
1618 "github.com/bnema/neferwl/internal/ports"
1719 "github.com/bnema/neferwl/internal/sessionlock"
18- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
19- "github.com/bnema/purego-libwayland/protocol/wayland"
2020 "github.com/bnema/purego-libwayland/server"
2121 "github.com/bnema/zerowrap"
2222 "golang.org/x/sys/unix"
@@ -8,15 +8,15 @@ import (
8 "sync/atomic"8 "sync/atomic"
9 "time"9 "time"
10 10
11- "github.com/bnema/purego-libwayland/protocol/relativepointer"11+ "github.com/bnema/go-wayland-bindings/server/relativepointer"
12 12
13+ "github.com/bnema/go-wayland-bindings/server/fractionalscale"
14+ "github.com/bnema/go-wayland-bindings/server/wayland"
13 "github.com/bnema/neferwl/internal/adapters/captureallow"15 "github.com/bnema/neferwl/internal/adapters/captureallow"
14 "github.com/bnema/neferwl/internal/adapters/clock"16 "github.com/bnema/neferwl/internal/adapters/clock"
15 "github.com/bnema/neferwl/internal/adapters/workspaceid"17 "github.com/bnema/neferwl/internal/adapters/workspaceid"
16 "github.com/bnema/neferwl/internal/ports"18 "github.com/bnema/neferwl/internal/ports"
17 "github.com/bnema/neferwl/internal/sessionlock"19 "github.com/bnema/neferwl/internal/sessionlock"
18- "github.com/bnema/purego-libwayland/protocol/fractionalscale"
19- "github.com/bnema/purego-libwayland/protocol/wayland"
20 "github.com/bnema/purego-libwayland/server"20 "github.com/bnema/purego-libwayland/server"
21 "github.com/bnema/zerowrap"21 "github.com/bnema/zerowrap"
22 "golang.org/x/sys/unix"22 "golang.org/x/sys/unix"
M internal/adapters/wayland/session_lock.go +2 -2
@@ -3,9 +3,9 @@ package wayland
33 import (
44 "context"
55
6+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
68 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/extsessionlock"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -3,9 +3,9 @@ package wayland
3 import (3 import (
4 "context"4 "context"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/extsessionlock"
8- "github.com/bnema/purego-libwayland/protocol/wayland"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/session_lock_input_epoch_test.go +1 -1
@@ -7,10 +7,10 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
1011 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
1112 "github.com/bnema/neferwl/internal/logging"
1213 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
1414 "github.com/bnema/wlturbo"
1515 "github.com/bnema/wlturbo/protocol/core"
1616 )
@@ -7,10 +7,10 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"11 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
11 "github.com/bnema/neferwl/internal/logging"12 "github.com/bnema/neferwl/internal/logging"
12 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 "github.com/bnema/wlturbo/protocol/core"15 "github.com/bnema/wlturbo/protocol/core"
16 )16 )
M internal/adapters/wayland/session_lock_lifecycle_test.go +3 -3
@@ -7,12 +7,12 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/drmlease"
11+ serverlock "github.com/bnema/go-wayland-bindings/server/extsessionlock"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
1013 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
1114 "github.com/bnema/neferwl/internal/logging"
1215 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/drmlease"
14- serverlock "github.com/bnema/purego-libwayland/protocol/extsessionlock"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
1616 "github.com/bnema/wlturbo"
1717 "github.com/bnema/wlturbo/protocol/core"
1818 lockclient "github.com/bnema/wlturbo/protocol/extsessionlock"
@@ -7,12 +7,12 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/drmlease"
11+ serverlock "github.com/bnema/go-wayland-bindings/server/extsessionlock"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"13 "github.com/bnema/neferwl/internal/adapters/sessionsecurity"
11 "github.com/bnema/neferwl/internal/logging"14 "github.com/bnema/neferwl/internal/logging"
12 "github.com/bnema/neferwl/internal/ports"15 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/drmlease"
14- serverlock "github.com/bnema/purego-libwayland/protocol/extsessionlock"
15- "github.com/bnema/purego-libwayland/protocol/wayland"
16 "github.com/bnema/wlturbo"16 "github.com/bnema/wlturbo"
17 "github.com/bnema/wlturbo/protocol/core"17 "github.com/bnema/wlturbo/protocol/core"
18 lockclient "github.com/bnema/wlturbo/protocol/extsessionlock"18 lockclient "github.com/bnema/wlturbo/protocol/extsessionlock"
M internal/adapters/wayland/session_lock_refused.go +1 -1
@@ -1,6 +1,6 @@
11 package wayland
22
3-import "github.com/bnema/purego-libwayland/protocol/extsessionlock"
3+import "github.com/bnema/go-wayland-bindings/server/extsessionlock"
44
55 // A constructor pipelined before finished must still create its new object,
66 // but a refused lock never assigns a wl_surface role or changes active focus.
@@ -1,6 +1,6 @@
1 package wayland1 package wayland
2 2
3-import "github.com/bnema/purego-libwayland/protocol/extsessionlock"3+import "github.com/bnema/go-wayland-bindings/server/extsessionlock"
4 4
5 // A constructor pipelined before finished must still create its new object,5 // A constructor pipelined before finished must still create its new object,
6 // but a refused lock never assigns a wl_surface role or changes active focus.6 // but a refused lock never assigns a wl_surface role or changes active focus.
M internal/adapters/wayland/session_lock_surface.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "cmp"
55 "slices"
66
7+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/extsessionlock"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 )
1111
1212 // lockConfigure is an issued configure, or the last acknowledged configure.
@@ -4,9 +4,9 @@ import (
4 "cmp"4 "cmp"
5 "slices"5 "slices"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/extsessionlock"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 )10 )
11 11
12 // lockConfigure is an issued configure, or the last acknowledged configure.12 // lockConfigure is an issued configure, or the last acknowledged configure.
M internal/adapters/wayland/session_lock_surface_test.go +6 -6
@@ -4,12 +4,12 @@ import (
44 "testing"
55 "time"
66
7- "github.com/bnema/purego-libwayland/protocol/extsessionlock"
8- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
9- "github.com/bnema/purego-libwayland/protocol/viewporter"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"
7+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
8+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
9+ "github.com/bnema/go-wayland-bindings/server/viewporter"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1313 "github.com/bnema/wlturbo"
1414 "golang.org/x/sys/unix"
1515 )
@@ -4,12 +4,12 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7- "github.com/bnema/purego-libwayland/protocol/extsessionlock"7+ "github.com/bnema/go-wayland-bindings/server/extsessionlock"
8- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"8+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
9- "github.com/bnema/purego-libwayland/protocol/viewporter"9+ "github.com/bnema/go-wayland-bindings/server/viewporter"
10- "github.com/bnema/purego-libwayland/protocol/wayland"10+ "github.com/bnema/go-wayland-bindings/server/wayland"
11- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"11+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
12- "github.com/bnema/purego-libwayland/protocol/xdgshell"12+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
13 "github.com/bnema/wlturbo"13 "github.com/bnema/wlturbo"
14 "golang.org/x/sys/unix"14 "golang.org/x/sys/unix"
15 )15 )
M internal/adapters/wayland/subsurface_test.go +4 -4
@@ -4,11 +4,11 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
8+ "github.com/bnema/go-wayland-bindings/server/viewporter"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
711 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/presentationtime"
9- "github.com/bnema/purego-libwayland/protocol/viewporter"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1212 "golang.org/x/sys/unix"
1313 )
1414
@@ -4,11 +4,11 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
8+ "github.com/bnema/go-wayland-bindings/server/viewporter"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
7 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/presentationtime"
9- "github.com/bnema/purego-libwayland/protocol/viewporter"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11- "github.com/bnema/purego-libwayland/protocol/xdgshell"
12 "golang.org/x/sys/unix"12 "golang.org/x/sys/unix"
13 )13 )
14 14
M internal/adapters/wayland/surface.go +4 -4
@@ -7,12 +7,12 @@ import (
77 "slices"
88 "time"
99
10- "github.com/bnema/purego-libwayland/protocol/presentationtime"
10+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
1111
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
13+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
14+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1215 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
15- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1616 )
1717
1818 type roleKind uint8
@@ -7,12 +7,12 @@ import (
7 "slices"7 "slices"
8 "time"8 "time"
9 9
10- "github.com/bnema/purego-libwayland/protocol/presentationtime"10+ "github.com/bnema/go-wayland-bindings/server/presentationtime"
11 11
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
13+ "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
14+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
12 "github.com/bnema/neferwl/internal/ports"15 "github.com/bnema/neferwl/internal/ports"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14- "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
15- "github.com/bnema/purego-libwayland/protocol/xdgshell"
16 )16 )
17 17
18 type roleKind uint818 type roleKind uint8
M internal/adapters/wayland/syncobj.go +2 -2
@@ -7,9 +7,9 @@ import (
77 "sync"
88 "sync/atomic"
99
10+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
1012 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
1313 "github.com/bnema/purego-libwayland/server"
1414 "github.com/bnema/zerowrap"
1515 "golang.org/x/sys/unix"
@@ -7,9 +7,9 @@ import (
7 "sync"7 "sync"
8 "sync/atomic"8 "sync/atomic"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
11+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
12- "github.com/bnema/purego-libwayland/protocol/wayland"
13 "github.com/bnema/purego-libwayland/server"13 "github.com/bnema/purego-libwayland/server"
14 "github.com/bnema/zerowrap"14 "github.com/bnema/zerowrap"
15 "golang.org/x/sys/unix"15 "golang.org/x/sys/unix"
M internal/adapters/wayland/syncobj_test.go +5 -5
@@ -9,13 +9,13 @@ import (
99 "time"
1010 "unsafe"
1111
12+ "github.com/bnema/go-wayland-bindings/server/committiming"
13+ "github.com/bnema/go-wayland-bindings/server/fifo"
14+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
15+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
16+ "github.com/bnema/go-wayland-bindings/server/wayland"
1217 "github.com/bnema/neferwl/internal/logging"
1318 "github.com/bnema/neferwl/internal/ports"
14- "github.com/bnema/purego-libwayland/protocol/committiming"
15- "github.com/bnema/purego-libwayland/protocol/fifo"
16- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
17- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
18- "github.com/bnema/purego-libwayland/protocol/wayland"
1919 "github.com/bnema/wlturbo"
2020 "github.com/stretchr/testify/mock"
2121 "golang.org/x/sys/unix"
@@ -9,13 +9,13 @@ import (
9 "time"9 "time"
10 "unsafe"10 "unsafe"
11 11
12+ "github.com/bnema/go-wayland-bindings/server/committiming"
13+ "github.com/bnema/go-wayland-bindings/server/fifo"
14+ "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
15+ "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
16+ "github.com/bnema/go-wayland-bindings/server/wayland"
12 "github.com/bnema/neferwl/internal/logging"17 "github.com/bnema/neferwl/internal/logging"
13 "github.com/bnema/neferwl/internal/ports"18 "github.com/bnema/neferwl/internal/ports"
14- "github.com/bnema/purego-libwayland/protocol/committiming"
15- "github.com/bnema/purego-libwayland/protocol/fifo"
16- "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
17- "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
18- "github.com/bnema/purego-libwayland/protocol/wayland"
19 "github.com/bnema/wlturbo"19 "github.com/bnema/wlturbo"
20 "github.com/stretchr/testify/mock"20 "github.com/stretchr/testify/mock"
21 "golang.org/x/sys/unix"21 "golang.org/x/sys/unix"
M internal/adapters/wayland/tearing.go +2 -2
@@ -1,8 +1,8 @@
11 package wayland
22
33 import (
4- "github.com/bnema/purego-libwayland/protocol/tearingcontrol"
5- "github.com/bnema/purego-libwayland/protocol/wayland"
4+ "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
5+ "github.com/bnema/go-wayland-bindings/server/wayland"
66 "github.com/bnema/purego-libwayland/server"
77 )
88
@@ -1,8 +1,8 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4- "github.com/bnema/purego-libwayland/protocol/tearingcontrol"4+ "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
5- "github.com/bnema/purego-libwayland/protocol/wayland"5+ "github.com/bnema/go-wayland-bindings/server/wayland"
6 "github.com/bnema/purego-libwayland/server"6 "github.com/bnema/purego-libwayland/server"
7 )7 )
8 8
M internal/adapters/wayland/tearing_test.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/tearingcontrol"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 )
1111
1212 // asyncContent waits for a content of window id with the given hint.
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/tearingcontrol"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 )10 )
11 11
12 // asyncContent waits for a content of window id with the given hint.12 // asyncContent waits for a content of window id with the given hint.
M internal/adapters/wayland/textinput.go +3 -3
@@ -1,10 +1,10 @@
11 package wayland
22
33 import (
4+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
5+ "github.com/bnema/go-wayland-bindings/server/textinput"
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
47 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/inputmethod"
6- "github.com/bnema/purego-libwayland/protocol/textinput"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
88 "github.com/bnema/purego-libwayland/server"
99 )
1010
@@ -1,10 +1,10 @@
1 package wayland1 package wayland
2 2
3 import (3 import (
4+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
5+ "github.com/bnema/go-wayland-bindings/server/textinput"
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
4 "github.com/bnema/neferwl/internal/ports"7 "github.com/bnema/neferwl/internal/ports"
5- "github.com/bnema/purego-libwayland/protocol/inputmethod"
6- "github.com/bnema/purego-libwayland/protocol/textinput"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8 "github.com/bnema/purego-libwayland/server"8 "github.com/bnema/purego-libwayland/server"
9 )9 )
10 10
M internal/adapters/wayland/textinput_test.go +4 -4
@@ -7,11 +7,11 @@ import (
77 "testing"
88 "time"
99
10+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
11+ "github.com/bnema/go-wayland-bindings/server/textinput"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
13+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
1014 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/inputmethod"
12- "github.com/bnema/purego-libwayland/protocol/textinput"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1515 "github.com/bnema/wlturbo"
1616 "golang.org/x/sys/unix"
1717 )
@@ -7,11 +7,11 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ "github.com/bnema/go-wayland-bindings/server/inputmethod"
11+ "github.com/bnema/go-wayland-bindings/server/textinput"
12+ "github.com/bnema/go-wayland-bindings/server/wayland"
13+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
10 "github.com/bnema/neferwl/internal/ports"14 "github.com/bnema/neferwl/internal/ports"
11- "github.com/bnema/purego-libwayland/protocol/inputmethod"
12- "github.com/bnema/purego-libwayland/protocol/textinput"
13- "github.com/bnema/purego-libwayland/protocol/wayland"
14- "github.com/bnema/purego-libwayland/protocol/xdgshell"
15 "github.com/bnema/wlturbo"15 "github.com/bnema/wlturbo"
16 "golang.org/x/sys/unix"16 "golang.org/x/sys/unix"
17 )17 )
M internal/adapters/wayland/tiled_playback_test.go +1 -1
@@ -4,9 +4,9 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
78 "github.com/bnema/neferwl/internal/adapters/vulkan"
89 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 "github.com/bnema/wlturbo"
1111 "golang.org/x/sys/unix"
1212 )
@@ -4,9 +4,9 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/adapters/vulkan"8 "github.com/bnema/neferwl/internal/adapters/vulkan"
8 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 "github.com/bnema/wlturbo"10 "github.com/bnema/wlturbo"
11 "golang.org/x/sys/unix"11 "golang.org/x/sys/unix"
12 )12 )
M internal/adapters/wayland/transform_test.go +3 -3
@@ -4,10 +4,10 @@ import (
44 "testing"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/viewporter"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
710 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/viewporter"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1111 "github.com/bnema/wlturbo"
1212 "golang.org/x/sys/unix"
1313 )
@@ -4,10 +4,10 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/viewporter"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
9+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
7 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/viewporter"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10- "github.com/bnema/purego-libwayland/protocol/xdgshell"
11 "github.com/bnema/wlturbo"11 "github.com/bnema/wlturbo"
12 "golang.org/x/sys/unix"12 "golang.org/x/sys/unix"
13 )13 )
M internal/adapters/wayland/viewport_queue_test.go +2 -2
@@ -5,8 +5,8 @@ import (
55 "testing"
66 "time"
77
8- "github.com/bnema/purego-libwayland/protocol/viewporter"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
8+ "github.com/bnema/go-wayland-bindings/server/viewporter"
9+ "github.com/bnema/go-wayland-bindings/server/wayland"
1010 )
1111
1212 // A queued attachment that was destroyed cannot apply either its new crop or
@@ -5,8 +5,8 @@ import (
5 "testing"5 "testing"
6 "time"6 "time"
7 7
8- "github.com/bnema/purego-libwayland/protocol/viewporter"8+ "github.com/bnema/go-wayland-bindings/server/viewporter"
9- "github.com/bnema/purego-libwayland/protocol/wayland"9+ "github.com/bnema/go-wayland-bindings/server/wayland"
10 )10 )
11 11
12 // A queued attachment that was destroyed cannot apply either its new crop or12 // A queued attachment that was destroyed cannot apply either its new crop or
M internal/adapters/wayland/virtualkeyboard.go +2 -2
@@ -4,9 +4,9 @@ import (
44 "bytes"
55 "time"
66
7+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
1010 "github.com/bnema/purego-libwayland/server"
1111 "golang.org/x/sys/unix"
1212 )
@@ -4,9 +4,9 @@ import (
4 "bytes"4 "bytes"
5 "time"5 "time"
6 6
7+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
8- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
9- "github.com/bnema/purego-libwayland/protocol/wayland"
10 "github.com/bnema/purego-libwayland/server"10 "github.com/bnema/purego-libwayland/server"
11 "golang.org/x/sys/unix"11 "golang.org/x/sys/unix"
12 )12 )
M internal/adapters/wayland/virtualkeyboard_test.go +2 -2
@@ -6,9 +6,9 @@ import (
66 "testing"
77 "time"
88
9+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
911 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
1212 "github.com/bnema/wlturbo"
1313 "golang.org/x/sys/unix"
1414 )
@@ -6,9 +6,9 @@ import (
6 "testing"6 "testing"
7 "time"7 "time"
8 8
9+ "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
10+ "github.com/bnema/go-wayland-bindings/server/wayland"
9 "github.com/bnema/neferwl/internal/ports"11 "github.com/bnema/neferwl/internal/ports"
10- "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
11- "github.com/bnema/purego-libwayland/protocol/wayland"
12 "github.com/bnema/wlturbo"12 "github.com/bnema/wlturbo"
13 "golang.org/x/sys/unix"13 "golang.org/x/sys/unix"
14 )14 )
M internal/adapters/wayland/wire_client_test.go +39 -39
@@ -10,46 +10,46 @@ import (
1010 "sync"
1111 "testing"
1212
13+ wire_alphamodifier "github.com/bnema/go-wayland-bindings/server/alphamodifier"
14+ wire_colormanagement "github.com/bnema/go-wayland-bindings/server/colormanagement"
15+ wire_colorrepresentation "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
16+ wire_committiming "github.com/bnema/go-wayland-bindings/server/committiming"
17+ wire_cursorshape "github.com/bnema/go-wayland-bindings/server/cursorshape"
18+ wire_drmlease "github.com/bnema/go-wayland-bindings/server/drmlease"
19+ wire_extdatacontrol "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
20+ wire_extidlenotify "github.com/bnema/go-wayland-bindings/server/extidlenotify"
21+ wire_extimagecapturesource "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
22+ wire_extimagecopycapture "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
23+ wire_extsessionlock "github.com/bnema/go-wayland-bindings/server/extsessionlock"
24+ wire_extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
25+ wire_fifo "github.com/bnema/go-wayland-bindings/server/fifo"
26+ wire_fractionalscale "github.com/bnema/go-wayland-bindings/server/fractionalscale"
27+ wire_idleinhibit "github.com/bnema/go-wayland-bindings/server/idleinhibit"
28+ wire_inputmethod "github.com/bnema/go-wayland-bindings/server/inputmethod"
29+ wire_keyboardshortcutsinhibit "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
30+ wire_linuxdmabuf "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
31+ wire_linuxdrmsyncobj "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
32+ wire_pointerconstraints "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
33+ wire_pointerwarp "github.com/bnema/go-wayland-bindings/server/pointerwarp"
34+ wire_presentationtime "github.com/bnema/go-wayland-bindings/server/presentationtime"
35+ wire_primaryselection "github.com/bnema/go-wayland-bindings/server/primaryselection"
36+ wire_relativepointer "github.com/bnema/go-wayland-bindings/server/relativepointer"
37+ wire_securitycontext "github.com/bnema/go-wayland-bindings/server/securitycontext"
38+ wire_kdedecoration "github.com/bnema/go-wayland-bindings/server/serverdecoration"
39+ wire_tearingcontrol "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
40+ wire_textinput "github.com/bnema/go-wayland-bindings/server/textinput"
41+ wire_viewporter "github.com/bnema/go-wayland-bindings/server/viewporter"
42+ wire_virtualkeyboard "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
43+ wire_wayland "github.com/bnema/go-wayland-bindings/server/wayland"
44+ wire_wlrforeigntoplevel "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
45+ wire_wlrlayershell "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
46+ wire_wlroutputmanagement "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
47+ wire_wlroutputpower "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
48+ wire_wlrscreencopy "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
49+ wire_xdgactivation "github.com/bnema/go-wayland-bindings/server/xdgactivation"
50+ wire_xdgoutput "github.com/bnema/go-wayland-bindings/server/xdgoutput"
51+ wire_xdgshell "github.com/bnema/go-wayland-bindings/server/xdgshell"
1352 wire_imagecapture "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
14- wire_alphamodifier "github.com/bnema/purego-libwayland/protocol/alphamodifier"
15- wire_colormanagement "github.com/bnema/purego-libwayland/protocol/colormanagement"
16- wire_colorrepresentation "github.com/bnema/purego-libwayland/protocol/colorrepresentation"
17- wire_committiming "github.com/bnema/purego-libwayland/protocol/committiming"
18- wire_cursorshape "github.com/bnema/purego-libwayland/protocol/cursorshape"
19- wire_drmlease "github.com/bnema/purego-libwayland/protocol/drmlease"
20- wire_extdatacontrol "github.com/bnema/purego-libwayland/protocol/extdatacontrol"
21- wire_extidlenotify "github.com/bnema/purego-libwayland/protocol/extidlenotify"
22- wire_extimagecapturesource "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
23- wire_extimagecopycapture "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
24- wire_extsessionlock "github.com/bnema/purego-libwayland/protocol/extsessionlock"
25- wire_extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"
26- wire_fifo "github.com/bnema/purego-libwayland/protocol/fifo"
27- wire_fractionalscale "github.com/bnema/purego-libwayland/protocol/fractionalscale"
28- wire_idleinhibit "github.com/bnema/purego-libwayland/protocol/idleinhibit"
29- wire_inputmethod "github.com/bnema/purego-libwayland/protocol/inputmethod"
30- wire_kdedecoration "github.com/bnema/purego-libwayland/protocol/kdedecoration"
31- wire_keyboardshortcutsinhibit "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
32- wire_linuxdmabuf "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
33- wire_linuxdrmsyncobj "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
34- wire_pointerconstraints "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
35- wire_pointerwarp "github.com/bnema/purego-libwayland/protocol/pointerwarp"
36- wire_presentationtime "github.com/bnema/purego-libwayland/protocol/presentationtime"
37- wire_primaryselection "github.com/bnema/purego-libwayland/protocol/primaryselection"
38- wire_relativepointer "github.com/bnema/purego-libwayland/protocol/relativepointer"
39- wire_securitycontext "github.com/bnema/purego-libwayland/protocol/securitycontext"
40- wire_tearingcontrol "github.com/bnema/purego-libwayland/protocol/tearingcontrol"
41- wire_textinput "github.com/bnema/purego-libwayland/protocol/textinput"
42- wire_viewporter "github.com/bnema/purego-libwayland/protocol/viewporter"
43- wire_virtualkeyboard "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
44- wire_wayland "github.com/bnema/purego-libwayland/protocol/wayland"
45- wire_wlrforeigntoplevel "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
46- wire_wlrlayershell "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
47- wire_wlroutputmanagement "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
48- wire_wlroutputpower "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
49- wire_wlrscreencopy "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
50- wire_xdgactivation "github.com/bnema/purego-libwayland/protocol/xdgactivation"
51- wire_xdgoutput "github.com/bnema/purego-libwayland/protocol/xdgoutput"
52- wire_xdgshell "github.com/bnema/purego-libwayland/protocol/xdgshell"
5353 "github.com/bnema/purego-libwayland/server"
5454 "github.com/bnema/wlturbo"
5555 client_alphamodifier "github.com/bnema/wlturbo/protocol/alphamodifier"
@@ -10,46 +10,46 @@ import (
10 "sync"10 "sync"
11 "testing"11 "testing"
12 12
13+ wire_alphamodifier "github.com/bnema/go-wayland-bindings/server/alphamodifier"
14+ wire_colormanagement "github.com/bnema/go-wayland-bindings/server/colormanagement"
15+ wire_colorrepresentation "github.com/bnema/go-wayland-bindings/server/colorrepresentation"
16+ wire_committiming "github.com/bnema/go-wayland-bindings/server/committiming"
17+ wire_cursorshape "github.com/bnema/go-wayland-bindings/server/cursorshape"
18+ wire_drmlease "github.com/bnema/go-wayland-bindings/server/drmlease"
19+ wire_extdatacontrol "github.com/bnema/go-wayland-bindings/server/extdatacontrol"
20+ wire_extidlenotify "github.com/bnema/go-wayland-bindings/server/extidlenotify"
21+ wire_extimagecapturesource "github.com/bnema/go-wayland-bindings/server/extimagecapturesource"
22+ wire_extimagecopycapture "github.com/bnema/go-wayland-bindings/server/extimagecopycapture"
23+ wire_extsessionlock "github.com/bnema/go-wayland-bindings/server/extsessionlock"
24+ wire_extworkspace "github.com/bnema/go-wayland-bindings/server/extworkspace"
25+ wire_fifo "github.com/bnema/go-wayland-bindings/server/fifo"
26+ wire_fractionalscale "github.com/bnema/go-wayland-bindings/server/fractionalscale"
27+ wire_idleinhibit "github.com/bnema/go-wayland-bindings/server/idleinhibit"
28+ wire_inputmethod "github.com/bnema/go-wayland-bindings/server/inputmethod"
29+ wire_keyboardshortcutsinhibit "github.com/bnema/go-wayland-bindings/server/keyboardshortcutsinhibit"
30+ wire_linuxdmabuf "github.com/bnema/go-wayland-bindings/server/linuxdmabuf"
31+ wire_linuxdrmsyncobj "github.com/bnema/go-wayland-bindings/server/linuxdrmsyncobj"
32+ wire_pointerconstraints "github.com/bnema/go-wayland-bindings/server/pointerconstraints"
33+ wire_pointerwarp "github.com/bnema/go-wayland-bindings/server/pointerwarp"
34+ wire_presentationtime "github.com/bnema/go-wayland-bindings/server/presentationtime"
35+ wire_primaryselection "github.com/bnema/go-wayland-bindings/server/primaryselection"
36+ wire_relativepointer "github.com/bnema/go-wayland-bindings/server/relativepointer"
37+ wire_securitycontext "github.com/bnema/go-wayland-bindings/server/securitycontext"
38+ wire_kdedecoration "github.com/bnema/go-wayland-bindings/server/serverdecoration"
39+ wire_tearingcontrol "github.com/bnema/go-wayland-bindings/server/tearingcontrol"
40+ wire_textinput "github.com/bnema/go-wayland-bindings/server/textinput"
41+ wire_viewporter "github.com/bnema/go-wayland-bindings/server/viewporter"
42+ wire_virtualkeyboard "github.com/bnema/go-wayland-bindings/server/virtualkeyboard"
43+ wire_wayland "github.com/bnema/go-wayland-bindings/server/wayland"
44+ wire_wlrforeigntoplevel "github.com/bnema/go-wayland-bindings/server/wlrforeigntoplevelmanagement"
45+ wire_wlrlayershell "github.com/bnema/go-wayland-bindings/server/wlrlayershell"
46+ wire_wlroutputmanagement "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
47+ wire_wlroutputpower "github.com/bnema/go-wayland-bindings/server/wlroutputpowermanagement"
48+ wire_wlrscreencopy "github.com/bnema/go-wayland-bindings/server/wlrscreencopy"
49+ wire_xdgactivation "github.com/bnema/go-wayland-bindings/server/xdgactivation"
50+ wire_xdgoutput "github.com/bnema/go-wayland-bindings/server/xdgoutput"
51+ wire_xdgshell "github.com/bnema/go-wayland-bindings/server/xdgshell"
13 wire_imagecapture "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"52 wire_imagecapture "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
14- wire_alphamodifier "github.com/bnema/purego-libwayland/protocol/alphamodifier"
15- wire_colormanagement "github.com/bnema/purego-libwayland/protocol/colormanagement"
16- wire_colorrepresentation "github.com/bnema/purego-libwayland/protocol/colorrepresentation"
17- wire_committiming "github.com/bnema/purego-libwayland/protocol/committiming"
18- wire_cursorshape "github.com/bnema/purego-libwayland/protocol/cursorshape"
19- wire_drmlease "github.com/bnema/purego-libwayland/protocol/drmlease"
20- wire_extdatacontrol "github.com/bnema/purego-libwayland/protocol/extdatacontrol"
21- wire_extidlenotify "github.com/bnema/purego-libwayland/protocol/extidlenotify"
22- wire_extimagecapturesource "github.com/bnema/purego-libwayland/protocol/extimagecapturesource"
23- wire_extimagecopycapture "github.com/bnema/purego-libwayland/protocol/extimagecopycapture"
24- wire_extsessionlock "github.com/bnema/purego-libwayland/protocol/extsessionlock"
25- wire_extworkspace "github.com/bnema/purego-libwayland/protocol/extworkspace"
26- wire_fifo "github.com/bnema/purego-libwayland/protocol/fifo"
27- wire_fractionalscale "github.com/bnema/purego-libwayland/protocol/fractionalscale"
28- wire_idleinhibit "github.com/bnema/purego-libwayland/protocol/idleinhibit"
29- wire_inputmethod "github.com/bnema/purego-libwayland/protocol/inputmethod"
30- wire_kdedecoration "github.com/bnema/purego-libwayland/protocol/kdedecoration"
31- wire_keyboardshortcutsinhibit "github.com/bnema/purego-libwayland/protocol/keyboardshortcutsinhibit"
32- wire_linuxdmabuf "github.com/bnema/purego-libwayland/protocol/linuxdmabuf"
33- wire_linuxdrmsyncobj "github.com/bnema/purego-libwayland/protocol/linuxdrmsyncobj"
34- wire_pointerconstraints "github.com/bnema/purego-libwayland/protocol/pointerconstraints"
35- wire_pointerwarp "github.com/bnema/purego-libwayland/protocol/pointerwarp"
36- wire_presentationtime "github.com/bnema/purego-libwayland/protocol/presentationtime"
37- wire_primaryselection "github.com/bnema/purego-libwayland/protocol/primaryselection"
38- wire_relativepointer "github.com/bnema/purego-libwayland/protocol/relativepointer"
39- wire_securitycontext "github.com/bnema/purego-libwayland/protocol/securitycontext"
40- wire_tearingcontrol "github.com/bnema/purego-libwayland/protocol/tearingcontrol"
41- wire_textinput "github.com/bnema/purego-libwayland/protocol/textinput"
42- wire_viewporter "github.com/bnema/purego-libwayland/protocol/viewporter"
43- wire_virtualkeyboard "github.com/bnema/purego-libwayland/protocol/virtualkeyboard"
44- wire_wayland "github.com/bnema/purego-libwayland/protocol/wayland"
45- wire_wlrforeigntoplevel "github.com/bnema/purego-libwayland/protocol/wlrforeigntoplevel"
46- wire_wlrlayershell "github.com/bnema/purego-libwayland/protocol/wlrlayershell"
47- wire_wlroutputmanagement "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
48- wire_wlroutputpower "github.com/bnema/purego-libwayland/protocol/wlroutputpower"
49- wire_wlrscreencopy "github.com/bnema/purego-libwayland/protocol/wlrscreencopy"
50- wire_xdgactivation "github.com/bnema/purego-libwayland/protocol/xdgactivation"
51- wire_xdgoutput "github.com/bnema/purego-libwayland/protocol/xdgoutput"
52- wire_xdgshell "github.com/bnema/purego-libwayland/protocol/xdgshell"
53 "github.com/bnema/purego-libwayland/server"53 "github.com/bnema/purego-libwayland/server"
54 "github.com/bnema/wlturbo"54 "github.com/bnema/wlturbo"
55 client_alphamodifier "github.com/bnema/wlturbo/protocol/alphamodifier"55 client_alphamodifier "github.com/bnema/wlturbo/protocol/alphamodifier"
M internal/adapters/wayland/workspaces.go +2 -2
@@ -4,10 +4,10 @@ import (
44 "context"
55 "encoding/binary"
66
7+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
79 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
810 "github.com/bnema/neferwl/internal/ports"
9- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
1111 "github.com/bnema/purego-libwayland/server"
1212 )
1313
@@ -4,10 +4,10 @@ import (
4 "context"4 "context"
5 "encoding/binary"5 "encoding/binary"
6 6
7+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
8+ "github.com/bnema/go-wayland-bindings/server/wayland"
7 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"9 "github.com/bnema/neferwl/internal/adapters/wayland/imagecapture"
8 "github.com/bnema/neferwl/internal/ports"10 "github.com/bnema/neferwl/internal/ports"
9- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
10- "github.com/bnema/purego-libwayland/protocol/wayland"
11 "github.com/bnema/purego-libwayland/server"11 "github.com/bnema/purego-libwayland/server"
12 )12 )
13 13
M internal/adapters/wayland/workspaces_sensitive_test.go +1 -1
@@ -4,8 +4,8 @@ import (
44 "testing"
55 "time"
66
7+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
78 "github.com/bnema/neferwl/internal/ports"
8- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
99 "github.com/bnema/wlturbo"
1010 )
1111
@@ -4,8 +4,8 @@ import (
4 "testing"4 "testing"
5 "time"5 "time"
6 6
7+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
7 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
8- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
9 "github.com/bnema/wlturbo"9 "github.com/bnema/wlturbo"
10 )10 )
11 11
M internal/adapters/wayland/workspaces_test.go +1 -1
@@ -7,10 +7,10 @@ import (
77 "testing"
88 "time"
99
10+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
1011 "github.com/bnema/neferwl/internal/adapters/workspaceid"
1112 "github.com/bnema/neferwl/internal/logging"
1213 "github.com/bnema/neferwl/internal/ports"
13- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
1414 "github.com/bnema/wlturbo"
1515 )
1616
@@ -7,10 +7,10 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ ext "github.com/bnema/go-wayland-bindings/server/extworkspace"
10 "github.com/bnema/neferwl/internal/adapters/workspaceid"11 "github.com/bnema/neferwl/internal/adapters/workspaceid"
11 "github.com/bnema/neferwl/internal/logging"12 "github.com/bnema/neferwl/internal/logging"
12 "github.com/bnema/neferwl/internal/ports"13 "github.com/bnema/neferwl/internal/ports"
13- ext "github.com/bnema/purego-libwayland/protocol/extworkspace"
14 "github.com/bnema/wlturbo"14 "github.com/bnema/wlturbo"
15 )15 )
16 16
M internal/adapters/wayland/xdg.go +2 -2
@@ -3,9 +3,9 @@ package wayland
33 import (
44 "encoding/binary"
55
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
7+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
68 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8- "github.com/bnema/purego-libwayland/protocol/xdgshell"
99 "github.com/bnema/purego-libwayland/server"
1010 )
1111
@@ -3,9 +3,9 @@ package wayland
3 import (3 import (
4 "encoding/binary"4 "encoding/binary"
5 5
6+ "github.com/bnema/go-wayland-bindings/server/wayland"
7+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
6 "github.com/bnema/neferwl/internal/ports"8 "github.com/bnema/neferwl/internal/ports"
7- "github.com/bnema/purego-libwayland/protocol/wayland"
8- "github.com/bnema/purego-libwayland/protocol/xdgshell"
9 "github.com/bnema/purego-libwayland/server"9 "github.com/bnema/purego-libwayland/server"
10 )10 )
11 11
M internal/adapters/wayland/xdg_states_test.go +1 -1
@@ -5,8 +5,8 @@ import (
55 "slices"
66 "testing"
77
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
89 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
1010 )
1111
1212 func TestToplevelStates(t *testing.T) {
@@ -5,8 +5,8 @@ import (
5 "slices"5 "slices"
6 "testing"6 "testing"
7 7
8+ "github.com/bnema/go-wayland-bindings/server/xdgshell"
8 "github.com/bnema/neferwl/internal/ports"9 "github.com/bnema/neferwl/internal/ports"
9- "github.com/bnema/purego-libwayland/protocol/xdgshell"
10 )10 )
11 11
12 func TestToplevelStates(t *testing.T) {12 func TestToplevelStates(t *testing.T) {
M internal/app/outputapply_e2e_test.go +1 -1
@@ -7,9 +7,9 @@ import (
77 "testing"
88 "time"
99
10+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
1011 "github.com/bnema/neferwl/internal/adapters/config"
1112 "github.com/bnema/neferwl/internal/ports"
12- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
1313 "github.com/bnema/wlturbo"
1414 client "github.com/bnema/wlturbo/protocol/outputmanagement"
1515 )
@@ -7,9 +7,9 @@ import (
7 "testing"7 "testing"
8 "time"8 "time"
9 9
10+ wlr "github.com/bnema/go-wayland-bindings/server/wlroutputmanagement"
10 "github.com/bnema/neferwl/internal/adapters/config"11 "github.com/bnema/neferwl/internal/adapters/config"
11 "github.com/bnema/neferwl/internal/ports"12 "github.com/bnema/neferwl/internal/ports"
12- wlr "github.com/bnema/purego-libwayland/protocol/wlroutputmanagement"
13 "github.com/bnema/wlturbo"13 "github.com/bnema/wlturbo"
14 client "github.com/bnema/wlturbo/protocol/outputmanagement"14 client "github.com/bnema/wlturbo/protocol/outputmanagement"
15 )15 )

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 25

Tags 10

↑↓ moveenter openesc close