add screen and tag arguments to useless_gaps_resize function

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

diff --git a/widget/bat.lua b/widget/bat.lua
index 8afd6a16598deb46b24d732932f55301c809cfbf..b65494811286e4a5e8087ef413e16e698e506ba7 100644 (file)
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -19,34 +19,34 @@ local tonumber   = tonumber
 -- lain.widget.bat
 
 local function factory(args)
-    local bat       = { widget = wibox.widget.textbox() }
-    local args      = args or {}
-    local timeout   = args.timeout or 30
-    local notify    = args.notify or "on"
-    local n_perc    = args.n_perc or { 5, 15 }
-    local pspath    = args.pspath or "/sys/class/power_supply/"
-    local settings  = args.settings or function() end
+    local pspath = args.pspath or "/sys/class/power_supply/"
 
     if not fs.is_dir(pspath) then
         naughty.notify { text = "lain.widget.bat: invalid power supply path", timeout = 0 }
         return
     end
 
-    bat.batteries = args.batteries or (args.battery and {args.battery}) or {}
-    bat.ac        = args.ac or "AC0"
+    local bat       = { widget = wibox.widget.textbox() }
+    local args      = args or {}
+    local timeout   = args.timeout or 30
+    local notify    = args.notify or "on"
+    local n_perc    = args.n_perc or { 5, 15 }
+    local batteries = args.batteries or (args.battery and {args.battery}) or {}
+    local ac        = args.ac or "AC0"
+    local settings  = args.settings or function() end
 
     function bat.get_batteries()
         helpers.line_callback("ls -1 " .. pspath, function(line)
             local bstr =  string.match(line, "BAT%w+")
             if bstr then
-                bat.batteries[#bat.batteries + 1] = bstr
+                batteries[#batteries + 1] = bstr
             else
-                bat.ac = string.match(line, "AC%w+") -- fallback one might be wrong
+                ac = string.match(line, "A%w+") or "AC0"
             end
         end)
     end
 
-    if #bat.batteries == 0 then bat.get_batteries() end
+    if #batteries == 0 then bat.get_batteries() end
 
     bat_notification_critical_preset = {
         title   = "Battery exhausted",
@@ -82,7 +82,7 @@ local function factory(args)
 
     bat_now.n_status = {}
     bat_now.n_perc   = {}
-    for i = 1, #bat.batteries do
+    for i = 1, #batteries do
         bat_now.n_status[i] = "N/A"
         bat_now.n_perc[i] = 0
     end
@@ -98,7 +98,7 @@ local function factory(args)
         local sum_energy_now   = 0
         local sum_energy_full  = 0
 
-        for i, battery in ipairs(bat.batteries) do
+        for i, battery in ipairs(batteries) do
             local bstr    = pspath .. battery
             local present = helpers.first_line(bstr .. "/present")
 
@@ -109,12 +109,12 @@ local function factory(args)
                 local rate_power   = tonumber(helpers.first_line(bstr .. "/power_now"))
 
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
-                local energy_now        = tonumber(helpers.first_line(bstr .. "/energy_now") or
-                                          helpers.first_line(bstr .. "/charge_now"))
+                local energy_now = tonumber(helpers.first_line(bstr .. "/energy_now") or
+                                   helpers.first_line(bstr .. "/charge_now"))
 
                 -- energy_full(P)[uWh], charge_full(I)[uAh]
-                local energy_full       = tonumber(helpers.first_line(bstr .. "/energy_full") or
-                                          helpers.first_line(bstr .. "/charge_full"))
+                local energy_full = tonumber(helpers.first_line(bstr .. "/energy_full") or
+                                    helpers.first_line(bstr .. "/charge_full"))
 
                 local energy_percentage = tonumber(helpers.first_line(bstr .. "/capacity")) or
                                           math.floor((energy_now / energy_full) * 100)