Merge branch 'trap000d-master'

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index fbf8194fe0e86961d9a5a39492b132b9f9fad157..a02b13d62be442c63780037f18d39d046f8f959c 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -22,13 +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 offs = inc_offset or 0
-    local f
+    local f, offs = nil, inc_offset or 0

 
     calendar.offset = calendar.offset + offs
 
 
     calendar.offset = calendar.offset + offs
 


@@ -36,7 +36,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.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"))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))


@@ -54,7 +54,7 @@ function calendar.show(t_out, inc_offset, scr)
            year = year - 1
        end
 
            year = year - 1
        end
 

-       calendar.notify_icon = nil
+       calendar.icon = nil

        f = string.format("%s %s %s", calendar.cal, month, year)
     end
 
        f = string.format("%s %s %s", calendar.cal, month, year)
     end
 


@@ -64,17 +64,39 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.notification_preset.screen = src or 1
     end
 
         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.hide()

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

             preset      = calendar.notification_preset,
             preset      = calendar.notification_preset,

-            text        = ws:gsub("\n*$", ""),
-            icon        = calendar.notify_icon,
-            timeout     = t_out or calendar.notification.preset.timeout or 5
-        }).id
+            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
 
     end)
 end
 


@@ -93,7 +115,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/"


@@ -108,6 +130,8 @@ local function worker(args)
     end
 
     for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
     end
 
     for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end

+
+    calendar.update(calendar.cal, false)

 end
 
 return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })