Change display and keymaps

1 files changed, 19 insertions, 7 deletions

@@ -139,7 +139,7 @@ bollux_quit() {
 }
 
 set_title() {
-        printf '\e]2;%s - bollux\007' "$*"
+        printf '\e]2;%s\007' "$*"
 }
 
 prompt() { # prompt [-u] PROMPT [READ_ARGS...]
@@ -573,19 +573,18 @@ display() { # display METADATA [TITLE]
 
         case "$mime" in
         text/*)
-                set_title "$BOLLUX_URL"
+                set_title "$title${title:+ - }bollux"
                 less_cmd=(less -R)
                 mklesskey "$BOLLUX_LESSKEY" && less_cmd+=(-k "$BOLLUX_LESSKEY")
                 less_cmd+=(
-                        -Pm"$title${title:+ - }bollux$"
-                        -PM'o\:open, g\:goto, [\:back, ]\:forward, r\:refresh$'
+                        -Pm"$(less_prompt_escape "$BOLLUX_URL") - bollux$"
+                        -P='o\:open, g\:goto, [\:back, ]\:forward, r\:refresh$'
                         -m
-                        -S
                 )
 
                 local typeset
                 local submime="${mime#*/}"
-                if declare -Fp "typeset_$submime" >/dev/null; then
+                if declare -Fp "typeset_$submime" &>/dev/null; then
                         typeset="typeset_$submime"
                 else
                         typeset="passthru"
@@ -602,6 +601,18 @@ display() { # display METADATA [TITLE]
         esac
 }
 
+less_prompt_escape() {
+        local i
+        for ((i = 0; i < ${#1}; i++)); do
+                : "${1:i:1}"
+                case "$_" in
+                [\?:\.%\\]) printf '\%s' "$_" ;;
+                *) printf '%s' "$_" ;;
+                esac
+        done
+        printf '\n'
+}
+
 mklesskey() {
         lesskey -o "$1" - <<-END
                 #command
@@ -615,7 +626,8 @@ mklesskey() {
                 \\40 forw-screen-force
                 h left-scroll
                 l right-scroll
-                ? toggle-option M
+                ? status   # 'status' will show a little help thing.
+                = noaction
         END
 }