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

cal: sed spaces fix 2; #170 #174

This commit is contained in:
copycat-killer 2016-03-02 12:28:57 +01:00
parent c47857046f
commit bceaadb433
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/calendar.lua
View File

@ -41,8 +41,6 @@ function calendar:show(t_out, inc_offset, scr)
local offs = inc_offset or 0
local tims = t_out or 0
local today = tonumber(os.date('%d'))
local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'",
calendar.cal, calendar.post_cal)
calendar.offset = calendar.offset + offs
@ -52,8 +50,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(string.format("%s -e '0,/%d $/ s/ %d /<b> <span foreground=\"%s\" background=\"%s\">%d<\\/span> <\\/b>/'",
init_t, today, today, calendar.bg, calendar.fg, 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/'",
calendar.cal, today, today, calendar.bg, calendar.fg, today))
else -- no current month showing, no day to highlight
local month = tonumber(os.date('%m'))
@ -76,8 +74,7 @@ function calendar:show(t_out, inc_offset, scr)
end
calendar.notify_icon = nil
f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal))
f = io.popen(string.format('%s %s %s', calendar.cal, month, year))
end
c_text = "<tt><span font='" .. calendar.font .. " "
@ -109,7 +106,6 @@ function calendar:attach(widget, args)
local args = args or {}
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:gsub(" %d.*", "")
calendar.font_size = tonumber(args.font_size) or 11

2
wiki

@ -1 +1 @@
Subproject commit 685529e0a67fbbbc7b1b01e965a064d06e953baf
Subproject commit a39f73e09d8862493c1c0db542c86db0918b4a39