From: copycat-killer Date: Mon, 25 Apr 2016 08:40:55 +0000 (+0200) Subject: calendar: expose cal_format; closes #194 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/8e9386be4e00184f426ce1d91ca842460dba8f91?ds=inline;hp=-c calendar: expose cal_format; closes #194 --- 8e9386be4e00184f426ce1d91ca842460dba8f91 diff --git a/widgets/calendar.lua b/widgets/calendar.lua index bbd6eed..8c9e52a 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -50,9 +50,7 @@ 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(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)) - + f = io.popen(calendar.cal_format(today)) else -- no current month showing, no day to highlight local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) @@ -60,13 +58,13 @@ function calendar:show(t_out, inc_offset, scr) month = month + calendar.offset while month > 12 do - month = month - 12 - year = year + 1 + month = month - 12 + year = year + 1 end while month < 1 do - month = month + 12 - year = year - 1 + month = month + 12 + year = year - 1 end calendar.notify_icon = nil @@ -102,6 +100,10 @@ function calendar:attach(widget, args) local args = args or {} 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%d<\\/span><\\/b>\\2/'", + calendar.cal, today, today, calendar.bg, calendar.fg, today) + end calendar.icons = args.icons or icons_dir .. "cal/white/" calendar.font = args.font or beautiful.font:gsub(" %d.*", "") 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.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.notify_icon = nil diff --git a/wiki b/wiki index 184b98a..93d4326 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 184b98a8e765fe48f31c30a0ac5d3a3962ed46a1 +Subproject commit 93d43261aa6b23d9d8241e75330d9e12ed233d2a