From 733b602554b4098df514c5aefeb06ebbb7d23bec Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Wed, 3 Jun 2020 07:43:46 -0500
Subject: Add G bind

---
 bollux | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/bollux b/bollux
index 2325624..b6fb2a5 100755
--- a/bollux
+++ b/bollux
@@ -141,10 +141,16 @@ set_title() {
 	printf '\e]2;%s - bollux\007' "$*"
 }
 
-prompt() {
+prompt() { # prompt [-u] PROMPT [READ_ARGS...]
+	read_cmd=(read -e -r)
+	if [[ "$1" == "-u" ]]; then
+		read_cmd+=(-i "$BOLLUX_URL")
+		shift
+	fi
 	prompt="$1"
 	shift
-	read </dev/tty -e -r -p "$prompt> " "$@"
+	read_cmd+=(-p "$prompt> ")
+	"${read_cmd[@]}" </dev/tty "$@"
 }
 
 blastoff() { # load a url
@@ -406,9 +412,7 @@ display() {
 	text/*)
 		set_title "$BOLLUX_URL"
 		less_cmd=(less -R)
-		{
-			[[ -r "$BOLLUX_LESSKEY" ]] || mklesskey "$BOLLUX_LESSKEY"
-		} && less_cmd+=(-k "$BOLLUX_LESSKEY")
+		mklesskey "$BOLLUX_LESSKEY" && less_cmd+=(-k "$BOLLUX_LESSKEY")
 		less_cmd+=(
 			-Pm'bollux$'
 			-PM'o\:open, g\:goto, [\:back, ]\:forward, r\:refresh$'
@@ -447,8 +451,9 @@ mklesskey() {
 		[ quit 2 # 50 back
 		] quit 3 # 51 forward
 		r quit 4 # 52 re-request / download
+		G quit 5 # 53 goto a url (pre-filled)
 		# other keybinds
-		\40 forw-screen-force
+		\\40 forw-screen-force
 	END
 }
 
@@ -482,7 +487,7 @@ typeset_gemini() {
 
 	while IFS= read -r; do
 		case "$REPLY" in
-		'```'*)
+		'```' | '```'*)
 			if $pre; then
 				pre=false
 			else
@@ -627,6 +632,10 @@ handle_keypress() {
 	52) # r - re-request the current resource
 		run blastoff "$BOLLUX_URL"
 		;;
+	53) # G - goto a url (pre-filled with current)
+		prompt -u GO URL
+		run blastoff -u "$URL"
+		;;
 	*) # 53-57 -- still available for binding
 		;;
 	esac
-- 
cgit 1.4.1-21-gabe81