#263: followtag default to true; changing quake definition

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 991885a7aab82d0830c1062289594ed5de8a5afe..0b1bc0c4e6a2d1097a5f3ebd9a3df9badb6a0d6f 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -7,8 +7,9 @@
                                                                                                                        
 --]]
 
                                                                                                                        
 --]]
 

-local newtimer     = require("lain.helpers").newtimer

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

+local make_widget  = require("lain.helpers").make_widget_textbox
+local newtimer     = require("lain.helpers").newtimer

 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")


@@ -19,6 +20,7 @@ local math         = { abs    = math.abs,
                        min    = math.min }
 local string       = { format = string.format }
 
                        min    = math.min }
 local string       = { format = string.format }
 

+local ipairs       = ipairs

 local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable
 local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable


@@ -27,7 +29,7 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
 -- lain.widgets.bat
 
 local function worker(args)

-    local bat       = {}
+    local bat       = make_widget()

     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}


@@ -35,8 +37,6 @@ local function worker(args)
     local notify    = args.notify or "on"
     local settings  = args.settings or function() end
 
     local notify    = args.notify or "on"
     local settings  = args.settings or function() end
 

-    bat.widget = wibox.widget.textbox('')
-

     bat_notification_low_preset = {
         title   = "Battery low",
         text    = "Plug the cable!",
     bat_notification_low_preset = {
         title   = "Battery low",
         text    = "Plug the cable!",


@@ -68,7 +68,7 @@ local function worker(args)
         bat_now.n_perc[i] = 0
     end
 
         bat_now.n_perc[i] = 0
     end
 

-    function update()
+    function bat.update()

         local sum_rate_current = 0
         local sum_rate_voltage = 0
         local sum_rate_power   = 0
         local sum_rate_current = 0
         local sum_rate_voltage = 0
         local sum_rate_power   = 0


@@ -110,7 +110,16 @@ local function worker(args)
             end
         end
 
             end
         end
 

+        -- When one of the battery is charging, others' status are either
+        -- "Full", "Unknown" or "Charging". When the laptop is not plugged in,
+        -- one or more of the batteries may be full, but only one battery
+        -- discharging suffices to set global status to "Discharging".

         bat_now.status = bat_now.n_status[1]
         bat_now.status = bat_now.n_status[1]

+        for _,status in ipairs(bat_now.n_status) do
+            if status == "Discharging" or status == "Charging" then
+                bat_now.status = status
+            end
+        end

         bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
 
         if bat_now.status ~= "N/A" then
         bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
 
         if bat_now.status ~= "N/A" then


@@ -165,9 +174,9 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    newtimer(battery, timeout, update)
+    newtimer(battery, timeout, bat.update)

 
 

-    return setmetatable(bat, { __index = bat.widget })
+    return bat

 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })