]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/bat.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Updated imap (markdown)
[etc/awesome.git] / widgets / bat.lua
index 0461607c62bdc36bfc8573b4f00cfc558e4a1427..48a14fb844f719cd83a57aa2ba35bf378387a528 100644 (file)
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
+local newtimer     = require("lain.helpers").newtimer
 local first_line   = require("lain.helpers").first_line
 
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local math         = { floor  = math.floor }
 local string       = { format = string.format }
+local tonumber     = tonumber
 
 local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
-local bat = {
-    status = "not present",
-    perc   = "N/A",
-    time   = "N/A",
-}
+local bat = {}
 
-function worker(args)
+local function worker(args)
     local args = args or {}
+    local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
-    local show_all = args.show_all or false
-    local refresh_timeout = args.refresh_timeout or 30
-    local header = args.header or " Bat "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or "#FFFFFF"
-    local shadow = args.shadow or false
+    local notify = args.notify or "on"
+    local settings = args.settings or function() end
 
-    local mybattery = wibox.widget.textbox()
+    bat.widget = wibox.widget.textbox('')
 
-    local mybatteryupdate = function()
-        local present = first_line("/sys/class/power_supply/"
-                                   .. battery
-                                   .. "/present")
+    function update()
+        bat_now = {
+            status = "Not present",
+            perc   = "N/A",
+            time   = "N/A",
+            watt   = "N/A"
+        }
+
+        local bstr  = "/sys/class/power_supply/" .. battery
+
+        local present = first_line(bstr .. "/present")
 
         if present == "1"
         then
-            local rate = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                    "/power_now")
-            local ratev = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                     "/voltage_now")
-            local rem = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/energy_now")
-            local tot = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/energy_full")
-            bat.status = first_line("/sys/class/power_supply/"
-                                    .. battery ..
-                                   "/status")
+            local rate  = first_line(bstr .. "/power_now") or
+                          first_line(bstr .. "/current_now")
+
+            local ratev = first_line(bstr .. "/voltage_now")
+
+            local rem   = first_line(bstr .. "/energy_now") or
+                          first_line(bstr .. "/charge_now")
+
+            local tot   = first_line(bstr .. "/energy_full") or
+                          first_line(bstr .. "/charge_full")
+
+            bat_now.status = first_line(bstr .. "/status") or "N/A"
+
+            rate  = tonumber(rate)
+            ratev = tonumber(ratev)
+            rem   = tonumber(rem)
+            tot   = tonumber(tot)
 
             local time_rat = 0
-            if bat.status == "Charging"
+            if bat_now.status == "Charging"
             then
-                status = "(+)"
                 time_rat = (tot - rem) / rate
-            elseif bat.status == "Discharging"
+            elseif bat_now.status == "Discharging"
             then
-                status = "(-)"
                 time_rat = rem / rate
-            else
-                status = "(.)"
             end
 
             local hrs = math.floor(time_rat)
-            local min = (time_rat - hrs) * 60
-            bat.time = string.format("%02d:%02d", hrs, min)
+            if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
 
-            local amount = (rem / tot) * 100
+            local min = math.floor((time_rat - hrs) * 60)
+            if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
-            if shadow
-            then
-                bat.perc = string.format("%d", amount)
-            else
-                bat.perc = string.format("%d%%", amount)
-            end
+            bat_now.time = string.format("%02d:%02d", hrs, min)
 
-            local watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            local perc = (rem / tot) * 100
+            if perc <= 100 then
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
 
-            if show_all
-            then
-                text = watt .. " " .. bat.perc .. " " .. bat.time .. " " .. bat.status
+            if rate ~= nil and ratev ~= nil then
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
             else
-                text = bat.perc
+                bat_now.watt = "N/A"
             end
 
             -- notifications for low and critical states
-            if amount <= 5
+            if bat_now.status == "Discharging" and notify == "on"
             then
-                naughty.notify{
-                    text = "shutdown imminent",
-                    title = "battery nearly exhausted",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#000000",
-                    bg="#ffffff",
-                    ontop = true
-                }
-            elseif amount <= 15
-            then
-                old_id = naughty.notify{
-                    text = "plug the cable",
-                    title = "battery low",
-                    position = "top_right",
-                    timeout = 5,
-                    fg="#202020",
-                    bg="#cdcdcd",
-                    ontop = true
-                }
+                if tonumber(bat_now.perc) <= 5
+                then
+                    bat.id = naughty.notify({
+                        text = "shutdown imminent",
+                        title = "battery nearly exhausted",
+                        position = "top_right",
+                        timeout = 15,
+                        fg="#000000",
+                        bg="#ffffff",
+                        ontop = true,
+                        replaces_id = bat.id
+                    }).id
+                elseif tonumber(bat_now.perc) <= 15
+                then
+                    bat.id = naughty.notify({
+                        text = "plug the cable",
+                        title = "battery low",
+                        position = "top_right",
+                        timeout = 15,
+                        fg="#202020",
+                        bg="#cdcdcd",
+                        ontop = true,
+                        replaces_id = bat.id
+                    }).id
+                end
             end
-        else
-            text = "none"
         end
 
-        if shadow
-        then
-            mybattery:set_text('')
-        else
-            mybattery:set_markup(markup(header_color, header)
-                                 .. markup(color, text) .. " ")
-        end
+        widget = bat.widget
+        settings()
     end
 
-    local mybatterytimer = timer({ timeout = refresh_timeout })
-    mybatterytimer:connect_signal("timeout", mybatteryupdate)
-    mybatterytimer:start()
-    mybatterytimer:emit_signal("timeout")
-
-    bat.widget = mybattery
+    newtimer("bat", timeout, update)
 
-    return setmetatable(bat, { __index = bat.widget })
+    return bat.widget
 end
 
 return setmetatable(bat, { __call = function(_, ...) return worker(...) end })