Merge pull request #81 from bob8677/master

[instantos/instantOS.git] / monitor.sh

diff --git a/monitor.sh b/monitor.sh
index 9a19d75..18922fc 100755 (executable)
--- a/monitor.sh
+++ b/monitor.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+#####################################################
+# This script detects and saves screen resolutions ##
+# It resizes the wallpaper if things change        ##
+#####################################################
+
 command -v xrandr &>/dev/null ||
     (echo "please install xrandr" && exit 1)
+
 cd
 
 mkdir -p ~/instantos/monitor &>/dev/null
@@ -10,41 +16,47 @@ cd ~/instantos/monitor
 POSITIONS="$(xrandr | grep '[^s]connected' | grep -o '[0-9]*x[0-9]*+[0-9]*' | grep -o '[0-9]*$')"
 AMOUNT=$(wc -l <<<"$POSITIONS")
 
-# get monitor with highest resolution
 RESOLUTIONS=$(xrandr | grep '[^s]connected' | grep -Eo '[0-9]{1,}x[0-9]{1,}\+[0-9]{1,}\+[0-9]{1,}' |
     grep -o '[0-9]*x[0-9]*' | sed 's/ /\n/g')
 
-if OLDRES="$(iconf resolutions)"; then
+# check if resolutions are already configured
+# exit if no changes
+if iconf resolutions; then
+    OLDRES="$(iconf resolutions)"
     # see if resolution has changed
     if ! [ "$RESOLUTIONS" = "$OLDRES" ]; then
         iconf resolutions "$RESOLUTIONS"
-        CHANGERES="True"
         echo "Resolution change detected"
+    else
+        echo "no resolution change"
+        [ "$1" = "-f" ] || exit
     fi
+else
+    iconf resolutions "$RESOLUTIONS"
 fi
 
 if [ $(echo "$RESOLUTIONS" | sort -u | wc -l) = "1" ]; then
     echo "resolutions identical"
-    iconf -i max $(head -1 <<<"$RESOLUTIONS")
+    iconf max $(head -1 <<<"$RESOLUTIONS")
 else
+    # get monitor with highest resolution
     let PIXELS1="$(head -1 <<<$RESOLUTIONS | grep -o '^[0-9]*') * $(head -1 <<<$RESOLUTIONS | grep -o '[0-9]*$')"
     let PIXELS2="$(tail -1 <<<$RESOLUTIONS | grep -o '^[0-9]*') * $(tail -1 <<<$RESOLUTIONS | grep -o '[0-9]*$')"
     if [ "$PIXELS1" -gt "$PIXELS2" ]; then
-        iconf -i max "$(head -1 <<<$RESOLUTIONS)"
+        iconf max "$(head -1 <<<$RESOLUTIONS)"
     else
-        iconf -i max "$(tail -1 <<<$RESOLUTIONS)"
+        iconf max "$(tail -1 <<<$RESOLUTIONS)"
     fi
 fi
 
 # rebuild wallpaper after resolution change
+
 changetrigger() {
-    if [ -z "$CHANGERES" ]; then
-        echo "no resolution change"
-    else
-        if [ -e ~/instantos/wallpapers ] && command -v instantwallpaper; then
-            rm -rf ~/instantos/wallpapers
-            instantwallpaper w
-        fi
+    rm ~/instantos/wallpapers/overlay.*
+    rm -rf ~/instantos/wallpapers/default
+
+    if iconf -i setwallpaper; then
+        instantwallpaper resolution
     fi
 }
 
@@ -54,7 +66,7 @@ if [ "$AMOUNT" = "1" ]; then
     exit
 else
     if [ "$AMOUNT" -gt 2 ]; then
-        echo "only 2 monitors are supported"
+        echo "only 2 monitors are testes"
         exit
     fi
     echo "$AMOUNT monitors found"
@@ -65,11 +77,14 @@ iconf names "$(xrandr | grep '[^s]connected' | grep -o '^[^ ]*')"
 MONITOR1=$(head -1 <<<"$POSITIONS")
 MONITOR2=$(tail -1 <<<"$POSITIONS")
 
+# legacy leftover
+# in case some program ever needs it
 if [ "$MONITOR1" -gt "$MONITOR2" ]; then
     echo "Monitor 1 is ${MONITOR1}px on the right"
-    iconf -i right "$MONITOR2"
+    iconf right "$MONITOR2"
 else
     echo "Monitor 2 is ${MONITOR2}px on the right"
-    iconf -i right "$MONITOR2"
+    iconf right "$MONITOR2"
 fi
+
 changetrigger