widgets: no global tables, but one instance per call; closes #336; closes #337

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

diff --git a/widget/bat.lua b/widget/bat.lua
index 3067b39a4c0cad2fb9584975209d2a71545c1ce6..e901842f27fc0492d5fe75952b217d895177d91e 100644 (file)
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -29,16 +29,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 n_perc    = args.n_perc or { 5, 15 }
     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",
@@ -47,6 +40,14 @@ local function factory(args)
         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",
@@ -156,14 +157,14 @@ local function factory(args)
         widget = bat.widget
         settings()
 
-        -- notifications for low and critical states
+        -- notifications for critical and low levels
         if notify == "on" and bat_now.status == "Discharging" then
-            if tonumber(bat_now.perc) <= 5 then
+            if tonumber(bat_now.perc) <= n_perc[1] then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id
-            elseif tonumber(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