From df01e3fc96a1b1079a6c4bde8c00ffa77c5341fd Mon Sep 17 00:00:00 2001
From: Ricky Jon <rickyjon.au@gmail.com>
Date: Sun, 16 Dec 2018 10:39:06 +1100
Subject: [PATCH] Use xdotool to get height rather than using xrandr

---
 .bashrc                     | 2 +-
 .config/newsboat/config     | 3 +--
 .config/ranger/rc.conf      | 3 ++-
 .scripts/tools/dmenuhandler | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bashrc b/.bashrc
index 652564f6..bfd604ee 100644
--- a/.bashrc
+++ b/.bashrc
@@ -45,7 +45,7 @@ alias diff="diff --color=auto"
 alias ccat="highlight --out-format=ansi" # Color cat - print file with syntax highlighting.
 
 # Internet
-alias yt="youtube-dl --add-metadata -ic -f '(best[height<=`xrandr | sed -n '/connected primary/p' | awk '{print $4}' | sed 's/x/\n/g' | sed -n 1p`])/best'" #Download video link
+alias yt="youtube-dl --add-metadata -ic -f '(best[height<=`xdotool getdisplaygeometry | awk '{print $1}'`])/best'" #Download video link
 alias yta="yt -x -f bestaudio/best" # Download only audio
 alias YT="youtube-viewer"
 
diff --git a/.config/newsboat/config b/.config/newsboat/config
index fc1c5953..f374ded5 100644
--- a/.config/newsboat/config
+++ b/.config/newsboat/config
@@ -32,8 +32,7 @@ color article cyan default
 
 browser linkhandler
 macro , open-in-browser
-macro t set browser "tsp youtube-dl --add-metadata -ic -f '(best[height<=`xrandr | sed -n '/connected primary/p' | awk '{print $4}' | sed 's/x/\n/g' | sed -n 1p`])/best'"; open-in-browser ; set browser linkhandler
-
+macro t set browser "tsp youtube-dl --add-metadata -ic -f '(best[height<=`xdotool getdisplaygeometry | awk '{print $1}'`])/best'"; open-in-browser ; set browser linkhandler
 macro a set browser "tsp youtube-dl --add-metadata -xic -f bestaudio/best"; open-in-browser ; set browser linkhandler
 macro v set browser "setsid nohup mpv"; open-in-browser ; set browser linkhandler
 macro w set browser "w3m"; open-in-browser ; set browser linkhandler
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index 7f0ea10f..bd247902 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -514,5 +514,6 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po
 
 #Downloading
 
-map ytv console shell youtube-dl --add-metadata -ic -f '(best[height<=`xrandr | sed -n '/connected primary/p' | awk '{print $4}' | sed 's/x/\n/g' | sed -n 1p`])/best' %space
+map ytv console shell youtube-dl --add-metadata -ic -f '(best[height<=`xdotool getdisplaygeometry | awk '{print $1}'`])/best' %space
+
 map yta console shell youtube-dl -xic -f bestaudio/best%space
diff --git a/.scripts/tools/dmenuhandler b/.scripts/tools/dmenuhandler
index 7563f1c9..e0c41803 100755
--- a/.scripts/tools/dmenuhandler
+++ b/.scripts/tools/dmenuhandler
@@ -7,7 +7,7 @@ case "$(printf "copy url\\nmpv\\nmpv (loop)\\nqueue download\\n\\nqueue youtube-
 	mpv) setsid mpv -quiet "$1" >/dev/null 2>&1 & ;;
 	"mpv (loop)") setsid mpv -quiet --loop "$1" >/dev/null 2>&1 & ;;
 	"queue download") tsp curl -LO "$1" >/dev/null 2>&1 ;;
-	"queue youtube-dl") tsp "youtube-dl --add-metadata -ic -f '(best[height<=`xrandr | sed -n '/connected primary/p' | awk '{print $4}' | sed 's/x/\n/g' | sed -n 1p`])/best'" "$1" >/dev/null 2>&1 ;;
+	"queue youtube-dl") tsp "youtube-dl --add-metadata -ic -f '(best[height<=`xdotool getdisplaygeometry | awk '{print $1}'`])/best'" "$1" >/dev/null 2>&1 ;;
 	browser) setsid "$TRUEBROWSER" "$1" >/dev/null 2>&1 & ;;
 	feh) setsid feh "$1" >/dev/null 2>&1 & ;;
 	w3m) w3m "$1" >/dev/null 2>&1 ;;