X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/a0bd2798accb561db079aebbdd3ee8d4d9c65465..57e595c656255e1093d261b255f789017c002bc0:/widgets/calendar.lua?ds=sidebyside diff --git a/widgets/calendar.lua b/widgets/calendar.lua index bd7f08c..4e6eda7 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -39,11 +39,13 @@ function calendar:show(t_out, inc_offset) local today = tonumber(os.date('%d')) 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 = calendar.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 @@ -97,7 +98,8 @@ 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 @@ -120,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 })