helpers.newtimer: added stoppable option

[etc/awesome.git] / widgets / contrib / tpbat / init.lua

diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index 72d6453c2f2f7b0de67ebde8427c4e89f3bd2ed4..380625f1b622a6a4319d3e308cc50913d754df55 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -17,7 +17,6 @@
 local debug        = { getinfo = debug.getinfo }
 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")
 
@@ -34,22 +33,20 @@ local smapi        = require("smapi")
 local tpbat = { }
 local tpbat_notification = nil
 
-function tpbat:hide()
-    if tpbat_notification ~= nil
-    then
-        naughty.destroy(tpbat_notification)
-        tpbat_notification = nil
-    end
+function tpbat.hide()
+    if not tpbat.notification then return end
+    naughty.destroy(tpbat.notification)
+    tpbat.notification = nil
 end
 
-function tpbat:show(t_out)
-    tpbat:hide()
+function tpbat.show(t_out)
+    tpbat.hide()
 
     local bat   = self.bat
-    local t_out = t_out or 0
 
     if bat == nil or not bat:installed() then return end
 
+    local t_out = t_out or 0
     local mfgr   = bat:get('manufacturer') or "no_mfgr"
     local model  = bat:get('model') or "no_model"
     local chem   = bat:get('chemistry') or "no_chem"
@@ -73,9 +70,10 @@ function tpbat:show(t_out)
                 .. string.format("\n%s \t\t\t %s", status:upper(), msg)
 
     tpbat_notification = naughty.notify({
-        preset = { fg = beautiful.fg_normal },
+        preset = naughty.config.defaults,
         text = str,
-        timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1
     })
 end
 
@@ -111,7 +109,8 @@ function tpbat.register(args)
         local n = naughty.notify({
             preset = bat_notification_low_preset,
             title = "SMAPI Battery Warning: Unable to read battery state!",
-            text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths."
+            text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
+            screen = client.focus and client.focus.screen or 1
         })
     end
 
@@ -137,13 +136,15 @@ function tpbat.register(args)
                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_critical_preset,
-                        replaces_id = tpbat.id
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1
                     }).id
                 elseif bat_now.perc <= 15
                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_low_preset,
-                        replaces_id = tpbat.id
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1
                     }).id
                 end
             end
@@ -155,10 +156,10 @@ function tpbat.register(args)
         settings()
     end
 
-    newtimer("tpbat", timeout, update)
+    newtimer("tpbat-" .. bat.name, timeout, update)
 
-    widget:connect_signal('mouse::enter', function () tpbat:show() end)
-    widget:connect_signal('mouse::leave', function () tpbat:hide() end)
+    widget:connect_signal('mouse::enter', function () tpbat.show() end)
+    widget:connect_signal('mouse::leave', function () tpbat.hide() end)
 
     return tpbat.widget
 end