--]]
-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")
local os = { date = os.date }
local string = { format = string.format,
gsub = string.gsub }
+local ipairs = ipairs
local tonumber = tonumber
local setmetatable = setmetatable
end
function calendar.show(t_out, inc_offset, scr)
- calendar.hide()
-
- local today = os.date("%d")
+ local today = os.date("%e")
local offs = inc_offset or 0
local f
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"))
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)))
+ ws = ws:gsub("%c%[%d+[m]?" .. today .. "%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
+ preset = calendar.notification_preset,
+ text = ws:gsub("\n*$", ""),
+ icon = calendar.notify_icon,
+ timeout = t_out or calendar.notification_preset.timeout or 5
})
end)
end
-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.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"
- end
-
- widget:connect_signal("mouse::enter", function () calendar.show(0, 0, calendar.scr_pos) end)
+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),
calendar.show(0, 1, calendar.scr_pos) end)))
end
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+local function worker(args)
+ local args = args or {}
+ 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
+
+ if not calendar.notification_preset then
+ calendar.notification_preset = {
+ font = "Monospace 10",
+ fg = "#FFFFFF",
+ bg = "#000000"
+ }
+ end
+
+ for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
+end
+
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })