adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cal: highlight only first match of today number; #170

Browse source
This commit is contained in:
copycat-killer 2016-02-27 21:36:32 +01:00
parent e386dbb719
commit f7601c7681
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
widgets/calendar.lua
View file

@ -15,12 +15,15 @@ local naughty = require("naughty")
local io = { popen = io.popen } local io = { popen = io.popen }
local os = { date = os.date } local os = { date = os.date }
local mouse = mouse local mouse = mouse
local string = { format = string.format,
sub = string.sub,
gsub = string.gsub }
local tonumber = tonumber local tonumber = tonumber
local setmetatable = setmetatable local setmetatable = setmetatable
-- Calendar notification -- Calendar notification
-- lain.widgets.calendar -- lain.widgets.cal
local calendar = {} local calendar = {}
local cal_notification = nil local cal_notification = nil
@ -34,12 +37,12 @@ end
function calendar:show(t_out, inc_offset, scr) function calendar:show(t_out, inc_offset, scr)
calendar:hide() calendar:hide()
local offs = inc_offset or 0
local tims = t_out or 0
local f, c_text local f, c_text
local offs = inc_offset or 0
local tims = t_out or 0
local today = tonumber(os.date('%d')) local today = tonumber(os.date('%d'))
local init_t = calendar.cal .. ' ' .. calendar.post_cal .. ' ' .. local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )(' calendar.cal, calendar.post_cal)
calendar.offset = calendar.offset + offs calendar.offset = calendar.offset + offs
@ -49,12 +52,8 @@ function calendar:show(t_out, inc_offset, scr)
calendar.notify_icon = calendar.icons .. today .. ".png" calendar.notify_icon = calendar.icons .. today .. ".png"
-- bg and fg inverted to highlight today -- bg and fg inverted to highlight today
f = io.popen( init_t .. today .. f = io.popen(string.format("%s -e '0,/%d/ s/%d/<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>/'",
')($| )/\\1<b><span foreground=\\"' init_t, today, today, calendar.bg, calendar.fg, today))
.. calendar.bg ..
'\\" background=\\"'
.. calendar.fg ..
'\\">\\2<\\/span><\\/b>\\3/"' )
else -- no current month showing, no day to highlight else -- no current month showing, no day to highlight
local month = tonumber(os.date('%m')) local month = tonumber(os.date('%m'))
@ -78,11 +77,10 @@ function calendar:show(t_out, inc_offset, scr)
calendar.notify_icon = nil calendar.notify_icon = nil
f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))
calendar.post_cal)
end end
c_text = "<tt><span font='" .. calendar.font .. " " c_text = " <tt><span font='" .. calendar.font .. " "
.. calendar.font_size .. "'><b>" .. calendar.font_size .. "'><b>"
.. f:read() .. "</b>\n\n" .. f:read() .. "</b>\n\n"
.. f:read() .. "\n" .. f:read() .. "\n"