op_lcdsettings: don't unconditionally disable screen blanking

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_lcdsettings.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh b/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
old mode 100755 (executable)
new mode 100644 (file)
index 593d44b..12b318e
--- a/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
+++ b/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
@@ -3,15 +3,16 @@
 # LCD-Settings, v1.0, written by Michael Mrozek aka EvilDragon 2010. Brightness-Settings-Part written by vimacs.
 # This scripts allows you to create, load and save Gamma-Settings and to change the LCD Brightness.
 
-while mainsel=$(zenity --title="LCD-Settings" --width="300" --height="200" --list --column "id" --column "Please select" --hide-column=1 --text="What do you want to do?" "bright" "Change LCD Brightness" "gamma" "Manage LCD Gamma" "filter" "Select current video filter" "filterdef" "Select default video filter"); do
+. /usr/pandora/scripts/op_paths.sh
+
+while mainsel=$(zenity --title="LCD-Settings" --width="300" --height="300" --list --column "id" --column "Please select" --hide-column=1 --text="Welcome to the LCD-Settings-Dialogue.\n\nWhat do you want to do?\n" "bright" "Change LCD Brightness" "gamma" "Manage LCD Gamma" "filter" "Select current video filter" "filterdef" "Select default video filter" "sblank" "Enable/disable screen blanking" --ok-label="Change Setting" --cancel-label="Exit"); do
 
 case $mainsel in
 
   "bright")
     minbright=3
-    maxbright=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/max_brightness)
-    curbright=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness)
-    device=/sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness
+    maxbright=$(cat $SYSFS_BACKLIGHT/max_brightness)
+    curbright=$(cat $SYSFS_BACKLIGHT/brightness)
     if [ ! $1 ]; then
       newbright=$(zenity --scale --text "Set brightness" --min-value=$minbright --max-value=$maxbright --value=$curbright --step 1)
     else
@@ -20,7 +21,7 @@ case $mainsel in
     if [ $newbright ]; then
         if [ $newbright -le $minbright ]; then newbright=$minbright; fi
         if [ $newbright -ge $maxbright ]; then newbright=$maxbright; fi
-         echo $newbright > $device
+         echo $newbright > $SYSFS_BACKLIGHT_BRIGHTNESS
     fi;;
 
    "gamma")
@@ -30,25 +31,25 @@ case $mainsel in
       gamma=$(grep "$selection" /etc/pandora/conf/gamma.conf | awk -F\; '{print $3}')
 
     if [ "${gamma}" = "syssyscreatenew" ]; then
-      cat /sys/devices/platform/omap2_mcspi.1/spi1.1/gamma > /tmp/gamma.current
+      cat $SYSFS_GAMMA > /tmp/gamma.current
       op_gammatool
       if zenity --question --title="Confirm new gamma setting" --text="Do you want to keep the current gamma setting or revert to the previous one?" --ok-label="Keep it" --cancel-label="Revert"; then
        if zenity --question --title="Save as profile" --text="Do you want to save the new gamma setting as new profile?\n\nNote: You can also test it out first and save it later by restarting the Gamma Manager" --ok-label="Save it now" --cancel-label="Don't save it now"; then    
          while ! name=$(zenity --title="Save current settings" --entry --text "Please enter a Name for the new profile.") || [ "x$name" = "x" ] ; do
            zenity --title="Error" --error --text="Please enter a name for the profile.." --timeout 6
          done
-         curr=$(cat /sys/devices/platform/omap2_mcspi.1/spi1.1/gamma)
+         curr=$(cat $SYSFS_GAMMA)
          desc=$(zenity --title="Save current settings" --entry --text "Please enter a description for the new profile.")
          echo "$name;$desc;$curr" >> /etc/pandora/conf/gamma.conf    
          zenity --info --title="Profile created" --text "The current gamma settings have been saved as a new profile." --timeout 6
        fi
      else
-       cat /tmp/gamma.current > /sys/devices/platform/omap2_mcspi.1/spi1.1/gamma
+       cat /tmp/gamma.current > $SYSFS_GAMMA
      fi
     elif [ "${gamma}" = "syssyssavecurrent" ]; then
-      curr=$(cat /sys/devices/platform/omap2_mcspi.1/spi1.1/gamma)
+      curr=$(cat $SYSFS_GAMMA)
     while ! name=$(zenity --title="Save current settings" --entry --text "Please enter a Name for the new profile.") || [ "x$name" = "x" ] ; do
-           zenity --title="Error" --error --text="Please enter a name for the profile.." --timeout 6
+      zenity --title="Error" --error --text="Please enter a name for the profile.." --timeout 6
     done
       desc=$(zenity --title="Save current settings" --entry --text "Please enter a description for the new profile.")
       echo "$name;$desc;$curr" >> /etc/pandora/conf/gamma.conf    
@@ -69,7 +70,7 @@ case $mainsel in
       fi
      fi
     else
-    echo $gamma > /sys/devices/platform/omap2_mcspi.1/spi1.1/gamma
+      echo $gamma > $SYSFS_GAMMA
     fi
     fi;;
 
@@ -86,5 +87,18 @@ case $mainsel in
       echo $videofilter > /etc/pandora/conf/filter.state
       zenity --info --title="Default Videofilter set" --text "The default video filter has been set." --timeout 6
     fi;;
+
+    "sblank")
+     user=$(cat /tmp/currentuser)
+     if zenity --question --title="Screen blanking" --text="Do you want to enable or disable the automatic screen blanking?" --ok-label="Enable it" --cancel-label="Disable it"; then 
+       sed -i "s/.*xset.*/# DISPLAY=:0 xset s off/g" /home/${user}/.xinitrc
+        zenity --info --title="Screen blanking" --text "The automatic screen blanking has been enabled." --timeout 6
+        DISPLAY=:0 xset s on
+       else
+         sed -i "s/.*xset.*/DISPLAY=:0 xset s off/g" /home/${user}/.xinitrc
+         zenity --info --title="Screen blanking" --text "The automatic screen blanking has been disabled." --timeout 6
+         DISPLAY=:0 xset s off
+       fi;;
 esac
-done
\ No newline at end of file
+done
+