Add an option to use ddcinfo for display/monitor setup. In some

cases like with the savage chip (T22) the proper setup fails, if
no proper H/V syncs are defined ...


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2021 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 36 insertions, 3 deletions

diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
index 2a367fa2..bfb68765 100644
--- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
@@ -69,6 +69,18 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
+        'xserver::ddcinfo' => {
+            applies_to_systems => 1,
+            applies_to_clients => 0,
+            description => unshiftHereDoc(<<'            End-of-Here'),
+            should the 'xserver'-plugin use the ddcinfo (if available) for
+            the monitor/tft setup? Might help in scenarios with resolutions
+            configured much lower than physically possible. (0 ignore, 1 use)
+            End-of-Here
+            content_regex => qr{^(0|1)$},
+            content_descr => '0 ignore ddcinfo, 1 use ddcinfo if available',
+            default => '0',
+        },
 
         # plugin specific attributes start here ...
 
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index ddbcba6a..7019c324 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -131,6 +131,11 @@ Section "DRI"
   Mode    0666
 EndSection
 '   >> $xfc
+    # if no module was detected, stick to vesa module
+    if [ -z "$xmodule" ] ; then
+      xmodule=vesa
+      error "xserver: no proper module was detected"
+    fi
     sed "s/vesa/$xmodule/;s/\"us\"/\"${XKEYBOARD}\"/" -i $xfc
     # these directories might be distro specific
     for file in /var/lib/xkb/compiled ; do
@@ -151,8 +156,16 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents"
 }' -i $xfc
     fi
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'xserver' os-plugin ...";
+    # run distro specific generated stage3 script
+    [ -e /mnt/opt/openslx/plugin-repo/xserver/xserver.sh ] && \
+      . /mnt/opt/openslx/plugin-repo/xserver/xserver.sh
+    if [ $xserver_ddcinfo -ne 0 ] ; then
+      # read /etc/hwinfo.monitor started at "runinithook '00-started'"
+      # and add
+      #   Horizsync       28.0-65.0??
+      #   Vertrefresh     57.0-63.0??
+      # in Monitor section
+      :
+    fi
   fi
-  # run distro specific generated stage3 script
-  [ -e /mnt/opt/openslx/plugin-repo/xserver/xserver.sh ] && \
-    . /mnt/opt/openslx/plugin-repo/xserver/xserver.sh
 fi
diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
new file mode 100644
index 00000000..1b8171cc
--- /dev/null
+++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
@@ -0,0 +1,8 @@
+#!/bin/ash
+# get an idea of the installed graphics hardware - might be needed if the
+# automatic Xorg configation fails in this field. If no useable info was
+# detected just delete the file.
+
+( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \
+    /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) &
+