X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/06621e5bdd737749cda8adf1c84d72a2ba468475..6a3294bd7341e60be917aafbcb14f2dc416fae9d:/widgets/calendar.lua?ds=sidebyside diff --git a/widgets/calendar.lua b/widgets/calendar.lua index 4714a54..a02b13d 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -6,137 +6,132 @@ --]] -local icons_dir = require("lain.helpers").icons_dir - +local helpers = require("lain.helpers") +local markup = require("lain.util.markup") local awful = require("awful") -local beautiful = require("beautiful") local naughty = require("naughty") - -local io = { popen = io.popen } -local os = { date = os.date } -local mouse = mouse +local os = { date = os.date } +local string = { format = string.format, + gsub = string.gsub } +local ipairs = ipairs local tonumber = tonumber - local setmetatable = setmetatable -- Calendar notification -- lain.widgets.calendar -local calendar = {} -local cal_notification = nil +local calendar = { offset = 0 } -function calendar:hide() - if cal_notification ~= nil then - naughty.destroy(cal_notification) - cal_notification = nil - end +function calendar.hide() + if not calendar.notification then return end + naughty.destroy(calendar.notification) + calendar.notification = nil end -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 today = tonumber(os.date('%d')) - local init_t = calendar.cal .. ' ' .. calendar.post_cal .. ' ' .. - ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )(' +function calendar.show(t_out, inc_offset, scr) + local f, offs = nil, inc_offset or 0 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" - - -- bg and fg inverted to highlight today - f = io.popen( init_t .. today .. - ')($| )/\\1\\2<\\/span><\\/b>\\3/"' ) + local current_month = (offs == 0 or calendar.offset == 0) + if current_month then -- today highlighted + calendar.offset = 0 + 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')) - local year = tonumber(os.date('%Y')) + local month = tonumber(os.date("%m")) + 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) + calendar.icon = nil + f = string.format("%s %s %s", calendar.cal, month, year) end - c_text = "" - .. f:read() .. "\n\n" - .. f:read() .. "\n" - .. f:read("*all"):gsub("\n*$", "") - .. "" - f:close() - - if calendar.followmouse then - scrp = mouse.screen + if calendar.followtag then + calendar.notification_preset.screen = awful.screen.focused() else - scrp = scr or calendar.scr_pos + calendar.notification_preset.screen = src or 1 end - cal_notification = naughty.notify({ - text = c_text, - icon = calendar.notify_icon, - position = calendar.position, - fg = calendar.fg, - bg = calendar.bg, - timeout = tims, - screen = scrp - }) + if f == calendar then + calendar.update(f, false) + calendar.hide() + calendar.notification = naughty.notify({ + preset = calendar.notification_preset, + icon = calendar.icon, + timeout = t_out or calendar.notification_preset.timeout or 5 + }) + else + calendar.update(f, true, t_out) + end end -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: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.followmouse = args.followmouse or false - - calendar.fg = string.sub(calendar.fg, 1, 7) - calendar.bg = string.sub(calendar.bg, 1, 7) - - calendar.offset = 0 - calendar.notify_icon = nil +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 - widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end) - widget:connect_signal("mouse::leave", function () calendar:hide() 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), 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 + +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 + + calendar.update(calendar.cal, false) end -return setmetatable(calendar, { __call = function(_, ...) return create(...) end }) +return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })