mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2025-01-29 01:58:25 +00:00
120cd7f25a
This commit adds the `border-native` resulting in the following: ``` --tmux[=[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]][,border-native]] ``` By default, when not specified, the `-B` flag is passed to the `tmux popup-window` command such that no border is drawn around the tmux popup window. When the `border-native` option is present, the `-B` flag is omitted and the popup window is drawn using the border style configured in the tmux config file. Fixes #4156 Signed-off-by: Andreas Auernhammer <github@aead.dev> Co-authored-by: Junegunn Choi <junegunn.c@gmail.com>
67 lines
1.8 KiB
Go
67 lines
1.8 KiB
Go
package fzf
|
|
|
|
import (
|
|
"os"
|
|
"os/exec"
|
|
|
|
"github.com/junegunn/fzf/src/tui"
|
|
)
|
|
|
|
func runTmux(args []string, opts *Options) (int, error) {
|
|
// Prepare arguments
|
|
fzf, rest := args[0], args[1:]
|
|
args = []string{"--bind=ctrl-z:ignore"}
|
|
if !opts.Tmux.border && opts.BorderShape == tui.BorderUndefined {
|
|
args = append(args, "--border")
|
|
}
|
|
if opts.Tmux.border && opts.Margin == defaultMargin() {
|
|
args = append(args, "--margin=0,1")
|
|
}
|
|
argStr := escapeSingleQuote(fzf)
|
|
for _, arg := range append(args, rest...) {
|
|
argStr += " " + escapeSingleQuote(arg)
|
|
}
|
|
argStr += ` --no-tmux --no-height`
|
|
|
|
// Get current directory
|
|
dir, err := os.Getwd()
|
|
if err != nil {
|
|
dir = "."
|
|
}
|
|
|
|
// Set tmux options for popup placement
|
|
// C Both The centre of the terminal
|
|
// R -x The right side of the terminal
|
|
// P Both The bottom left of the pane
|
|
// M Both The mouse position
|
|
// W Both The window position on the status line
|
|
// S -y The line above or below the status line
|
|
tmuxArgs := []string{"display-popup", "-E", "-d", dir}
|
|
if !opts.Tmux.border {
|
|
tmuxArgs = append(tmuxArgs, "-B")
|
|
}
|
|
switch opts.Tmux.position {
|
|
case posUp:
|
|
tmuxArgs = append(tmuxArgs, "-xC", "-y0")
|
|
case posDown:
|
|
tmuxArgs = append(tmuxArgs, "-xC", "-y9999")
|
|
case posLeft:
|
|
tmuxArgs = append(tmuxArgs, "-x0", "-yC")
|
|
case posRight:
|
|
tmuxArgs = append(tmuxArgs, "-xR", "-yC")
|
|
case posCenter:
|
|
tmuxArgs = append(tmuxArgs, "-xC", "-yC")
|
|
}
|
|
tmuxArgs = append(tmuxArgs, "-w"+opts.Tmux.width.String())
|
|
tmuxArgs = append(tmuxArgs, "-h"+opts.Tmux.height.String())
|
|
|
|
return runProxy(argStr, func(temp string, needBash bool) (*exec.Cmd, error) {
|
|
sh, err := sh(needBash)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
tmuxArgs = append(tmuxArgs, sh, temp)
|
|
return exec.Command("tmux", tmuxArgs...), nil
|
|
}, opts, true)
|
|
}
|