KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement drag scrolling for the diff kitten

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-29 17:14:13 +05:30
parent 05e10d8066
commit 37edc728a9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kittens/diff/mouse.go
View File

@ -96,10 +96,28 @@ func (self *Handler) start_mouse_selection(ev *loop.MouseEvent) {
self.mouse_selection.StartNewSelection(ev, self.line_pos_from_pos(ev.Cell.X, pos), 0, self.screen_size.num_lines-1, self.screen_size.cell_width, self.screen_size.cell_height)
}
func (self *Handler) drag_scroll_tick(timer_id loop.IdType) error {
return self.mouse_selection.DragScrollTick(timer_id, self.lp, self.drag_scroll_tick, func(amt int, ev *loop.MouseEvent) error {
if self.scroll_lines(amt) != 0 {
self.do_update_mouse_selection(ev)
self.draw_screen()
}
return nil
})
}
func (self *Handler) update_mouse_selection(ev *loop.MouseEvent) {
if !self.mouse_selection.IsActive() {
return
}
if self.mouse_selection.OutOfVerticalBounds(ev) {
self.mouse_selection.DragScroll(ev, self.lp, self.drag_scroll_tick)
return
}
self.do_update_mouse_selection(ev)
}
func (self *Handler) do_update_mouse_selection(ev *loop.MouseEvent) {
pos := self.scroll_pos
y := ev.Cell.Y
y = utils.Max(0, utils.Min(y, self.screen_size.num_lines-1))

44
tools/tui/mouse.go
View File

@ -4,6 +4,8 @@ package tui
import (
"fmt"
"time"
"kitty/tools/tty"
"kitty/tools/tui/loop"
"kitty/tools/utils"
@ -52,6 +54,11 @@ type MouseSelection struct {
is_active bool
min_y, max_y int
cell_width, cell_height int
drag_scroll struct {
timer_id loop.IdType
pixel_gap int
mouse_event loop.MouseEvent
}
}
func (self *MouseSelection) IsEmpty() bool { return self.start.Equal(self.end) }
@ -70,6 +77,7 @@ func (ms *MouseSelection) StartNewSelection(ev *loop.MouseEvent, line LinePos, m
}
func (ms *MouseSelection) Update(ev *loop.MouseEvent, line LinePos) {
ms.drag_scroll.timer_id = 0
if ms.is_active {
ms.end.x = utils.Max(line.MinX(), utils.Min(ev.Cell.X, line.MaxX()))
cell_start := ms.cell_width * ms.end.x
@ -161,3 +169,39 @@ func (ms *MouseSelection) StartLine() LinePos {
func (ms *MouseSelection) EndLine() LinePos {
return ms.end.line
}
func (ms *MouseSelection) OutOfVerticalBounds(ev *loop.MouseEvent) bool {
return ev.Pixel.Y < ms.min_y*ms.cell_height || ev.Pixel.Y > (ms.max_y+1)*ms.cell_height
}
func (ms *MouseSelection) DragScrollTick(timer_id loop.IdType, lp *loop.Loop, callback loop.TimerCallback, do_scroll func(int, *loop.MouseEvent) error) error {
if !ms.is_active || ms.drag_scroll.timer_id != timer_id || ms.drag_scroll.pixel_gap == 0 {
return nil
}
amt := 1
if ms.drag_scroll.pixel_gap < 0 {
amt *= -1
}
err := do_scroll(amt, &ms.drag_scroll.mouse_event)
if err == nil {
ms.drag_scroll.timer_id, _ = lp.AddTimer(50*time.Millisecond, false, callback)
}
return err
}
func (ms *MouseSelection) DragScroll(ev *loop.MouseEvent, lp *loop.Loop, callback loop.TimerCallback) {
if !ms.is_active {
return
}
upper := ms.min_y * ms.cell_height
lower := (ms.max_y + 1) * ms.cell_height
if ev.Pixel.Y < upper {
ms.drag_scroll.pixel_gap = ev.Pixel.Y - upper
} else if ev.Pixel.Y > lower {
ms.drag_scroll.pixel_gap = ev.Pixel.Y - lower
}
if ms.drag_scroll.timer_id == 0 && ms.drag_scroll.pixel_gap != 0 {
ms.drag_scroll.timer_id, _ = lp.AddTimer(50*time.Millisecond, false, callback)
}
ms.drag_scroll.mouse_event = *ev
}