using timer sharing; #114

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

diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index dbf90aab4e7a0552598e411f2d8587e043e77e3c..0a22526fedffb3e6937d86218861ff2d088bbfa1 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -75,7 +75,8 @@ function tpbat:show(t_out)
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
         text = str,
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
         text = str,

-        timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end
 


@@ -90,16 +91,29 @@ function tpbat.register(args)
 
     tpbat.widget = wibox.widget.textbox('')
 
 
     tpbat.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"
+    }
+

     if bat:get('state') == nil
     then
         local n = naughty.notify({
     if bat:get('state') == nil
     then
         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.",
             title = "SMAPI Battery Warning: Unable to read battery state!",
             text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",

-            position = "top_right",
-            timeout = 15,
-            fg="#202020",
-            bg="#cdcdcd",
-            ontop = true
+            screen = client.focus and client.focus.screen or 1

         })
     end
 
         })
     end
 


@@ -124,26 +138,16 @@ function tpbat.register(args)
                 if bat_now.perc <= 5
                 then
                     tpbat.id = naughty.notify({
                 if bat_now.perc <= 5
                 then
                     tpbat.id = naughty.notify({

-                        text = "shutdown imminent",
-                        title = "battery nearly exhausted",
-                        position = "top_right",
-                        timeout = 15,
-                        fg="#000000",
-                        bg="#ffffff",
-                        ontop = true,
-                        replaces_id = tpbat.id
+                        preset = bat_notification_critical_preset,
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1

                     }).id
                 elseif bat_now.perc <= 15
                 then
                     tpbat.id = naughty.notify({
                     }).id
                 elseif bat_now.perc <= 15
                 then
                     tpbat.id = naughty.notify({

-                        text = "plug the cable",
-                        title = "battery low",
-                        position = "top_right",
-                        timeout = 15,
-                        fg="#202020",
-                        bg="#cdcdcd",
-                        ontop = true,
-                        replaces_id = tpbat.id
+                        preset = bat_notification_low_preset,
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1

                     }).id
                 end
             end
                     }).id
                 end
             end


@@ -155,7 +159,7 @@ function tpbat.register(args)
         settings()
     end
 
         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)