madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged.
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
local io = { popen = io.popen }
local os = { date = os.date }
local mouse = mouse
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
local tonumber = tonumber
local setmetatable = setmetatable
function calendar:show(t_out, inc_offset, scr)
calendar:hide()
function calendar:show(t_out, inc_offset, scr)
calendar:hide()
- local offs = inc_offset or 0
- local tims = t_out or 0
+ 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 .. ' ' ..
- ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
calendar.offset = calendar.offset + offs
calendar.offset = calendar.offset + offs
calendar.notify_icon = calendar.icons .. today .. ".png"
-- bg and fg inverted to highlight today
calendar.notify_icon = calendar.icons .. today .. ".png"
-- bg and fg inverted to highlight today
- f = io.popen( init_t .. today ..
- ')($| )/\\1<b><span foreground=\\"'
- .. calendar.bg ..
- '\\" background=\\"'
- .. calendar.fg ..
- '\\">\\2<\\/span><\\/b>\\3/"' )
+ 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'))
else -- no current month showing, no day to highlight
local month = tonumber(os.date('%m'))
month = month + calendar.offset
month = month + calendar.offset
- if month > 12 then
- month = month % 12
- year = year + 1
- if month <= 0 then
- month = 12
- end
- elseif month < 1 then
- month = month + 12
- year = year - 1
- if month <= 0 then
- month = 1
- end
+ while month > 12 do
+ month = month - 12
+ year = year + 1
- calendar.notify_icon = nil
+ while month < 1 do
+ month = month + 12
+ year = year - 1
+ end
- f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' ..
- calendar.post_cal)
+ calendar.notify_icon = nil
+ f = io.popen(string.format('%s %s %s', calendar.cal, month, year))
end
c_text = "<tt><span font='" .. calendar.font .. " "
end
c_text = "<tt><span font='" .. calendar.font .. " "
local args = args or {}
calendar.cal = args.cal or "/usr/bin/cal"
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.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"
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"