mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 10:41:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use inband resize events in kittens

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-18 21:57:53 +05:30
parent a4cdc1cdf3
commit 10bd0f71d8
3 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/tui/loop/api.go
View File

@@ -41,6 +41,7 @@ type Loop struct {
controlling_term *tty.Term controlling_term *tty.Term
terminal_options TerminalStateOptions terminal_options TerminalStateOptions
screen_size ScreenSize screen_size ScreenSize
seen_inband_resize bool
escape_code_parser wcswidth.EscapeCodeParser escape_code_parser wcswidth.EscapeCodeParser
keep_going bool keep_going bool
death_signal unix.Signal death_signal unix.Signal

54
tools/tui/loop/run.go
View File

@@ -10,6 +10,7 @@ import (
"io" "io"
"os" "os"
"os/signal" "os/signal"
"strconv"
"strings" "strings"
"time" "time"
@@ -82,17 +83,46 @@ func (self *Loop) update_screen_size() error {
return nil return nil
} }
func (self *Loop) handle_csi(raw []byte) error { func (self *Loop) handle_csi(raw []byte) (err error) {
csi := string(raw) csi := string(raw)
ke := KeyEventFromCSI(csi) if len(csi) > 2 {
if ke != nil { if strings.HasSuffix(csi, "t") && strings.HasPrefix(csi, "48;") {
return self.handle_key_event(ke) if parts := strings.Split(csi[3:len(csi)-1], ";"); len(parts) > 3 {
} var parsed [4]int
sz, err := self.ScreenSize() ok := true
if err == nil { for i, x := range parts {
me := MouseEventFromCSI(csi, sz) x, _, _ = strings.Cut(x, ":")
if me != nil { if parsed[i], err = strconv.Atoi(x); err != nil {
return self.handle_mouse_event(me) ok = false
break
}
}
if ok {
self.seen_inband_resize = true
old_size := self.screen_size
s := &self.screen_size
s.updated = true
s.HeightCells, s.WidthCells = uint(parsed[0]), uint(parsed[1])
s.HeightPx, s.WidthPx = uint(parsed[2]), uint(parsed[2])
s.CellWidth = s.WidthPx / s.WidthCells
s.CellHeight = s.HeightPx / s.HeightCells
if self.OnResize != nil {
return self.OnResize(old_size, self.screen_size)
}
return nil
}
}
}
ke := KeyEventFromCSI(csi)
if ke != nil {
return self.handle_key_event(ke)
}
sz, err := self.ScreenSize()
if err == nil {
me := MouseEventFromCSI(csi, sz)
if me != nil {
return self.handle_mouse_event(me)
}
} }
} }
if self.OnEscapeCode != nil { if self.OnEscapeCode != nil {
@@ -272,6 +302,9 @@ func (self *Loop) on_SIGPIPE() error {
} }
func (self *Loop) on_SIGWINCH() error { func (self *Loop) on_SIGWINCH() error {
if self.seen_inband_resize {
return nil
}
self.screen_size.updated = false self.screen_size.updated = false
if self.OnResize != nil { if self.OnResize != nil {
old_size := self.screen_size old_size := self.screen_size
@@ -313,6 +346,7 @@ func (self *Loop) run() (err error) {
}() }()
self.keep_going = true self.keep_going = true
self.seen_inband_resize = false
self.pending_mouse_events = utils.NewRingBuffer[MouseEvent](4) self.pending_mouse_events = utils.NewRingBuffer[MouseEvent](4)
// tty_write_channel is buffered so there is no race between initial // tty_write_channel is buffered so there is no race between initial
// queueing and startup of writer thread and also as a performance // queueing and startup of writer thread and also as a performance

44
tools/tui/loop/terminal-state.go
View File

@@ -46,26 +46,27 @@ type Mode uint32
const private Mode = 1 << 31 const private Mode = 1 << 31
const ( const (
LNM Mode = 20 LNM Mode = 20
IRM Mode = 4 IRM Mode = 4
DECKM Mode = 1 | private DECKM Mode = 1 | private
DECSCNM Mode = 5 | private DECSCNM Mode = 5 | private
DECOM Mode = 6 | private DECOM Mode = 6 | private
DECAWM Mode = 7 | private DECAWM Mode = 7 | private
DECARM Mode = 8 | private DECARM Mode = 8 | private
DECTCEM Mode = 25 | private DECTCEM Mode = 25 | private
MOUSE_BUTTON_TRACKING Mode = 1000 | private MOUSE_BUTTON_TRACKING Mode = 1000 | private
MOUSE_MOTION_TRACKING Mode = 1002 | private MOUSE_MOTION_TRACKING Mode = 1002 | private
MOUSE_MOVE_TRACKING Mode = 1003 | private MOUSE_MOVE_TRACKING Mode = 1003 | private
FOCUS_TRACKING Mode = 1004 | private FOCUS_TRACKING Mode = 1004 | private
MOUSE_UTF8_MODE Mode = 1005 | private MOUSE_UTF8_MODE Mode = 1005 | private
MOUSE_SGR_MODE Mode = 1006 | private MOUSE_SGR_MODE Mode = 1006 | private
MOUSE_URXVT_MODE Mode = 1015 | private MOUSE_URXVT_MODE Mode = 1015 | private
MOUSE_SGR_PIXEL_MODE Mode = 1016 | private MOUSE_SGR_PIXEL_MODE Mode = 1016 | private
ALTERNATE_SCREEN Mode = 1049 | private ALTERNATE_SCREEN Mode = 1049 | private
BRACKETED_PASTE Mode = 2004 | private BRACKETED_PASTE Mode = 2004 | private
PENDING_UPDATE Mode = 2026 | private PENDING_UPDATE Mode = 2026 | private
HANDLE_TERMIOS_SIGNALS Mode = kitty.HandleTermiosSignals | private INBAND_RESIZE_NOTIFICATION Mode = 2048 | private
HANDLE_TERMIOS_SIGNALS Mode = kitty.HandleTermiosSignals | private
) )
func (self Mode) escape_code(which string) string { func (self Mode) escape_code(which string) string {
@@ -127,7 +128,7 @@ func (self *TerminalStateOptions) SetStateEscapeCodes() string {
reset_modes(&sb, reset_modes(&sb,
IRM, DECKM, DECSCNM, BRACKETED_PASTE, FOCUS_TRACKING, IRM, DECKM, DECSCNM, BRACKETED_PASTE, FOCUS_TRACKING,
MOUSE_BUTTON_TRACKING, MOUSE_MOTION_TRACKING, MOUSE_MOVE_TRACKING, MOUSE_UTF8_MODE, MOUSE_SGR_MODE) MOUSE_BUTTON_TRACKING, MOUSE_MOTION_TRACKING, MOUSE_MOVE_TRACKING, MOUSE_UTF8_MODE, MOUSE_SGR_MODE)
set_modes(&sb, DECARM, DECAWM, DECTCEM) set_modes(&sb, DECARM, DECAWM, DECTCEM, INBAND_RESIZE_NOTIFICATION)
if self.Alternate_screen { if self.Alternate_screen {
set_modes(&sb, ALTERNATE_SCREEN) set_modes(&sb, ALTERNATE_SCREEN)
sb.WriteString(CLEAR_SCREEN) sb.WriteString(CLEAR_SCREEN)
@@ -169,6 +170,7 @@ func (self *TerminalStateOptions) ResetStateEscapeCodes() string {
sb.WriteString(RESTORE_COLORS) sb.WriteString(RESTORE_COLORS)
} }
sb.WriteString(RESTORE_CURSOR) sb.WriteString(RESTORE_CURSOR)
reset_modes(&sb, INBAND_RESIZE_NOTIFICATION)
return sb.String() return sb.String()
} }