Merge pull request #2 from copycat-killer/master

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index fbf8194fe0e86961d9a5a39492b132b9f9fad157..f351356f7527fee968d41669a7e7f41077514860 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -22,11 +22,13 @@ local setmetatable = setmetatable
 local calendar = { offset = 0 }
 
 function calendar.hide()
 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)
 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
 
     local offs = inc_offset or 0
     local f
 


@@ -36,7 +38,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     if current_month then -- today highlighted
         calendar.offset = 0
 
     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"))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))


@@ -66,15 +68,14 @@ function calendar.show(t_out, inc_offset, scr)
 
     helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
 
     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)))
+        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))

         calendar.hide()
         calendar.hide()

-        calendar.id = naughty.notify({
-            replaces_id = calendar.id,
+        calendar.notification = naughty.notify({

             preset      = calendar.notification_preset,
             text        = ws:gsub("\n*$", ""),
             icon        = calendar.notify_icon,
             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
 
     end)
 end
 


@@ -93,7 +94,7 @@ end
 
 local function worker(args)
     local args                   = args or {}
 
 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.attach_to           = args.attach_to or {}
     calendar.followtag           = args.followtag or false
     calendar.icons               = args.icons or helpers.icons_dir .. "cal/white/"