quake: iterate on all screens; #339

[etc/awesome.git] / widget / bat.lua

diff --git a/widget/bat.lua b/widget/bat.lua
index 9976517423aaf61d4aa6c97855dfed2795c1c63d..8e04569128b6b6131de342f1f805fa14f4ae7fb6 100644 (file)
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -1,10 +1,9 @@
-

 --[[
 --[[

-                                                                                                                       
-        Licensed under GNU General Public License v2 
-         * (c) 2013,      Luke Bonham                
-         * (c) 2010-2012, Peter Hofmann              
-                                                                                                                       
+
+        Licensed under GNU General Public License v2
+         * (c) 2013,      Luke Bonham
+         * (c) 2010-2012, Peter Hofmann
+

 --]]
 
 local first_line = require("lain.helpers").first_line
 --]]
 
 local first_line = require("lain.helpers").first_line


@@ -17,7 +16,6 @@ local math       = { abs    = math.abs,
                      min    = math.min }
 local string     = { format = string.format }
 local ipairs     = ipairs
                      min    = math.min }
 local string     = { format = string.format }
 local ipairs     = ipairs

-local type       = type

 local tonumber   = tonumber
 
 -- Battery infos
 local tonumber   = tonumber
 
 -- Battery infos


@@ -30,16 +28,9 @@ local function factory(args)
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local ac        = args.ac or "AC0"
     local notify    = args.notify or "on"
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local ac        = args.ac or "AC0"
     local notify    = args.notify or "on"

+    local n_perc    = args.n_perc or { 5, 15 }

     local settings  = args.settings or function() end
 
     local settings  = args.settings or function() end
 

-    bat_notification_low_preset = {
-        title   = "Battery low",
-        text    = "Plug the cable!",
-        timeout = 15,
-        fg      = "#202020",
-        bg      = "#CDCDCD"
-    }
-

     bat_notification_critical_preset = {
         title   = "Battery exhausted",
         text    = "Shutdown imminent",
     bat_notification_critical_preset = {
         title   = "Battery exhausted",
         text    = "Shutdown imminent",


@@ -48,6 +39,14 @@ local function factory(args)
         bg      = "#FFFFFF"
     }
 
         bg      = "#FFFFFF"
     }
 

+    bat_notification_low_preset = {
+        title   = "Battery low",
+        text    = "Plug the cable!",
+        timeout = 15,
+        fg      = "#202020",
+        bg      = "#CDCDCD"
+    }
+

     bat_now = {
         status    = "N/A",
         ac_status = "N/A",
     bat_now = {
         status    = "N/A",
         ac_status = "N/A",


@@ -119,9 +118,9 @@ local function factory(args)
 
         if bat_now.status ~= "N/A" then
             if bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
 
         if bat_now.status ~= "N/A" then
             if bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then

-                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
-                                                               bat_now.time  = "00:00"
-                                                               bat_now.watt  = 0
+                bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0

 
             -- update {perc,time,watt} iff battery not full and rate > 0
             elseif bat_now.status ~= "Full" then
 
             -- update {perc,time,watt} iff battery not full and rate > 0
             elseif bat_now.status ~= "Full" then


@@ -157,14 +156,14 @@ local function factory(args)
         widget = bat.widget
         settings()
 
         widget = bat.widget
         settings()
 

-        -- notifications for low and critical states
-        if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then
-            if bat_now.perc <= 5 then
+        -- notifications for critical and low levels
+        if notify == "on" and bat_now.status == "Discharging" then
+            if tonumber(bat_now.perc) <= n_perc[1] then

                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id

-            elseif bat_now.perc <= 15 then
+            elseif tonumber(bat_now.perc) <= n_perc[2] then

                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id