From 0b68c1aad4204cbfaf6b468bbeeaa0c7f79eb3e3 Mon Sep 17 00:00:00 2001 From: Clem Rowe Date: Sat, 4 May 2024 12:32:52 +1000 Subject: [PATCH] Add header-click event for reporting clicks within header. Sets $FZF_HEADERCLICK_LINE and $FZF_HEADERCLICK_COLUMN env vars with coordinates of last click inside and relative to the header and fires header-click event. --- src/options.go | 2 ++ src/terminal.go | 39 ++++++++++++++++++++++++++++++++++++--- src/tui/tui.go | 1 + 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/options.go b/src/options.go index 66e0554e..f689a24c 100644 --- a/src/options.go +++ b/src/options.go @@ -708,6 +708,8 @@ func parseKeyChordsImpl(str string, message string, exit func(string)) map[tui.E add(tui.Jump) case "jump-cancel": add(tui.JumpCancel) + case "header-click": + add(tui.HeaderClick) case "alt-enter", "alt-return": chords[tui.CtrlAltKey('m')] = key case "alt-space": diff --git a/src/terminal.go b/src/terminal.go index 932553ed..0fd05d81 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -298,6 +298,8 @@ type Terminal struct { areaLines int areaColumns int forcePreview bool + headerClickLine int + headerClickColumn int } type selectedItem struct { @@ -857,6 +859,8 @@ func (t *Terminal) environ() []string { env = append(env, fmt.Sprintf("FZF_LINES=%d", t.areaLines)) env = append(env, fmt.Sprintf("FZF_COLUMNS=%d", t.areaColumns)) env = append(env, fmt.Sprintf("FZF_POS=%d", util.Min(t.merger.Length(), t.cy+1))) + env = append(env, fmt.Sprintf("FZF_HEADERCLICK_LINE=%d", t.headerClickLine)) + env = append(env, fmt.Sprintf("FZF_HEADERCLICK_COLUMN=%d", t.headerClickColumn)) return env } @@ -3991,10 +3995,10 @@ func (t *Terminal) Loop() { } if me.Down { - mx = util.Constrain(mx-t.promptLen, 0, len(t.input)) - if my == t.promptLine() && mx >= 0 { + mx_cons := util.Constrain(mx-t.promptLen, 0, len(t.input)) + if my == t.promptLine() && mx_cons >= 0 { // Prompt - t.cx = mx + t.xoffset + t.cx = mx_cons + t.xoffset } else if my >= min { t.vset(t.offset + my - min) req(reqList) @@ -4009,6 +4013,35 @@ func (t *Terminal) Loop() { } } return doActions(actionsFor(evt)) + } else { + // Header + lineOffset := 0 + numLines := t.visibleHeaderLines() + if !t.headerFirst { + // offset for info line + if t.noSeparatorLine() { + lineOffset = 1 + } else { + lineOffset = 2 + } + } else { + // adjust for too-small window + numItems := t.areaLines - numLines + if !t.noSeparatorLine() { + numItems -= 1 + } + if numItems < 0 { + numLines += numItems + } + } + my = util.Constrain(my-lineOffset, -1, numLines) + mx -= 2 // offset gutter + if my >= 0 && my < numLines && mx >= 0 { + t.headerClickLine = my + t.headerClickColumn = mx + evt := tui.HeaderClick + return doActions(actionsFor(evt)) + } } } case actReload, actReloadSync: diff --git a/src/tui/tui.go b/src/tui/tui.go index aec80fcd..8b0c97d1 100644 --- a/src/tui/tui.go +++ b/src/tui/tui.go @@ -130,6 +130,7 @@ const ( Result Jump JumpCancel + HeaderClick ) func (t EventType) AsEvent() Event {