Move terminal width calculation to it's own function for readability

Author: scottchiefbaker

diff-so-fancy

@@ -589,22 +589,7 @@ sub trim {
 # Print a line of em-dash or line-drawing chars the full width of the screen
 sub horizontal_rule {
 	my $color = $_[0] || "";
-
-	# Make width static so we only calculate it once
-	state $width;
-	if (!$width) {
-		my $tput = `tput cols 2>1`;
-		if (!$tput) {
-			print color('orange') . "Warning: `tput cols` did not return numeric input" . color('reset') . "\n";
-			$tput = 80;
-		}
-
-		$width = $ruler_width || $tput;
-	}
-
-	if (is_windows()) {
-		$width--;
-	}
+	my $width = get_terminal_width();
 
 	# em-dash http://www.fileformat.info/info/unicode/char/2014/index.htm
 	#my $dash = "\x{2014}";
@@ -879,4 +864,34 @@ sub starts_with_ansi {
 	}
 }
 
+sub get_terminal_width {
+	# Make width static so we only calculate it once
+	state $width;
+
+	if ($width) {
+		return $width;
+	}
+
+	# If there is a ruler width in the config we use that
+	if ($ruler_width) {
+		$width = $ruler_width;
+	# Otherwise we check the terminal width using tput
+	} else {
+		my $tput = `tput cols`;
+
+		if ($tput) {
+			$width = int($tput);
+
+			if (is_windows()) {
+				$width--;
+			}
+		} else {
+			print color('orange') . "Warning: `tput cols` did not return numeric input" . color('reset') . "\n";
+			$width = 80;
+		}
+	}
+
+	return $width;
+}
+
 # vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4