From d99169da2d9b910839ad826d3d501c87b5ba9bb9 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sun, 30 Apr 2017 12:06:41 +0900 Subject: [PATCH] Use FZF_PREVIEW_HEIGHT if available. Requires fzf 0.16.7. Close #361 --- bin/preview.rb | 10 +++++++--- bin/preview.sh | 31 +++++++++++++++++-------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bin/preview.rb b/bin/preview.rb index a46fd88..09b1bc0 100755 --- a/bin/preview.rb +++ b/bin/preview.rb @@ -33,9 +33,13 @@ if `file --mime "#{file}"` =~ /binary/ end center = (center || 0).to_i -height = File.readable?('/dev/tty') ? `stty size < /dev/tty`.split.first.to_i : 40 -height /= 2 if split -height -= 2 # preview border +if ENV['FZF_PREVIEW_HEIGHT'] + height = ENV['FZF_PREVIEW_HEIGHT'].to_i +else + height = File.readable?('/dev/tty') ? `stty size < /dev/tty`.split.first.to_i : 40 + height /= 2 if split + height -= 2 # preview border +end offset = [1, center - height / 3].max IO.popen(['sh', '-c', COMMAND.gsub('{}', Shellwords.shellescape(path))]) do |io| diff --git a/bin/preview.sh b/bin/preview.sh index a798662..330517d 100755 --- a/bin/preview.sh +++ b/bin/preview.sh @@ -4,13 +4,13 @@ REVERSE="\x1b[7m" RESET="\x1b[m" if [ "$1" == "-v" ]; then - SPLIT=1 - shift + SPLIT=1 + shift fi if [ -z "$1" ]; then - echo "usage: $0 [-v] FILENAME[:LINENO][:IGNORED]" - exit 1 + echo "usage: $0 [-v] FILENAME[:LINENO][:IGNORED]" + exit 1 fi IFS=':' read -r -a INPUT <<< "$1" @@ -18,8 +18,8 @@ FILE=${INPUT[0]} CENTER=${INPUT[1]} if [ ! -r "$FILE" ]; then - echo "File not found ${FILE}" - exit 1 + echo "File not found ${FILE}" + exit 1 fi if [[ "$(file --mime "$FILE")" =~ binary ]]; then @@ -28,22 +28,25 @@ if [[ "$(file --mime "$FILE")" =~ binary ]]; then fi if [ -z "$CENTER" ]; then - CENTER=1 + CENTER=1 fi -if [ -r /dev/tty ]; then - LINES=$(stty size < /dev/tty | awk '{print $1}') +if [ -n "$FZF_PREVIEW_HEIGHT" ]; then + LINES=$FZF_PREVIEW_HEIGHT else + if [ -r /dev/tty ]; then + LINES=$(stty size < /dev/tty | awk '{print $1}') + else LINES=40 -fi - -if [ -n "$SPLIT" ]; then + fi + if [ -n "$SPLIT" ]; then LINES=$(($LINES/2)) # using horizontal split + fi + LINES=$(($LINES-2)) # remove preview border fi -LINES=$(($LINES-2)) # remove preview border FIRST=$(($CENTER-$LINES/3)) FIRST=$(($FIRST < 1 ? 1 : $FIRST)) LAST=$((${FIRST}+${LINES}-1)) -awk "NR >= $FIRST && NR <= $LAST {if (NR == $CENTER) printf(\"\x1b[7m%5d %s\n\x1b[m\", NR, \$0); else printf(\"%5d %s\n\", NR, \$0)}" $FILE +awk "NR >= $FIRST && NR <= $LAST {if (NR == $CENTER) printf(\"$REVERSE%5d %s\n$RESET\", NR, \$0); else printf(\"%5d %s\n\", NR, \$0)}" $FILE