From 31e758f1f1583f5ff89d4ba7b3ad7a59be96a2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Sun, 28 Aug 2016 22:03:39 +0200
Subject: fix display $WPSETTER

BUG: 1031
---
 util/fbsetbg | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/fbsetbg b/util/fbsetbg
index 1b3e1d9..f605897 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -408,10 +408,11 @@ case $WPSETTER in
         debugstory=$standardok
         ;;
     display)
-        full="`xwininfo -root 2> /dev/null|grep geom` -window root"
+        rootsize=`xwininfo -root 2> /dev/null|sed '/-geometry/!d; s/.* \([0-9]*x[0-9]*\)+.*/\1/g'`
+        full="-window root -resize ${rootsize}!"
         tile='-window root'
         center='-backdrop -window root'
-        aspect=$full
+        aspect="-window root -resize "${rootsize}^" -crop ${rootsize}+0+0 -gravity center -window root"
         debugstory=$standardrant
         ;;
     Esetroot)
@@ -553,7 +554,7 @@ fi
 
 
 $WPSETTER `eval echo $option` "$wallpaper"
-if [ $? -ne 0 ]; then
+if [ "$?" != "0" -a "$WPSETTER" != "display" ]; then # display is broken, all IM falsely fail for "unrecognized event type FOO"...
     message "Something went wrong while setting the wallpaper.
 Run '$WPSETTER "`eval echo $option` $wallpaper"' from an xterm to find out what."
     exit 1
-- 
cgit v0.11.2