From: copycat-killer Date: Sat, 27 Feb 2016 20:36:32 +0000 (+0100) Subject: cal: highlight only first match of today number; #170 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f7601c768102a898fdd9dc73fbacced412aa143e?ds=sidebyside;hp=-c cal: highlight only first match of today number; #170 --- f7601c768102a898fdd9dc73fbacced412aa143e diff --git a/widgets/calendar.lua b/widgets/calendar.lua index 4714a54..93f171f 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -15,12 +15,15 @@ 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 -- Calendar notification --- lain.widgets.calendar +-- lain.widgets.cal local calendar = {} local cal_notification = nil @@ -34,12 +37,12 @@ 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/(^| )(' + local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'", + calendar.cal, calendar.post_cal) calendar.offset = calendar.offset + offs @@ -49,12 +52,8 @@ 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\\2<\\/span><\\/b>\\3/"' ) + f = io.popen(string.format("%s -e '0,/%d/ s/%d/%d<\\/span><\\/b>/'", + init_t, today, today, calendar.bg, calendar.fg, today)) else -- no current month showing, no day to highlight local month = tonumber(os.date('%m')) @@ -78,11 +77,10 @@ function calendar:show(t_out, inc_offset, scr) calendar.notify_icon = nil - f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. - calendar.post_cal) + f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal)) end - c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n"