X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/724eaa3ad77cab7f229c405d046dcebeab6552ab..172bc21bcf44f6b978ac224351fd673144ba8fa0:/widgets/calendar.lua?ds=sidebyside diff --git a/widgets/calendar.lua b/widgets/calendar.lua index f9aed39..cc0ebe7 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -30,24 +30,20 @@ function calendar:hide() end end -function calendar:show(t_out, inc_offset) +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 .. ' | sed -r -e "s/(^| )( ' + 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 - if today >= 10 - then - init_t = calendar.cal .. ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )(' - end - calendar.offset = 0 calendar.notify_icon = calendar.icons .. today .. ".png" @@ -81,7 +77,8 @@ function calendar:show(t_out, inc_offset) calendar.notify_icon = nil - f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year) + f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. + calendar.post_cal) end c_text = "