fixes

[distro-setup] / laptop-xrandr

diff --git a/laptop-xrandr b/laptop-xrandr
index bed869d3594d7d293200c49b13c6b724e390bec5..d57b43f1b6ec49f43d50a82e9a72036acb35ab54 100755 (executable)
--- a/laptop-xrandr
+++ b/laptop-xrandr
@@ -32,13 +32,13 @@ output=$(grep -E "^(HDMI|DP)[^ ]* connected [0-9]" $xf| awk '{print $1}' ||:)
 edid() {
   card=$1
   sha256sum </sys/class/drm/$card/edid | grep -oE '^.{10}'
-  }
+}
 
 restart=false
 left_right_arg=--right-of
 if [[ $output ]]; then
 
-  mode=$(grep -A1 -E "^$output" | tail -n1 | awk '{print $1}' $xf)
+  mode=$(grep -A1 -E "^$output" $xf | tail -n1 | awk '{print $1}')
 
   primary_res=$(awk '$2 == "connected" && $3 == "primary" { print $4 }' $xf | sed 's/+.*//')
   primary_x=${primary_res%x*}
@@ -48,13 +48,13 @@ if [[ $output ]]; then
 
   half_x=$(( x / 2 ))
 
-  x_offset=0
+  x_offset=$primary_x
 
   # identify monitors that are always on the left.
   if [[ $output == HDMI2 && $(edid card0-HDMI-A-2) == 192efbdcef ]] || \
        [[ $output == HDMI-1 && $(edid card1-HDMI-A-1 ) == 7c58f9ac1e ]]; then
     left_right_arg=--left-of
-    x_offset=$primary_x
+    x_offset=0
   fi
 
   # some monitors need off then on to become active
@@ -78,6 +78,12 @@ if [[ $output ]]; then
   # /298 & 336 are millimeters. I took them from a monitor I was using. I
   # don't know if they are important, I assume not important enough to
   # change for different monitors.
+
+  for x in LEFT RIGHT; do
+    if xrandr --listmonitors | awk '$2 == BIG-'$x |grep . >/dev/null; then
+      xrandr --delmonitor BIG-$x
+    fi
+  done
   xrandr --setmonitor BIG-LEFT $half_x/298x$y/336+0+$x_offset $output
   xrandr --setmonitor BIG-RIGHT $half_x/298x$y/336+$(( x_offset + half_x ))+0 none