From 0e8f6637dcad09578a6bb33e1a15ac1036e5380b Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 12 Dec 2016 17:41:35 +1100
Subject: [PATCH] General: Cleanup main

---
 neofetch | 48 ++++++++++++++++++------------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/neofetch b/neofetch
index c9271f09..08c3a03f 100755
--- a/neofetch
+++ b/neofetch
@@ -1943,6 +1943,10 @@ get_image_backend() {
 
         "ascii") get_ascii 2>/dev/null ;;
     esac
+
+    # Set cursor position next to ascii art.
+    [[ "$image_backend" != "off" ]] && \
+        printf "%b" "\033[$((${lines:-0} - ${prompt_loc:-0}))A\033[9999999D"
 }
 
 get_ascii() {
@@ -2953,12 +2957,15 @@ get_term_padding() {
 }
 
 dynamic_prompt() {
-    if [[ "$image_backend" == "image" ]]; then
-        get_term_padding 2>/dev/null
+    case "$image_backend" in
+        "image")
+            get_term_padding 2>/dev/null
 
-        # Calculate image height in terminal cells.
-        lines="$(((height + (${border:-0} * 2) + ${yoffset:-0}) / font_height))"
-    fi
+            # Calculate image height in terminal cells.
+            lines="$(((height + (${border:-0} * 2) + ${yoffset:-0}) / font_height))"
+        ;;
+        "off") return ;;
+    esac
 
     # If the info is higher than the ascii/image place the prompt
     # based on the info height instead of the ascii/image height.
@@ -3336,42 +3343,23 @@ main() {
     get_bold
     get_distro_colors
 
-    # Restore cursor and clear screen on ctrl+c
-    trap 'printf "\033[?25h"; clear; exit' 2
-
     # If the script exits for any reason, unhide the cursor.
-    trap 'printf "\033[?25h"' EXIT
+    trap 'printf "\033[?25h\033[?7h"' EXIT
 
     # Hide the cursor and disable line wrap
     printf "\033[?25l\033[?7l"
 
     get_image_backend
-
-    if [[ "$image_backend" != "off" ]]; then
-        # Set cursor position next to ascii art
-        printf "%b" "\033[$((${lines:-0} - ${prompt_loc:-0}))A"
-
-        # Reset horizontal cursor position
-        printf "\033[9999999D"
-    fi
-
-    # Print the info
     old_functions
     get_cache_dir
     print_info 2>/dev/null
+    dynamic_prompt
 
-    # Prompt calculation
-    if [[ "$image_backend" != "off" ]]; then
-        dynamic_prompt
-
-        # w3m-img: Draw the image a second time to fix
-        # rendering issues in specific terminal emulators.
-        [[ "$image_backend" == "image" && "$image_program" == "w3m" ]] && display_image
-    fi
-
-    # Re-enable line wrap
-    printf "%b" "\033[?7h"
+    # w3m-img: Draw the image a second time to fix
+    # rendering issues in specific terminal emulators.
+    [[ "$image_backend" == "image" && "$image_program" == "w3m" ]] && display_image
 
+    # Take a screenshot
     [[ "$scrot" == "on" ]] && take_scrot
 
     # Show error messages