X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c946cc48c8980fd92e4c865df70041e51d75b6d1..b8adf932213faa797fcd69df28bb8bf9451cf5df:/widgets/calendar.lua diff --git a/widgets/calendar.lua b/widgets/calendar.lua index e1733ee..1728dfc 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -27,15 +27,15 @@ local setmetatable = setmetatable local calendar = {} local cal_notification = nil -function calendar:hide() +function calendar.hide() if cal_notification ~= nil then naughty.destroy(cal_notification) cal_notification = nil end end -function calendar:show(t_out, inc_offset, scr) - calendar:hide() +function calendar.show(t_out, inc_offset, scr) + calendar.hide() local f, c_text local offs = inc_offset or 0 @@ -50,7 +50,7 @@ function calendar:show(t_out, inc_offset, scr) calendar.notify_icon = calendar.icons .. today .. ".png" -- bg and fg inverted to highlight today - f = io.popen(calendar.cal_format(today)) + f = io.popen(calendar.cal_format(today)) else -- no current month showing, no day to highlight local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) @@ -96,11 +96,11 @@ function calendar:show(t_out, inc_offset, scr) }) end -function calendar:attach(widget, args) +function calendar.attach(widget, args) local args = args or {} calendar.cal = args.cal or "/usr/bin/cal" - calendar.cal_format = args.ca_format or function(today) + calendar.cal_format = args.cal_format or function(today) return string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1%d<\\/span><\\/b>\\2/'", calendar.cal, today, today, calendar.bg, calendar.fg, today) end @@ -116,16 +116,16 @@ function calendar:attach(widget, args) calendar.offset = 0 calendar.notify_icon = nil - widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end) - widget:connect_signal("mouse::leave", function () calendar:hide() end) + widget:connect_signal("mouse::enter", function () calendar.show(0, 0, calendar.scr_pos) 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), awful.button({ }, 3, function () - calendar:show(0, 1, calendar.scr_pos) end), + calendar.show(0, 1, calendar.scr_pos) end), awful.button({ }, 4, function () - calendar:show(0, -1, calendar.scr_pos) end), + calendar.show(0, -1, calendar.scr_pos) end), awful.button({ }, 5, 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 })