X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/5ab75a15300f5e3eda4ee444dc3702a8eecbff69..63455361db71b0dde286f85331c6c69f00a3fba7:/widgets/calendar.lua?ds=inline diff --git a/widgets/calendar.lua b/widgets/calendar.lua index e5f6e88..bbd6eed 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -12,8 +12,12 @@ local awful = require("awful") local beautiful = require("beautiful") local naughty = require("naughty") -local io = io -local os = { date = os.date } +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 @@ -21,82 +25,55 @@ local setmetatable = setmetatable -- Calendar notification -- lain.widgets.calendar local calendar = {} -local notification = nil - -local function create(foreground, background) - calendar.offset = 0 - calendar.icons_dir = icons_dir .. "cal/white/" -- default - calendar.notify_icon = nil - calendar.font_size = 12 - calendar.bg = background or beautiful.bg_normal or "#FFFFFF" - calendar.fg = foreground or beautiful.fg_focus or "#FFFFFF" -end +local cal_notification = nil function calendar:hide() - if notification ~= nil then - naughty.destroy(notification) - notification = nil + if cal_notification ~= nil then + naughty.destroy(cal_notification) + cal_notification = nil end end -function calendar:show(t_out, inc_offset) +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 = '/usr/bin/cal | sed -r -e "s/(^| )( ' - -- let's take font only, font size is set in calendar table - local font = beautiful.font:sub(beautiful.font:find(""), - beautiful.font:find(" ")) - if offs == 0 - then -- current month showing, today highlighted - if today >= 10 - then - init_t = '/usr/bin/cal | sed -r -e "s/(^| )(' - end + calendar.offset = calendar.offset + offs + if offs == 0 or calendar.offset == 0 + then -- current month showing, today highlighted calendar.offset = 0 - calendar.notify_icon = calendar.icons_dir .. today .. ".png" + calendar.notify_icon = calendar.icons .. today .. ".png" -- bg and fg inverted to highlight today - f = io.popen( init_t .. today .. - ')($| )/\\1\\2<\\/span><\\/b>\\3/"' ) + f = io.popen(string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1%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')) local year = tonumber(os.date('%Y')) - calendar.offset = calendar.offset + offs 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 end - calendar.notify_icon = nil + while month < 1 do + month = month + 12 + year = year - 1 + end - f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year) + calendar.notify_icon = nil + f = io.popen(string.format('%s %s %s', calendar.cal, month, year)) end - - c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n" @@ -104,21 +81,52 @@ function calendar:show(t_out, inc_offset) .. "" f:close() - notification = naughty.notify({ text = c_text, - icon = calendar.notify_icon, - fg = calendar.fg, - bg = calendar.bg, - timeout = tims }) + 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, + position = calendar.position, + fg = calendar.fg, + bg = calendar.bg, + timeout = tims, + screen = scrp + }) end -function calendar:attach(widget, foreground, background) - create(foreground, background) - widget:connect_signal("mouse::enter", function () calendar:show() 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: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.fg = string.sub(calendar.fg, 1, 7) + calendar.bg = string.sub(calendar.bg, 1, 7) + + calendar.offset = 0 + calendar.notify_icon = nil + + 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) end), - awful.button({ }, 3, function () - calendar:show(0, 1) 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 })