From 7876fcb336d8163a6115a3bd01448f5b9bdd0535 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Wed, 22 Jun 2011 00:26:51 +0200 Subject: [PATCH] op_lidsettings: Added new tool to change what happens when you close the lid (submitted by T4b) --- .../pandora-system/pandora-scripts/op_lid.sh | 72 +++++++++++------- .../pandora-scripts/op_lidsettings.pnd | Bin 0 -> 10188 bytes .../pandora-scripts/op_lidsettings.sh | 17 +++++ .../pandora-scripts/op_power.sh | 2 +- 4 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 recipes/pandora-system/pandora-scripts/op_lidsettings.pnd create mode 100644 recipes/pandora-system/pandora-scripts/op_lidsettings.sh diff --git a/recipes/pandora-system/pandora-scripts/op_lid.sh b/recipes/pandora-system/pandora-scripts/op_lid.sh index 757abcd..544676b 100644 --- a/recipes/pandora-system/pandora-scripts/op_lid.sh +++ b/recipes/pandora-system/pandora-scripts/op_lid.sh @@ -3,29 +3,49 @@ #only argument is 0 for open 1 for closed #may also be called after inactivity, like X DPMS -if [ ! -e /tmp/powerstate ]; then #do nothing when in powersave mode - if [ "$1" = "1" ]; then #lid was closed - brightness=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness) - if [ $brightness -gt 0 ]; then - echo $brightness > /tmp/oldbright - fi - echo 0 > /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness - #echo 1 > /sys/devices/platform/omapfb/graphics/fb0/blank - elif [ "$1" = "0" ]; then # lid was opened - #echo 0 > /sys/devices/platform/omapfb/graphics/fb0/blank - #sleep 0.1s # looks cleaner, could flicker without - maxbright=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/max_brightness) - oldbright=0 - if [ -f /tmp/oldbright ]; then - oldbright=$(cat /tmp/oldbright) - fi - if [ $oldbright -eq 0 ]; then - oldbright=$(cat /etc/pandora/conf/brightness.state) - fi - if [ $oldbright -ge 3 ] && [ $oldbright -le $maxbright ]; then - /usr/pandora/scripts/op_bright.sh $oldbright - else - /usr/pandora/scripts/op_bright.sh $maxbright - fi - fi -fi +config=$(cat $(grep /etc/passwd -e $(ps u -C xfce4-session | tail -n1 | awk '{print $1}')| cut -f 6 -d ":")/.lidstate) + +if [[ ! -e /tmp/powerstate || "$(cat /tmp/powerstate)" = "2" ]]; then #do nothing when in powersave mode unless we went into it because of a closed lid + if [ "$1" = "1" ]; then #lid was closed + case "$config" in + "shutdown") + /usr/pandora/scripts/op_power.sh 5 + ;; + "lowpower") + /usr/pandora/scripts/op_power.sh 1 + echo "2" > /tmp/powerstate + ;; + *) + echo "$config" + brightness=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness) + if [ $brightness -gt 0 ]; then + echo $brightness > /tmp/oldbright + fi + echo 0 > /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/brightness + #echo 1 > /sys/devices/platform/omapfb/graphics/fb0/blank + esac + elif [ "$1" = "0" ]; then # lid was opened + case "$config" in + "lowpower") + /usr/pandora/scripts/op_power.sh 1 + ;; + *) + #echo 0 > /sys/devices/platform/omapfb/graphics/fb0/blank + #sleep 0.1s # looks cleaner, could flicker without + maxbright=$(cat /sys/devices/platform/twl4030-pwm0-bl/backlight/twl4030-pwm0-bl/max_brightness) + oldbright=0 + if [ -f /tmp/oldbright ]; then + oldbright=$(cat /tmp/oldbright) + fi + if [ $oldbright -eq 0 ]; then + oldbright=$(cat /etc/pandora/conf/brightness.state) + fi + if [ $oldbright -ge 3 ] && [ $oldbright -le $maxbright ]; then + /usr/pandora/scripts/op_bright.sh $oldbright + else + /usr/pandora/scripts/op_bright.sh $maxbright + fi + ;; + esac + fi +fi \ No newline at end of file diff --git a/recipes/pandora-system/pandora-scripts/op_lidsettings.pnd b/recipes/pandora-system/pandora-scripts/op_lidsettings.pnd new file mode 100644 index 0000000000000000000000000000000000000000..878ef70b27407c2abeb1e0678f2d222d3a62c94f GIT binary patch literal 10188 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 bKJ6qfPkU*tN8JbiDFloS%=D`;t{49Yf}IR= literal 0 HcmV?d00001 diff --git a/recipes/pandora-system/pandora-scripts/op_lidsettings.sh b/recipes/pandora-system/pandora-scripts/op_lidsettings.sh new file mode 100644 index 0000000..c52adcd --- /dev/null +++ b/recipes/pandora-system/pandora-scripts/op_lidsettings.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# change what to do when the lid is closed/opened +case "$(cat $(grep /etc/passwd -e $(ps u -C xfce4-session | tail -n1 | awk '{print $1}')| cut -f 6 -d ":")/.lidstate)" in + "lowpower") + current="the Pandora goes into low power mode" + ;; + "shutdown") + current="the Pandora is shut down" + ;; + *) + current="the screen is turned off" + ;; +esac + +sel=$(zenity --title="Lid settings" --height=230 --list --column "id" --column "Please select" --hide-column=1 --text="What should happen when you close the Pandora's lid?\nAt the moment $current when you close the lid." "brightness" "Turn off the screen." "lowpower" "Go into low power mode (same as when pressing the +power button for less than 3 seconds)" "shutdown" "Shut the pandora down.") || exit +echo "$sel" > $(grep /etc/passwd -e $(ps u -C xfce4-session | tail -n1 | awk '{print $1}')| cut -f 6 -d ":")/.lidstate diff --git a/recipes/pandora-system/pandora-scripts/op_power.sh b/recipes/pandora-system/pandora-scripts/op_power.sh index bc87602..42b92ef 100644 --- a/recipes/pandora-system/pandora-scripts/op_power.sh +++ b/recipes/pandora-system/pandora-scripts/op_power.sh @@ -8,7 +8,7 @@ if [ "$1" -le "2" ]; then # button was pressed 1-2sec, "suspend" else powerstate=0 fi - if [ $powerstate -eq "1" ]; then + if [ $powerstate -ne 0 ]; then #switch from lowpower to normal mode oldspeed=$(cat /tmp/oldspeed) /usr/pandora/scripts/op_cpuspeed.sh $oldspeed -- 2.39.2