X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c946cc48c8980fd92e4c865df70041e51d75b6d1..b1a089633c0f1ac951c754b2e67b194b7f733413:/widgets/calendar.lua?ds=sidebyside
diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index e1733ee..0793bc0 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -6,54 +6,43 @@
--]]
-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 = { popen = io.popen }
-local os = { date = os.date }
-local mouse = mouse
+local os = { date = os.date }
local string = { format = string.format,
- sub = string.sub,
gsub = string.gsub }
+local ipairs = ipairs
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()
+ if not calendar.notification then return end
+ naughty.destroy(calendar.notification)
+ calendar.notification = nil
end
-function calendar:show(t_out, inc_offset, scr)
- calendar:hide()
-
- local f, c_text
- local offs = inc_offset or 0
- local tims = t_out or 0
- local today = tonumber(os.date('%d'))
+function calendar.show(t_out, inc_offset, scr)
+ local today = os.date("%d")
+ local offs = inc_offset or 0
+ local f
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 .. today .. ".png"
+ local current_month = (offs == 0 or calendar.offset == 0)
- -- bg and fg inverted to highlight today
- f = io.popen(calendar.cal_format(today))
+ if current_month then -- today highlighted
+ calendar.offset = 0
+ 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
@@ -68,64 +57,58 @@ function calendar:show(t_out, inc_offset, scr)
end
calendar.notify_icon = nil
- f = io.popen(string.format('%s %s %s', calendar.cal, month, year))
+ f = string.format("%s %s %s", calendar.cal, month, year)
end
- c_text = ""
- .. f:read() .. "\n\n"
- .. f:read() .. "\n"
- .. f:read("*all"):gsub("\n*$", "")
- .. ""
- f:close()
-
- if calendar.followmouse then
- scrp = mouse.screen
+ if calendar.followtag then
+ calendar.notification_preset.screen = awful.screen.focused()
else
- scrp = scr or calendar.scr_pos
+ calendar.notification_preset.screen = src or 1
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
- })
+ 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.hide()
+ calendar.notification = naughty.notify({
+ preset = calendar.notification_preset,
+ text = ws:gsub("\n*$", ""),
+ icon = calendar.notify_icon,
+ timeout = t_out or calendar.notification_preset.timeout or 5
+ })
+ end)
end
-function calendar:attach(widget, args)
- local args = args or {}
-
- 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%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, calendar.scr_pos) end)
- widget:connect_signal("mouse::leave", function () calendar:hide() end)
+function calendar.attach(widget)
+ 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),
+ calendar.show(0, -1, calendar.scr_pos) end),
awful.button({ }, 3, function ()
- calendar:show(0, 1, calendar.scr_pos) end),
+ calendar.show(0, 1, calendar.scr_pos) end),
awful.button({ }, 4, function ()
- calendar:show(0, -1, calendar.scr_pos) end),
+ calendar.show(0, -1, calendar.scr_pos) end),
awful.button({ }, 5, function ()
- calendar:show(0, 1, calendar.scr_pos) end)))
+ calendar.show(0, 1, calendar.scr_pos) end)))
+end
+
+local function worker(args)
+ local args = args or {}
+ calendar.cal = args.cal or "/usr/bin/cal --color=always"
+ calendar.attach_to = args.attach_to or {}
+ 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
+
+ for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
end
-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })