X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/604b85a6e4d0353284aaeeefbbc16c213ec25c9e..5f902517ffea8033605752f4755d81d4a9ba4aec:/widgets/calendar.lua?ds=inline diff --git a/widgets/calendar.lua b/widgets/calendar.lua index f83b966..0d29bdd 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -12,8 +12,12 @@ local awful = require("awful") local beautiful = require("beautiful") local naughty = require("naughty") -local io = io +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 @@ -30,38 +34,29 @@ 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 offs = inc_offset or 0 + local tims = t_out or 0 local today = tonumber(os.date('%d')) - local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( ' - if offs == 0 - then -- current month showing, today highlighted - if today >= 10 - then - init_t = calendar.cal .. ' | sed -r -e "s/(^| )(' - end + 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/"' ) + f = io.popen(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)) else -- no current month showing, no day to highlight local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) - calendar.offset = calendar.offset + offs month = month + calendar.offset if month > 12 then @@ -79,8 +74,7 @@ function calendar:show(t_out, inc_offset) end calendar.notify_icon = nil - - f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year) + f = io.popen(string.format('%s %s %s', calendar.cal, month, year)) end c_text = "