--]]
-local icons_dir = require("lain.helpers").icons_dir
-
+local helpers = require("lain.helpers")
+local markup = require("lain.util.markup")
local awful = require("awful")
-local beautiful = require("beautiful")
local naughty = require("naughty")
-
-local io = io
-local os = { date = os.date }
+local os = { date = os.date }
+local string = { format = string.format,
+ gsub = string.gsub }
local tonumber = tonumber
-local setmetatable = setmetatable
-
-- Calendar notification
-- lain.widgets.calendar
-local calendar = {}
-local cal_notification = nil
+local calendar = { offset = 0 }
-function calendar:hide()
- if cal_notification ~= nil then
- naughty.destroy(cal_notification)
- cal_notification = nil
- end
+function calendar.hide()
+ naughty.destroy(naughty.getById(calendar.id))
end
-function calendar:show(t_out, inc_offset)
- calendar:hide()
-
+function calendar.show(t_out, inc_offset, scr)
+ local today = os.date("%d")
local offs = inc_offset or 0
- local tims = t_out or 0
- local f, c_text
- local today = tonumber(os.date('%d'))
- local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '
+ local f
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/(^| )('
- end
+ local current_month = (offs == 0 or calendar.offset == 0)
+ if current_month then -- today highlighted
calendar.offset = 0
- 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/"' )
-
+ calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
+ f = calendar.cal
else -- no current month showing, no day to highlight
- local month = tonumber(os.date('%m'))
- local year = tonumber(os.date('%Y'))
+ local month = tonumber(os.date("%m"))
+ local year = tonumber(os.date("%Y"))
month = month + calendar.offset
- if month > 12 then
- month = month % 12
+ while month > 12 do
+ month = month - 12
year = year + 1
- if month <= 0 then
- month = 12
- end
- elseif month < 1 then
+ end
+
+ while month < 1 do
month = month + 12
year = year - 1
- if month <= 0 then
- month = 1
- end
end
calendar.notify_icon = nil
+ f = string.format("%s %s %s", calendar.cal, month, year)
+ end
- f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)
+ if calendar.followtag then
+ calendar.notification_preset.screen = awful.screen.focused()
+ else
+ calendar.notification_preset.screen = src or 1
end
- c_text = "<tt><span font='" .. calendar.font .. " "
- .. calendar.font_size .. "'><b>"
- .. f:read() .. "</b>\n\n"
- .. f:read() .. "\n"
- .. f:read("*all"):gsub("\n*$", "")
- .. "</span></tt>"
- f:close()
-
- cal_notification = naughty.notify({
- text = c_text,
- icon = calendar.notify_icon,
- position = calendar.position,
- fg = calendar.fg,
- bg = calendar.bg,
- timeout = tims
- })
+ helpers.async(f, function(ws)
+ fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
+ ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+ calendar.id = naughty.notify({
+ replaces_id = calendar.id,
+ preset = calendar.notification_preset,
+ text = ws:gsub("\n*$", ""),
+ icon = calendar.notify_icon,
+ timeout = t_out or calendar.notification.preset.timeout or 5
+ }).id
+ end)
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(" "))
- 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.offset = 0
- calendar.notify_icon = nil
-
- widget:connect_signal("mouse::enter", function () calendar:show() 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),
- awful.button({ }, 4, function ()
- calendar:show(0, -1) end),
- awful.button({ }, 5, function ()
- calendar:show(0, 1) end)))
+function calendar.attach(widget, args)
+ local args = args or {}
+ calendar.cal = args.cal or "/usr/bin/cal --color=always"
+ calendar.followtag = args.followtag or false
+ calendar.icons = args.icons or helpers.icons_dir .. "cal/white/"
+ calendar.notification_preset = args.notification_preset
+
+ if not calendar.notification_preset then
+ calendar.notification_preset = {
+ font = "Monospace 10",
+ fg = "#FFFFFF",
+ bg = "#000000"
+ }
+ end
+
+ if widget then
+ widget:connect_signal("mouse::enter", function () calendar.show(0) end)
+ widget:connect_signal("mouse::leave", function () calendar.hide() 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
end
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+return calendar
projects / etc / awesome.git / blobdiff