From b6d99a8bcd928de32f793c54414245220851ba24 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 23 Sep 2026 10:44:08 +0530 Subject: [PATCH] Fix #10517 --- docs/changelog.rst | 5 +++++ go.mod | 3 ++- go.sum | 2 ++ kittens/icat/detect.go | 2 +- kittens/icat/transmit.go | 2 +- kittens/ssh/askpass.go | 2 +- kittens/ssh/main.go | 2 +- kittens/ssh/main_test.go | 2 +- tools/cmd/atexit/main.go | 2 +- tools/cmd/pytest/main.go | 2 +- tools/tui/graphics/collection.go | 2 +- tools/utils/images/loading.go | 2 +- 12 files changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 2715f723a..d5832763b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -209,6 +209,11 @@ Detailed list of changes - Splits layout: Fix windows in a nested split overlapping their neighbour by a couple of pixels when the split is resized down to its minimum size. +- icat: Fix :code:`--transfer-mode=memory` not displaying anything and + :code:`--detect-support` reporting ``files``, because the names of the POSIX + shared memory objects it created were missing the leading slash mandated by + the graphics protocol (:iss:`10517`) + 0.49.0 [2026-09-21] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/go.mod b/go.mod index e9261fd0f..5dd4d3303 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/klauspost/compress v1.20.0 github.com/kovidgoyal/dbus v0.0.0-20250519011319-e811c41c0bc1 github.com/kovidgoyal/go-parallel v1.1.1 - github.com/kovidgoyal/go-shm v1.0.0 + github.com/kovidgoyal/go-shm/v2 v2.0.1 github.com/kovidgoyal/imaging v1.8.23 github.com/nwaples/rardecode/v2 v2.4.1 github.com/seancfoley/ipaddress-go v1.8.4 @@ -42,6 +42,7 @@ require ( github.com/dlclark/regexp2/v2 v2.2.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect + github.com/kovidgoyal/go-shm v1.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect diff --git a/go.sum b/go.sum index 2ebfd5d18..2ceb25337 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,8 @@ github.com/kovidgoyal/go-parallel v1.1.1 h1:1OzpNjtrUkBPq3UaqrnvOoB2F9RttSt811ui github.com/kovidgoyal/go-parallel v1.1.1/go.mod h1:BJNIbe6+hxyFWv7n6oEDPj3PA5qSw5OCtf0hcVxWJiw= github.com/kovidgoyal/go-shm v1.0.0 h1:HJEel9D1F9YhULvClEHJLawoRSj/1u/EDV7MJbBPgQo= github.com/kovidgoyal/go-shm v1.0.0/go.mod h1:Yzb80Xf9L3kaoB2RGok9hHwMIt7Oif61kT6t3+VnZds= +github.com/kovidgoyal/go-shm/v2 v2.0.1 h1:stJsF4jwfIigJztjm0zBGDhcMlTf95DdIU/rClq6LI0= +github.com/kovidgoyal/go-shm/v2 v2.0.1/go.mod h1:56KHjKy3KcoL+FGJU/+E2jR8mn636tBWCYNuAoBXpA4= github.com/kovidgoyal/imaging v1.8.23 h1:4WsboyQ/E8tic2kX49P93Rvscg33SPsCwTBG5EZZF54= github.com/kovidgoyal/imaging v1.8.23/go.mod h1:k3Iot3H0v2rSWXIxQISfT3e9wIryqzAHLHCuhG7z9lM= github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a h1:N9zuLhTvBSRt0gWSiJswwQ2HqDmtX/ZCDJURnKUt1Ik= diff --git a/kittens/icat/detect.go b/kittens/icat/detect.go index 29743d690..a3ba2b159 100644 --- a/kittens/icat/detect.go +++ b/kittens/icat/detect.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/tools/tui/graphics" "github.com/kovidgoyal/kitty/tools/tui/loop" "github.com/kovidgoyal/kitty/tools/utils" diff --git a/kittens/icat/transmit.go b/kittens/icat/transmit.go index 4da2746f7..92080610f 100644 --- a/kittens/icat/transmit.go +++ b/kittens/icat/transmit.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/tools/tui" "github.com/kovidgoyal/kitty/tools/tui/graphics" "github.com/kovidgoyal/kitty/tools/tui/loop" diff --git a/kittens/ssh/askpass.go b/kittens/ssh/askpass.go index 742dd9c78..cb6125fc6 100644 --- a/kittens/ssh/askpass.go +++ b/kittens/ssh/askpass.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/tools/cli" "github.com/kovidgoyal/kitty/tools/tty" ) diff --git a/kittens/ssh/main.go b/kittens/ssh/main.go index bdb44a6b5..884190c33 100644 --- a/kittens/ssh/main.go +++ b/kittens/ssh/main.go @@ -30,7 +30,7 @@ import ( "github.com/emmansun/base64" "golang.org/x/sys/unix" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty" "github.com/kovidgoyal/kitty/tools/cli" "github.com/kovidgoyal/kitty/tools/themes" diff --git a/kittens/ssh/main_test.go b/kittens/ssh/main_test.go index 21fcee8d2..d70fdf2ed 100644 --- a/kittens/ssh/main_test.go +++ b/kittens/ssh/main_test.go @@ -6,7 +6,7 @@ import ( "encoding/binary" "encoding/json" "fmt" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty" "io/fs" "os" diff --git a/tools/cmd/atexit/main.go b/tools/cmd/atexit/main.go index eb108ff77..c0fff2330 100644 --- a/tools/cmd/atexit/main.go +++ b/tools/cmd/atexit/main.go @@ -7,7 +7,7 @@ import ( "os/signal" "strings" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/tools/cli" "github.com/kovidgoyal/kitty/tools/utils" ) diff --git a/tools/cmd/pytest/main.go b/tools/cmd/pytest/main.go index de5532770..fe849d4f7 100644 --- a/tools/cmd/pytest/main.go +++ b/tools/cmd/pytest/main.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/kittens/ssh" "github.com/kovidgoyal/kitty/tools/cli" ) diff --git a/tools/tui/graphics/collection.go b/tools/tui/graphics/collection.go index 216017d8c..a63b1920b 100644 --- a/tools/tui/graphics/collection.go +++ b/tools/tui/graphics/collection.go @@ -10,7 +10,7 @@ import ( "sync" "sync/atomic" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/kitty/tools/tui" "github.com/kovidgoyal/kitty/tools/tui/loop" "github.com/kovidgoyal/kitty/tools/utils" diff --git a/tools/utils/images/loading.go b/tools/utils/images/loading.go index 622edbe1e..0e487e155 100644 --- a/tools/utils/images/loading.go +++ b/tools/utils/images/loading.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/kovidgoyal/go-parallel" - "github.com/kovidgoyal/go-shm" + shm "github.com/kovidgoyal/go-shm/v2" "github.com/kovidgoyal/imaging/nrgb" "github.com/kovidgoyal/imaging"