Merge pull request #81 from bob8677/master

[instantos/instantOS.git] / monitor.sh

diff --git a/monitor.sh b/monitor.sh
index 103b625..18922fc 100755 (executable)
--- a/monitor.sh
+++ b/monitor.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-if [ $(whoami) = "root" ] || [ $(whoami) = "manjaro" ]; then
-    echo "user check successful"
-else
-    echo "please run this as root"
-    exit 1
-fi
+#####################################################
+# 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)
@@ -15,45 +13,78 @@ cd
 mkdir -p ~/instantos/monitor &>/dev/null
 cd ~/instantos/monitor
 
-xrandr | grep '[^s]connected' | grep -o '[0-9]*x[0-9]*+[0-9]*' | grep -o '[0-9]*$' >positions.txt
-AMOUNT=$(cat positions.txt | wc -l)
+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
-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]*' >resolutions.txt
+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')
+
+# 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"
+        echo "Resolution change detected"
+    else
+        echo "no resolution change"
+        [ "$1" = "-f" ] || exit
+    fi
+else
+    iconf resolutions "$RESOLUTIONS"
+fi
 
-if [ $(cat resolutions.txt | sort -u | wc -l) = "1" ]; then
+if [ $(echo "$RESOLUTIONS" | sort -u | wc -l) = "1" ]; then
     echo "resolutions identical"
-    head -1 resolutions.txt >max.txt
+    iconf max $(head -1 <<<"$RESOLUTIONS")
 else
-    let PIXELS1="$(head -1 resolutions.txt | grep -o '^[0-9]*') * $(cat resolutions.txt | head -1 | grep -o '[0-9]*$')"
-    let PIXELS2="$(tail -1 resolutions.txt | grep -o '^[0-9]*') * $(cat resolutions.txt | head -1 | grep -o '[0-9]*$')"
+    # 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
-        head -1 resolutions.txt >max.txt
+        iconf max "$(head -1 <<<$RESOLUTIONS)"
     else
-        tail -1 resolutions.txt >max.txt
+        iconf max "$(tail -1 <<<$RESOLUTIONS)"
     fi
 fi
 
+# rebuild wallpaper after resolution change
+
+changetrigger() {
+    rm ~/instantos/wallpapers/overlay.*
+    rm -rf ~/instantos/wallpapers/default
+
+    if iconf -i setwallpaper; then
+        instantwallpaper resolution
+    fi
+}
+
 if [ "$AMOUNT" = "1" ]; then
     echo "only one monitor found, further setup not needed"
+    changetrigger
     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"
 fi
 
-xrandr | grep '[^s]connected' | grep -o '^[^ ]*' >names.txt
-MONITOR1=$(head -1 positions.txt)
-MONITOR2=$(tail -1 positions.txt)
+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"
-    echo "$MONITOR1" >right.txt
+    iconf right "$MONITOR2"
 else
     echo "Monitor 2 is ${MONITOR2}px on the right"
-    echo "$MONITOR1" >right.txt
+    iconf right "$MONITOR2"
 fi
+
+changetrigger