Skip to content

Commit

Permalink
Merge pull request #3271 from JoeKar/fix/inactive-mouse-release
Browse files Browse the repository at this point in the history
Fix lost mouse release events in case the pane becomes inactive
  • Loading branch information
JoeKar committed Apr 27, 2024
2 parents 385437d + 0a1447b commit 1f51d0b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 14 deletions.
5 changes: 5 additions & 0 deletions internal/action/bufpane.go
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,17 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
// Mouse event with no click - mouse was just released.
// If there were multiple mouse buttons pressed, we don't know which one
// was actually released, so we assume they all were released.
pressed := len(h.mousePressed) > 0
for me := range h.mousePressed {
delete(h.mousePressed, me)

me.state = MouseRelease
h.DoMouseEvent(me, e)
}
if !pressed {
// Propagate the mouse release in case the press wasn't for this BufPane
Tabs.ResetMouse()
}
}
}
h.Buf.MergeCursors()
Expand Down
41 changes: 27 additions & 14 deletions internal/action/tab.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ func (t *TabList) HandleEvent(event tcell.Event) {
return
}
}
case tcell.ButtonNone:
if t.List[t.Active()].release {
// Mouse release received, while already released
t.ResetMouse()
return
}
case tcell.WheelUp:
if my == t.Y {
t.Scroll(4)
Expand Down Expand Up @@ -166,6 +172,26 @@ func (t *TabList) SetActive(a int) {
}
}

// ResetMouse resets the mouse release state after the screen was stopped
// or the pane changed.
// This prevents situations in which mouse releases are received at the wrong place
// and the mouse state is still pressed.
func (t *TabList) ResetMouse() {
for _, tab := range t.List {
if !tab.release && tab.resizing != nil {
tab.resizing = nil
}

tab.release = true

for _, p := range tab.Panes {
if bp, ok := p.(*BufPane); ok {
bp.resetMouse()
}
}
}
}

// Tabs is the global tab list
var Tabs *TabList

Expand All @@ -184,20 +210,7 @@ func InitTabs(bufs []*buffer.Buffer) {
}
}

screen.RestartCallback = func() {
// The mouse could be released after the screen was stopped, so that
// we couldn't catch the mouse release event and would erroneously think
// that it is still pressed. So need to reset the mouse release state
// after the screen is restarted.
for _, t := range Tabs.List {
t.release = true
for _, p := range t.Panes {
if bp, ok := p.(*BufPane); ok {
bp.resetMouse()
}
}
}
}
screen.RestartCallback = Tabs.ResetMouse
}

func MainTab() *Tab {
Expand Down

0 comments on commit 1f51d0b

Please sign in to comment.