X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fc8ea20ab569ec39de93e64540d173ea1214b2ec..061116717645175d837403754d658df3498ca4c0:/widgets/calendar.lua?ds=sidebyside diff --git a/widgets/calendar.lua b/widgets/calendar.lua index b811f70..1a481ca 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -15,6 +15,9 @@ local naughty = require("naughty") local io = { popen = io.popen } local os = { date = os.date } local mouse = mouse +local string = { format = string.format, + sub = string.sub, + gsub = string.gsub } local tonumber = tonumber local setmetatable = setmetatable @@ -34,12 +37,10 @@ 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 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 @@ -49,37 +50,25 @@ 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( init_t .. today .. - ')($| )/\\1<b><span foreground=\\"' - .. calendar.bg .. - '\\" background=\\"' - .. calendar.fg .. - '\\">\\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')) 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 = "<tt><span font='" .. calendar.font .. " " @@ -111,10 +100,12 @@ 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.cal_format = args.cal_format or function(today) + return string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1<b><span foreground=\"%s\" background=\"%s\">%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:sub(beautiful.font:find(""), - beautiful.font:find(" ")) + 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" @@ -122,9 +113,6 @@ function calendar:attach(widget, args) 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