#308 fix

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 892d95495818cc030012262f70f8244da93efd45..f351356f7527fee968d41669a7e7f41077514860 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -13,18 +13,22 @@ local naughty      = require("naughty")
 local os           = { date   = os.date }
 local string       = { format = string.format,
                        gsub   = string.gsub }
+local ipairs       = ipairs
 local tonumber     = tonumber
+local setmetatable = setmetatable
 
 -- Calendar notification
 -- lain.widgets.calendar
 local calendar = { offset = 0 }
 
 function calendar.hide()
-    naughty.destroy(naughty.getById(calendar.id))
+    if not calendar.notification then return end
+    naughty.destroy(calendar.notification)
+    calendar.notification = nil
 end
 
 function calendar.show(t_out, inc_offset, scr)
-    local today = os.date("%d")
+    local today = os.date("%e")
     local offs = inc_offset or 0
     local f
 
@@ -34,7 +38,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     if current_month then -- today highlighted
         calendar.offset = 0
-        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, tonumber(today))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
@@ -64,20 +68,34 @@ function calendar.show(t_out, inc_offset, scr)
 
     helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-        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,
+        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        calendar.hide()
+        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
-        }).id
+            timeout     = t_out or calendar.notification_preset.timeout or 5
+        })
     end)
 end
 
-function calendar.attach(widget, args)
+function calendar.attach(widget)
+    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),
+                                         awful.button({ }, 3, function ()
+                                             calendar.show(0, 1, calendar.scr_pos) end),
+                                         awful.button({ }, 4, function ()
+                                             calendar.show(0, -1, calendar.scr_pos) end),
+                                         awful.button({ }, 5, function ()
+                                             calendar.show(0, 1, calendar.scr_pos) end)))
+end
+
+local function worker(args)
     local args                   = args or {}
-    calendar.cal                 = args.cal or "/usr/bin/cal --color=always"
+    calendar.cal                 = args.cal or "/usr/bin/cal"
+    calendar.attach_to           = args.attach_to or {}
     calendar.followtag           = args.followtag or false
     calendar.icons               = args.icons or helpers.icons_dir .. "cal/white/"
     calendar.notification_preset = args.notification_preset
@@ -90,18 +108,7 @@ function calendar.attach(widget, args)
         }
     end
 
-    if widget then
-        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),
-                                             awful.button({ }, 3, function ()
-                                                 calendar.show(0, 1, calendar.scr_pos) end),
-                                             awful.button({ }, 4, function ()
-                                                 calendar.show(0, -1, calendar.scr_pos) end),
-                                             awful.button({ }, 5, function ()
-                                                 calendar.show(0, 1, calendar.scr_pos) end)))
-    end
+    for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
 end
 
-return calendar
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })