calendar: fix async hanging notifications; closes #289

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index e4216e4056953d7620f4a73944478bb2d2f18a74..892d95495818cc030012262f70f8244da93efd45 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -6,8 +6,7 @@
                                                   
 --]]
 
-local async        = require("lain.helpers").async
-local icons_dir    = require("lain.helpers").icons_dir
+local helpers      = require("lain.helpers")
 local markup       = require("lain.util.markup")
 local awful        = require("awful")
 local naughty      = require("naughty")
@@ -21,14 +20,10 @@ local tonumber     = tonumber
 local calendar = { offset = 0 }
 
 function calendar.hide()
-    if not calendar.notification then return end
-    naughty.destroy(calendar.notification)
-    calendar.notification = nil
+    naughty.destroy(naughty.getById(calendar.id))
 end
 
 function calendar.show(t_out, inc_offset, scr)
-    calendar.hide()
-
     local today = os.date("%d")
     local offs = inc_offset or 0
     local f
@@ -67,15 +62,16 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.notification_preset.screen = src or 1
     end
 
-    async(string.format("%s -c '%s'", awful.util.shell, f), function(ws)
+    helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-        ws = ws:gsub("%c%[7m%d+%c%[27m", markup.bold(markup.color(bg, fg, today)))
-        calendar.notification = naughty.notify({
-            preset  = calendar.notification_preset,
-            text    = ws:gsub("\n*$", ""),
-            icon    = calendar.notify_icon,
-            timeout = t_out or calendar.notification.preset.timeout or 5
-        })
+        ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        calendar.id = naughty.notify({
+            replaces_id = calendar.id,
+            preset      = calendar.notification_preset,
+            text        = ws:gsub("\n*$", ""),
+            icon        = calendar.notify_icon,
+            timeout     = t_out or calendar.notification.preset.timeout or 5
+        }).id
     end)
 end
 
@@ -83,18 +79,19 @@ function calendar.attach(widget, args)
     local args                   = args or {}
     calendar.cal                 = args.cal or "/usr/bin/cal --color=always"
     calendar.followtag           = args.followtag or false
-    calendar.icons               = args.icons or icons_dir .. "cal/white/"
+    calendar.icons               = args.icons or helpers.icons_dir .. "cal/white/"
     calendar.notification_preset = args.notification_preset
 
     if not calendar.notification_preset then
-        calendar.notification_preset      = naughty.config.defaults
-        calendar.notification_preset.font = "Monospace 10"
-        calendar.notification_preset.fg   = "#FFFFFF"
-        calendar.notification_preset.bg   = "#000000"
+        calendar.notification_preset = {
+            font = "Monospace 10",
+            fg   = "#FFFFFF",
+            bg   = "#000000"
+        }
     end
 
     if widget then
-        widget:connect_signal("mouse::enter", function () calendar.show() end)
+        widget:connect_signal("mouse::enter", function () calendar.show(0) end)
         widget:connect_signal("mouse::leave", function () calendar.hide() end)
         widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
                                                  calendar.show(0, -1, calendar.scr_pos) end),