clean up a bit and use plain xorg.conf-files as long as the uci x11 parser is not...

[openwrt/svn-archive/archive.git] / Xorg / xorg / xserver / xorg-server / files / x.init

diff --git a/Xorg/xorg/xserver/xorg-server/files/x.init b/Xorg/xorg/xserver/xorg-server/files/x.init
index 6571696e516000ef0eff90f721427466174f988d..ac2e982d6529731f364e268dd4e921eab56b61d4 100755 (executable)
--- a/Xorg/xorg/xserver/xorg-server/files/x.init
+++ b/Xorg/xorg/xserver/xorg-server/files/x.init
@@ -4,28 +4,28 @@ START=99
 
 ARGS=""
 
 
 ARGS=""
 

-screen() {
-       local cfg="$1"
-       config_get resolution $cfg resolution
-       config_get dpi $cfg dpi
-       [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution"
-       [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi"
-}
-
-graphic() {
-       local cfg="$1"
-       config_get device $cfg device
-       [ -n "$device" ] && ARGS="$ARGS -fb $device"
-}
-
-input() {
-       local cfg="$1"
-       config_get device $cfg device
-       config_get driver $cfg driver
-       #[ -n "$device" ] || return 0
-       [ -n "$driver" ] || return 0
-       ARGS="$ARGS -$cfg $driver,,device=$device"
-}
+#screen() {
+#      local cfg="$1"
+#      config_get resolution $cfg resolution
+#      config_get dpi $cfg dpi
+#      [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution"
+#      [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi"
+#}
+#
+#graphic() {
+#      local cfg="$1"
+#      config_get device $cfg device
+#      [ -n "$device" ] && ARGS="$ARGS -fb $device"
+#}
+#
+#input() {
+#      local cfg="$1"
+#      config_get device $cfg device
+#      config_get driver $cfg driver
+#      #[ -n "$device" ] || return 0
+#      [ -n "$driver" ] || return 0
+#      ARGS="$ARGS -$cfg $driver,,device=$device"
+#}

 
 desktop() {
        local cfg="$1"
 
 desktop() {
        local cfg="$1"


@@ -38,14 +38,14 @@ desktop() {
 start() {
        export DISPLAY=":0"
        config_load x11
 start() {
        export DISPLAY=":0"
        config_load x11

-       config_foreach screen screen
-       config_foreach graphic graphic
-       config_foreach input input
+#      config_foreach screen screen
+#      config_foreach graphic graphic
+#      config_foreach input input

        Xorg $ARGS &
        sleep 1 # give the xserver some time get initialized
        config_foreach desktop desktop
        test -d /etc/xdg/autostart || exit
        Xorg $ARGS &
        sleep 1 # give the xserver some time get initialized
        config_foreach desktop desktop
        test -d /etc/xdg/autostart || exit

-       sleep 1 # give the first x11 application some time to get present - afterwars we'll start the x11 autostart applications
+       sleep 1 # give the first x11 application some time to get present - afterwards we'll start the x11 autostart applications

        for elem in `ls /etc/xdg/autostart/`; do
                if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then
                        continue
        for elem in `ls /etc/xdg/autostart/`; do
                if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then
                        continue