X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/9889ef5ca2e62b3cc9802a2dadff6a4ee5069114..ced8e6d8f7603892cd3ba3a2cd629e85b3c7ad91:/widgets/calendar.lua diff --git a/widgets/calendar.lua b/widgets/calendar.lua index d0df17c..d07a5b4 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -12,7 +12,7 @@ local awful = require("awful") local beautiful = require("beautiful") local naughty = require("naughty") -local io = io +local io = { popen = io.popen } local os = { date = os.date } local tonumber = tonumber @@ -37,13 +37,15 @@ function calendar:show(t_out, inc_offset) local tims = t_out or 0 local f, c_text local today = tonumber(os.date('%d')) - local init_t = '/usr/bin/cal --color=never | sed -r -e "s/(^| )( ' + local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( ' - if offs == 0 + calendar.offset = calendar.offset + offs + + if offs == 0 or calendar.offset == 0 then -- current month showing, today highlighted if today >= 10 then - init_t = '/usr/bin/cal | sed -r -e "s/(^| )(' + init_t = calendar.cal .. ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )(' end calendar.offset = 0 @@ -61,7 +63,6 @@ function calendar:show(t_out, inc_offset) local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) - calendar.offset = calendar.offset + offs month = month + calendar.offset if month > 12 then @@ -80,14 +81,14 @@ function calendar:show(t_out, inc_offset) calendar.notify_icon = nil - f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year) + f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year) end c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n" - .. f:read("*all"):gsub("\n*$", "") + .. f:read("*a"):gsub("\n*$", "") .. "" f:close() @@ -97,12 +98,14 @@ function calendar:show(t_out, inc_offset) position = calendar.position, fg = calendar.fg, bg = calendar.bg, - timeout = tims + timeout = tims, + screen = client.focus and client.focus.screen or 1 }) end function calendar:attach(widget, args) local args = args or {} + calendar.cal = args.cal or "/usr/bin/cal" calendar.icons = args.icons or icons_dir .. "cal/white/" calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")) @@ -119,7 +122,11 @@ function calendar:attach(widget, args) widget:buttons(awful.util.table.join( awful.button({ }, 1, function () calendar:show(0, -1) end), awful.button({ }, 3, function () - calendar:show(0, 1) end) )) + calendar:show(0, 1) end), + awful.button({ }, 4, function () + calendar:show(0, -1) end), + awful.button({ }, 5, function () + calendar:show(0, 1) end))) end return setmetatable(calendar, { __call = function(_, ...) return create(...) end })