mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

icat: Dont open the controlling terminal to query for size if stdout is a terminal, use it instead

Browse Source
This commit is contained in:
Kovid Goyal
2023-09-22 12:10:21 +05:30
parent fc1331cfdc
commit c650bd0aac
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kittens/icat/main.go
View File

@@ -146,11 +146,15 @@ func main(cmd *cli.Command, o *Options, args []string) (rc int, err error) {
if err != nil { if err != nil {
return 1, err return 1, err
} }
t, err := tty.OpenControllingTerm() if tty.IsTerminal(os.Stdout.Fd()) {
if err != nil { screen_size, err = tty.GetSize(int(os.Stdout.Fd()))
return 1, fmt.Errorf("Failed to open controlling terminal with error: %w", err) } else {
t, oerr := tty.OpenControllingTerm()
if oerr != nil {
return 1, fmt.Errorf("Failed to open controlling terminal with error: %w", err)
}
screen_size, err = t.GetSize()
} }
screen_size, err = t.GetSize()
if err != nil { if err != nil {
return 1, fmt.Errorf("Failed to query terminal using TIOCGWINSZ with error: %w", err) return 1, fmt.Errorf("Failed to query terminal using TIOCGWINSZ with error: %w", err)
} }

8
tools/tty/tty.go
View File

@@ -334,15 +334,19 @@ func (self *Term) DebugPrintln(a ...any) {
} }
} }
func (self *Term) GetSize() (*unix.Winsize, error) { func GetSize(fd int) (*unix.Winsize, error) {
for { for {
sz, err := unix.IoctlGetWinsize(self.Fd(), unix.TIOCGWINSZ) sz, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
if err != unix.EINTR { if err != unix.EINTR {
return sz, err return sz, err
} }
} }
} }
func (self *Term) GetSize() (*unix.Winsize, error) {
return GetSize(self.Fd())
}
// go doesn't have a wrapper for ctermid() // go doesn't have a wrapper for ctermid()
func Ctermid() string { return "/dev/tty" } func Ctermid() string { return "/dev/tty" }