X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/3862c605420b4f815ef76970d0828e81e07935d2..5e53a6e620172389f941f01ce91a00a18fafe35e:/widgets/calendar.lua diff --git a/widgets/calendar.lua b/widgets/calendar.lua index b811f70..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" @@ -113,8 +111,7 @@ function calendar:attach(widget, args) calendar.cal = args.cal or "/usr/bin/cal" calendar.post_cal = args.post_cal or "" calendar.icons = args.icons or icons_dir .. "cal/white/" - calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""), - beautiful.font:find(" ")) + calendar.font = args.font or beautiful.font:gsub(" %d.*", "") calendar.font_size = tonumber(args.font_size) or 11 calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" calendar.bg = args.bg or beautiful.bg_normal or "#000000"