widget.fs: fix notification check, add threshold parameter for trigger

[etc/awesome.git] / widget / cal.lua

diff --git a/widget/cal.lua b/widget/cal.lua
index 50426babca49c7e3c22c5e095475462973497205..9b613bf6cf08b361a0b3cad062fa7208a6d51697 100644 (file)
--- a/widget/cal.lua
+++ b/widget/cal.lua
@@ -19,6 +19,7 @@ local tostring = tostring
 
 -- Calendar notification
 -- lain.widget.cal
+
 local function factory(args)
     args = args or {}
     local cal = {
@@ -79,7 +80,7 @@ local function factory(args)
         cal.notification = nil
     end
 
-    function cal.show(timeout, month, year)
+    function cal.show(timeout, month, year, scr)
         cal.notification_preset.text = tconcat(cal.build(month, year))
 
         if cal.three then
@@ -95,6 +96,7 @@ local function factory(args)
         cal.hide()
         cal.notification = naughty.notify {
             preset  = cal.notification_preset,
+            screen  = cal.followtag and awful.screen.focused() or scr or 1,
             icon    = cal.icon,
             timeout = timeout or cal.notification_preset.timeout or 5
         }