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
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/(^| )('
calendar.offset = calendar.offset + offs
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(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'))
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
+ while month > 12 do
+ month = month - 12
+ year = year + 1
+ end
+
+ while month < 1 do
month = month + 12
- year = year - 1
- if month <= 0 then
- month = 1
- end
+ year = year - 1
end
calendar.notify_icon = nil
-
- f = io.popen(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 .. " "
.. calendar.font_size .. "'><b>"
.. f:read() .. "</b>\n\n"
.. f:read() .. "\n"
- .. f:read("*a"):gsub("\n*$", "")
+ .. f:read("*all"):gsub("\n*$", "")
.. "</span></tt>"
f:close()
+ if calendar.followmouse then
+ scrp = mouse.screen
+ else
+ scrp = scr or calendar.scr_pos
+ end
+
cal_notification = naughty.notify({
text = c_text,
icon = calendar.notify_icon,
fg = calendar.fg,
bg = calendar.bg,
timeout = tims,
- screen = scr or 1
+ screen = scrp
})
end
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:sub(beautiful.font:find(""),
- beautiful.font:find(" "))
- 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 "#FFFFFF"
- calendar.position = args.position or "top_right"
- calendar.scr_pos = args.scr_pos or 1
-
- calendar.offset = 0
+
+ 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.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.position = args.position or "top_right"
+ calendar.scr_pos = args.scr_pos or 1
+ calendar.followmouse = args.followmouse or false
+
+ calendar.offset = 0
calendar.notify_icon = nil
- widget:connect_signal("mouse::enter", function () calendar:show(0, 0, scr_pos) end)
+ widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
widget:connect_signal("mouse::leave", function () calendar:hide() end)
- widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()
- calendar:show(0, -1, scr_pos) end),
- awful.button({ }, 3, function ()
- calendar:show(0, 1, scr_pos) end),
- awful.button({ }, 4, function ()
- calendar:show(0, -1, scr_pos) end),
- awful.button({ }, 5, function ()
- calendar:show(0, 1, scr_pos) end)))
+ widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
+ calendar:show(0, -1, calendar.scr_pos) end),
+ awful.button({ }, 3, function ()
+ calendar:show(0, 1, calendar.scr_pos) end),
+ awful.button({ }, 4, function ()
+ calendar:show(0, -1, calendar.scr_pos) end),
+ awful.button({ }, 5, function ()
+ calendar:show(0, 1, calendar.scr_pos) end)))
end
return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
projects / etc / awesome.git / blobdiff