X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f48afb841e25768fac7e9c971dc6acf8e40e6f65..0b4193199b244e4f0aa365762314c0462a318014:/widgets/calendar.lua diff --git a/widgets/calendar.lua b/widgets/calendar.lua index cc0ebe7..76faca4 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -14,6 +14,9 @@ local naughty = require("naughty") local io = { popen = io.popen } local os = { date = os.date } +local string = { format = string.format, + sub = string.sub, + gsub = string.gsub } local tonumber = tonumber local setmetatable = setmetatable @@ -23,72 +26,64 @@ 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 offs = inc_offset or 0 - local tims = t_out or 0 local f, c_text + local offs = inc_offset or 0 + local tims = t_out or 0 local today = tonumber(os.date('%d')) - local init_t = calendar.cal .. ' ' .. calendar.post_cal .. ' ' .. - ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )(' calendar.offset = calendar.offset + offs if offs == 0 or calendar.offset == 0 then -- current month showing, today highlighted calendar.offset = 0 - calendar.notify_icon = calendar.icons .. today .. ".png" + calendar.notify_icon = string.format("%s%s.png", calendar.icons, today) -- bg and fg inverted to highlight today - f = io.popen( init_t .. today .. - ')($| )/\\1\\2<\\/span><\\/b>\\3/"' ) - + 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')) + local year = tonumber(os.date('%Y')) month = month + calendar.offset - if month > 12 then - month = month % 12 + while month > 12 do + month = month - 12 year = year + 1 - if month <= 0 then - month = 12 - end - elseif month < 1 then + end + + while month < 1 do month = month + 12 year = year - 1 - if month <= 0 then - month = 1 - end end calendar.notify_icon = nil - - f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. - calendar.post_cal) + f = io.popen(string.format('%s %s %s', calendar.cal, month, year)) end c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n" - .. f:read("*a"):gsub("\n*$", "") + .. f:read("*all"):gsub("\n*$", "") .. "" f:close() + if calendar.followtag then + scrp = awful.screen.focused() + else + scrp = scr or calendar.scr_pos + end + cal_notification = naughty.notify({ text = c_text, icon = calendar.notify_icon, @@ -96,36 +91,40 @@ function calendar:show(t_out, inc_offset, scr) fg = calendar.fg, bg = calendar.bg, timeout = tims, - screen = scr or 1 + screen = scrp }) end -function calendar:attach(widget, args) +function calendar.attach(widget, args) local args = args or {} - calendar.cal = args.cal or "/usr/bin/cal" - calendar.post_cal = args.post_cal or "" - calendar.icons = args.icons or icons_dir .. "cal/white/" - calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""), - beautiful.font:find(" ")) - calendar.font_size = tonumber(args.font_size) or 11 - calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" - calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF" - calendar.position = args.position or "top_right" - calendar.scr_pos = args.scr_pos or 1 - - calendar.offset = 0 + + calendar.cal = args.cal or "/usr/bin/cal" + 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 + calendar.icons = args.icons or icons_dir .. "cal/white/" + calendar.font = args.font or beautiful.font:gsub(" %d.*", "") + calendar.font_size = tonumber(args.font_size) or 11 + calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" + calendar.bg = args.bg or beautiful.bg_normal or "#000000" + calendar.position = args.position or "top_right" + calendar.scr_pos = args.scr_pos or 1 + calendar.followtag = args.followtag or false + + calendar.offset = 0 calendar.notify_icon = nil - widget:connect_signal("mouse::enter", function () calendar:show(0, 0, 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, scr_pos) end), - awful.button({ }, 3, function () - calendar:show(0, 1, scr_pos) end), - awful.button({ }, 4, function () - calendar:show(0, -1, scr_pos) end), - awful.button({ }, 5, function () - calendar:show(0, 1, scr_pos) 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), + 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 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })