[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[709] fvwm/components/scripts

[<dom...@us...>]

Revision: 709
          http://sourceforge.net/p/fvwm-crystal/code/709
Author:   dominique_libre
Date:     2015-09-24 14:23:00 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
components/scripts/FvwmScrpt-AcpiBatt: use the new way to get the ACPI battery status, thanks to Jorge Sampayo

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-AcpiBatt

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-09-24 13:54:25 UTC (rev 708)
+++ ChangeLog	2015-09-24 14:23:00 UTC (rev 709)
@@ -3,6 +3,10 @@
 Version 3.4.0
 -------------
 
+Jeudi 24 septembre 2015
+  components/scripts/FvwmScrpt-AcpiBatt: use the new way to get the ACPI battery status,
+  thanks to Jorge Sampayo.
+
 Mercredi 23 septembre 2015
   functions/Fullscreen: Automatic full screened applications:
   add a delay for Firefox, needed because Firefox think it now better than the

Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt	2015-09-24 13:54:25 UTC (rev 708)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt	2015-09-24 14:23:00 UTC (rev 709)
@@ -1,6 +1,9 @@
 #
 # LiNiO <li...@wo...> - 2005.01.15
 # 2005.08.12 - je¶li warto¶æ siê nie zmieni³a, nie wy¶wietla jej ponownie - usuniêcie efektu "migotania"
+# 2015.09.23 - Jorge Sampayo (jds...@gm...), change the function to
+# the new way to get the acpi battery status:
+# http://askubuntu.com/questions/69556/how-to-check-battery-status-using-terminal
 
 WindowTitle {FvwmScript-AcpiBatt}
 WindowSize 48 24
@@ -9,13 +12,11 @@
 
 Init
 Begin
-  Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
-  Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
-  Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
-  Set $batt = (Div $last 100)
-  Set $batt = (Div $remaining $batt)
+  Set $acstate = (GetOutput {cat /sys/class/power_supply/BAT0/status} 1 -1)
+  Set $batt = (GetOutput {cat /sys/class/power_supply/BAT0/capacity} 1 -1)
+
+  Set $batt_prev = -1
   Set $batt = $batt %
-  Set $batt_prev = -1
 
   If $acstate==Discharging Then
     Set $batt = * $batt 
@@ -23,7 +24,7 @@
 End
 
 PeriodicTasks
-Begin 
+Begin
  If (RemainderOfDiv (GetTime) 30)==0 Then
  Begin
    If $batt==$batt_prev Then
@@ -32,13 +33,9 @@
    End
    Else
    Begin
-
-    Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
-    Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
-    Set $batt = (Div $last 100)
-    Set $batt = (Div $remaining $batt)
+    Set $batt = (GetOutput {cat /sys/class/power_supply/BAT0/capacity} 1 -1)
+    Set $acstate = (GetOutput {cat /sys/class/power_supply/BAT0/status} 1 -1)
     Set $batt_prev = $batt
-    Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
 
     If $batt>99 Then
       ChangeColorset 1 1
@@ -55,7 +52,7 @@
           If $batt>24 Then
             ChangeForeColor 1 {#FF8800}
           Else
-  	  Begin
+	    Begin
             If $batt>12 Then
               ChangeForeColor 1 {#FF4400}
             Else
@@ -64,15 +61,14 @@
           End
         End
       End
-    
+
       Set $batt = $batt %
 
-      If $acstate==off-line Then
-        Set $batt = * $batt 
+      If $acstate==Discharging Then
+        Set $batt = * $batt
 
       ChangeTitle 1 $batt
     End
-
   End
 End
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.