Merge pull request #24 from blueluke/battery

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index c5279bdd84e7fc9bad8d4548de287da31cb1ec96..4a25d6315ced28c1d071408ccb5afd4f3ecd948b 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -27,10 +27,27 @@ local function worker(args)
     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 "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",


@@ -73,45 +90,50 @@ local function worker(args)
             end
 
             local hrs = math.floor(time_rat)
             end
 
             local hrs = math.floor(time_rat)

+            if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
+

             local min = math.floor((time_rat - hrs) * 60)
             local min = math.floor((time_rat - hrs) * 60)

+            if min < 0 then min = 0 elseif min > 59 then min = 59 end

 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)

-            bat_now.perc = string.format("%d", (rem / tot) * 100)
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)

 
 

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

+
+            if rate ~= nil and ratev ~= nil then
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            else
+                bat_now.watt = "N/A"
+            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"
+        then
+            if tonumber(bat_now.perc) <= 5
+            then
+                bat.id = naughty.notify({
+                    preset = bat_notification_critical_preset,
+                    replaces_id = bat.id
+                }).id
+            elseif tonumber(bat_now.perc) <= 15
+            then
+                bat.id = naughty.notify({
+                    preset = bat_notification_low_preset,
+                    replaces_id = bat.id
+                }).id
+            end
+        end

     end
 
     newtimer("bat", timeout, update)
     end
 
     newtimer("bat", timeout, update)