Skip to content

Commit ca0b2b3

Browse files
committed
get parent pid from tmux client
1 parent 7fb6299 commit ca0b2b3

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
github.com/stretchr/testify v1.8.4
1111
github.com/trzsz/go-arg v1.5.3
1212
github.com/trzsz/promptui v0.10.5
13-
golang.org/x/sys v0.15.0
14-
golang.org/x/term v0.15.0
13+
golang.org/x/sys v0.16.0
14+
golang.org/x/term v0.16.0
1515
golang.org/x/text v0.14.0
1616
)
1717

@@ -24,6 +24,6 @@ require (
2424
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
2525
github.com/pmezard/go-difflib v1.0.0 // indirect
2626
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect
27-
golang.org/x/image v0.14.0 // indirect
27+
golang.org/x/image v0.15.0 // indirect
2828
gopkg.in/yaml.v3 v3.0.1 // indirect
2929
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ github.com/trzsz/go-arg v1.5.3/go.mod h1:IC6Z/FiVH7uYvcbp1/gJhDYCFPS/GkL0APYakVv
3737
github.com/trzsz/promptui v0.10.5 h1:tlzJkx+JOeE0sqKWmqgaoToZiYqj5G1Mz+QDV97VFu8=
3838
github.com/trzsz/promptui v0.10.5/go.mod h1:GMZtu6ZTzU73CBFkzGtmB4wnTROIAbv4GFA74fV8V8g=
3939
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
40-
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
41-
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
40+
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
41+
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
4242
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4343
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4444
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
46-
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
47-
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
48-
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
45+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
46+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
47+
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
48+
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
4949
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
5050
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
5151
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

trzsz/utils_darwin.go

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ import (
2929
"os"
3030
"os/exec"
3131
"strconv"
32+
"strings"
3233
"sync"
3334

3435
"golang.org/x/sys/unix"
3536
)
3637

3738
func getParentWindowID() any {
38-
pid := os.Getppid()
39+
pid := getParentPid()
3940
for i := 0; i < 1000; i++ {
4041
kinfo, err := unix.SysctlKinfoProc("kern.proc.pid", pid)
4142
if err != nil {
@@ -59,6 +60,26 @@ func getParentWindowID() any {
5960
return 0
6061
}
6162

63+
func getParentPid() int {
64+
if _, tmux := os.LookupEnv("TMUX"); !tmux {
65+
return os.Getppid()
66+
}
67+
68+
cmd := exec.Command("tmux", "display-message", "-p", "#{client_pid}")
69+
cmd.Stdin = os.Stdin
70+
out, err := cmd.Output()
71+
if err != nil {
72+
return os.Getppid()
73+
}
74+
75+
pid, err := strconv.Atoi(strings.TrimSpace(string(out)))
76+
if err != nil {
77+
return os.Getppid()
78+
}
79+
80+
return pid
81+
}
82+
6283
var (
6384
warpOnce sync.Once
6485
warpTerminal bool

0 commit comments

Comments
 (0)