mirror of
https://github.com/junegunn/fzf.git
synced 2026-07-22 16:10:36 +08:00
Terminate resize notification when Loop exits
- Pass Loop context to notifyOnResize - Windows: stop polling goroutine, close CONOUT$ handle on ctx.Done - Unix: unregister SIGWINCH handler on ctx.Done
This commit is contained in:
+1
-1
@@ -6199,7 +6199,7 @@ func (t *Terminal) Loop() error {
|
||||
|
||||
if !t.tui.ShouldEmitResizeEvent() {
|
||||
resizeChan := make(chan os.Signal, 1)
|
||||
notifyOnResize(resizeChan) // Non-portable
|
||||
notifyOnResize(ctx, resizeChan) // Non-portable
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
package fzf
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
@@ -10,8 +11,12 @@ import (
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func notifyOnResize(resizeChan chan<- os.Signal) {
|
||||
func notifyOnResize(ctx context.Context, resizeChan chan<- os.Signal) {
|
||||
signal.Notify(resizeChan, syscall.SIGWINCH)
|
||||
go func() {
|
||||
<-ctx.Done()
|
||||
signal.Stop(resizeChan)
|
||||
}()
|
||||
}
|
||||
|
||||
func notifyStop(p *os.Process) {
|
||||
|
||||
+11
-2
@@ -3,6 +3,7 @@
|
||||
package fzf
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"syscall"
|
||||
"time"
|
||||
@@ -19,19 +20,27 @@ func (resizeSignal) Signal() {}
|
||||
|
||||
// Windows has no SIGWINCH, so poll the console screen buffer for window
|
||||
// size changes instead.
|
||||
func notifyOnResize(resizeChan chan<- os.Signal) {
|
||||
func notifyOnResize(ctx context.Context, resizeChan chan<- os.Signal) {
|
||||
consoleOut, err := syscall.Open("CONOUT$", syscall.O_RDWR, 0)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
var info windows.ConsoleScreenBufferInfo
|
||||
if windows.GetConsoleScreenBufferInfo(windows.Handle(consoleOut), &info) != nil {
|
||||
syscall.Close(consoleOut)
|
||||
return
|
||||
}
|
||||
last := info.Window
|
||||
go func() {
|
||||
defer syscall.Close(consoleOut)
|
||||
ticker := time.NewTicker(resizePollInterval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
time.Sleep(resizePollInterval)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-ticker.C:
|
||||
}
|
||||
if windows.GetConsoleScreenBufferInfo(windows.Handle(consoleOut), &info) != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user