X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/5f32175e3d98e64bf3caadcfce016740a154b6cc..a34e72b42bfa681afba744a190d8bb3e26252310:/widget/bat.lua?ds=sidebyside

diff --git a/widget/bat.lua b/widget/bat.lua
index 4182e07..34d63e5 100644
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -1,10 +1,9 @@
-
 --[[
-												                        
-	 Licensed under GNU General Public License v2 
-	  * (c) 2013,      Luke Bonham                
-	  * (c) 2010-2012, Peter Hofmann              
-												                        
+
+	 Licensed under GNU General Public License v2
+	  * (c) 2013,      Luca CPZ
+	  * (c) 2010-2012, Peter Hofmann
+
 --]]
 
 local first_line = require("lain.helpers").first_line
@@ -17,7 +16,6 @@ local math       = { abs    = math.abs,
                      min    = math.min }
 local string     = { format = string.format }
 local ipairs     = ipairs
-local type       = type
 local tonumber   = tonumber
 
 -- Battery infos
@@ -30,8 +28,17 @@ local function factory(args)
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local ac        = args.ac or "AC0"
     local notify    = args.notify or "on"
+    local n_perc    = args.n_perc or { 5, 15 }
     local settings  = args.settings or function() end
 
+    bat_notification_critical_preset = {
+        title   = "Battery exhausted",
+        text    = "Shutdown imminent",
+        timeout = 15,
+        fg      = "#000000",
+        bg      = "#FFFFFF"
+    }
+
     bat_notification_low_preset = {
         title   = "Battery low",
         text    = "Plug the cable!",
@@ -40,12 +47,12 @@ local function factory(args)
         bg      = "#CDCDCD"
     }
 
-    bat_notification_critical_preset = {
-        title   = "Battery exhausted",
-        text    = "Shutdown imminent",
+    bat_notification_charged_preset = {
+        title   = "Battery full",
+        text    = "You can unplug the cable",
         timeout = 15,
-        fg      = "#000000",
-        bg      = "#FFFFFF"
+        fg      = "#202020",
+        bg      = "#CDCDCD"
     }
 
     bat_now = {
@@ -63,6 +70,9 @@ local function factory(args)
         bat_now.n_perc[i] = 0
     end
 
+    -- used to notify full charge only once before discharging
+    local fullnotification = false
+
     function bat.update()
         local sum_rate_current = 0
         local sum_rate_voltage = 0
@@ -157,18 +167,27 @@ local function factory(args)
         widget = bat.widget
         settings()
 
-        -- notifications for low and critical states
-        if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then
-            if bat_now.perc <= 5 then
-                bat.id = naughty.notify({
-                    preset = bat_notification_critical_preset,
-                    replaces_id = bat.id
-                }).id
-            elseif bat_now.perc <= 15 then
+        -- notifications for critical, low, and full levels
+        if notify == "on" then
+            if bat_now.status == "Discharging" then
+                if tonumber(bat_now.perc) <= n_perc[1] then
+                    bat.id = naughty.notify({
+                        preset = bat_notification_critical_preset,
+                        replaces_id = bat.id
+                    }).id
+                elseif tonumber(bat_now.perc) <= n_perc[2] then
+                    bat.id = naughty.notify({
+                        preset = bat_notification_low_preset,
+                        replaces_id = bat.id
+                    }).id
+                end
+                fullnotification = false
+            elseif bat_now.status == "Full" and not fullnotification then
                 bat.id = naughty.notify({
-                    preset = bat_notification_low_preset,
+                    preset = bat_notification_charged_preset,
                     replaces_id = bat.id
                 }).id
+                fullnotification = true
             end
         end
     end