awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

calendar: expose cal_format; closes #194

This commit is contained in:
copycat-killer 2016-04-25 10:40:55 +02:00
parent de03791b81
commit 8e9386be4e
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widgets/calendar.lua
View File

@ -50,9 +50,7 @@ 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(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/'", f = io.popen(calendar.cal_format(today))
calendar.cal, today, today, calendar.bg, calendar.fg, today))
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'))
local year = tonumber(os.date('%Y')) local year = tonumber(os.date('%Y'))
@ -102,6 +100,10 @@ function calendar:attach(widget, args)
local args = args or {} local args = args or {}
calendar.cal = args.cal or "/usr/bin/cal" calendar.cal = args.cal or "/usr/bin/cal"
calendar.cal_format = args.ca_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.icons = args.icons or icons_dir .. "cal/white/"
calendar.font = args.font or beautiful.font:gsub(" %d.*", "") calendar.font = args.font or beautiful.font:gsub(" %d.*", "")
calendar.font_size = tonumber(args.font_size) or 11 calendar.font_size = tonumber(args.font_size) or 11
@ -111,9 +113,6 @@ function calendar:attach(widget, args)
calendar.scr_pos = args.scr_pos or 1 calendar.scr_pos = args.scr_pos or 1
calendar.followmouse = args.followmouse or false 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.offset = 0
calendar.notify_icon = nil calendar.notify_icon = nil

2
wiki

@ -1 +1 @@
Subproject commit 184b98a8e765fe48f31c30a0ac5d3a3962ed46a1 Subproject commit 93d43261aa6b23d9d8241e75330d9e12ed233d2a