calendar: fix #289

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 3ad34983bfda3d1621df80a979d5a1d5b4d5573c..a02b13d62be442c63780037f18d39d046f8f959c 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -13,7 +13,9 @@ 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
@@ -26,11 +28,7 @@ function calendar.hide()
 end
 
 function calendar.show(t_out, inc_offset, scr)
-    calendar.hide()
-
-    local today = os.date("%d")
-    local offs = inc_offset or 0
-    local f
+    local f, offs = nil, inc_offset or 0
 
     calendar.offset = calendar.offset + offs
 
@@ -38,7 +36,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.icon = string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
@@ -56,7 +54,7 @@ function calendar.show(t_out, inc_offset, scr)
            year = year - 1
        end
 
-       calendar.notify_icon = nil
+       calendar.icon = nil
        f = string.format("%s %s %s", calendar.cal, month, year)
     end
 
@@ -66,21 +64,59 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.notification_preset.screen = src or 1
     end
 
-    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)))
+    if f == calendar then
+        calendar.update(f, false)
+        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
+            preset      = calendar.notification_preset,
+            icon        = calendar.icon,
+            timeout     = t_out or calendar.notification_preset.timeout or 5
         })
+    else
+        calendar.update(f, true, t_out)
+    end
+end
+
+function calendar.update(f, show, t_out)
+    local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
+
+    helpers.async(f, function(ws)
+        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?",
+             markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "")
+
+        if f == calendar.cal then
+            calendar.notification_preset.text = ws
+        end
+
+        if show then
+            calendar.hide()
+            calendar.notification = naughty.notify({
+                preset      = calendar.notification_preset,
+                text        = ws,
+                icon        = calendar.icon,
+                timeout     = t_out or calendar.notification_preset.timeout or 5
+            })
+        end
     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
@@ -93,18 +129,9 @@ 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
+
+    calendar.update(calendar.cal, false)
 end
 
-return calendar
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })