Improved showing any year in calendar widget.

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index b3f91dd732082923bebe8805b332e45263bf9d30..d55be1746def102d4e8db39a96fcc15b160204ab 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -21,17 +21,33 @@ local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
 
 -- Battery infos
 -- lain.widgets.bat

-local bat = {}

 
 local function worker(args)
 
 local function worker(args)

+    local bat = {}

     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"

-    local notify = args.notify or true
+    local notify = args.notify or "on"

     local settings = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
 
     local settings = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
 

+    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",
+        timeout = 15,
+        fg = "#000000",
+        bg = "#FFFFFF"
+    }
+

     function update()
         bat_now = {
             status = "Not present",
     function update()
         bat_now = {
             status = "Not present",


@@ -59,7 +75,7 @@ local function worker(args)
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 

-            rate  = tonumber(rate)
+            rate  = tonumber(rate) or 1

             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)
             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)


@@ -81,7 +97,8 @@ local function worker(args)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 

-            local perc = (rem / tot) * 100
+            local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((rem / tot) * 100)
+

             if perc <= 100 then
                 bat_now.perc = string.format("%d", perc)
             elseif perc > 100 then
             if perc <= 100 then
                 bat_now.perc = string.format("%d", perc)
             elseif perc > 100 then


@@ -96,44 +113,34 @@ local function worker(args)
                 bat_now.watt = "N/A"
             end
 
                 bat_now.watt = "N/A"
             end
 

-            -- notifications for low and critical states
-            if bat_now.status == "Discharging" and notify
-            then
-                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

         end
 
         widget = bat.widget
         settings()
         end
 
         widget = bat.widget
         settings()

+
+        -- notifications for low and critical states
+        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
+        then
+            local nperc = tonumber(bat_now.perc) or 100
+            if nperc <= 5
+            then
+                bat.id = naughty.notify({
+                    preset = bat_notification_critical_preset,
+                    replaces_id = bat.id,
+                }).id
+            elseif nperc <= 15
+            then
+                bat.id = naughty.notify({
+                    preset = bat_notification_low_preset,
+                    replaces_id = bat.id,
+                }).id
+            end
+        end

     end
 
     end
 

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

 
 

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

 end
 
 end
 

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