adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

calendar: separate args from attach; closes #294

Browse source
This commit is contained in:
copycat-killer 2017-01-28 15:40:19 +01:00
parent 555b872d16
commit 1b428513fd
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
widgets/calendar.lua
View file

@ -13,7 +13,9 @@ local naughty = require("naughty")
local os = { date = os.date } local os = { date = os.date }
local string = { format = string.format, local string = { format = string.format,
gsub = string.gsub } gsub = string.gsub }
local ipairs = ipairs
local tonumber = tonumber local tonumber = tonumber
local setmetatable = setmetatable
-- Calendar notification -- Calendar notification
-- lain.widgets.calendar -- lain.widgets.calendar
@ -24,8 +26,6 @@ function calendar.hide()
end end
function calendar.show(t_out, inc_offset, scr) function calendar.show(t_out, inc_offset, scr)
calendar.hide()
local today = os.date("%d") local today = os.date("%d")
local offs = inc_offset or 0 local offs = inc_offset or 0
local f local f
@ -67,6 +67,7 @@ function calendar.show(t_out, inc_offset, scr)
helpers.async(f, function(ws) helpers.async(f, function(ws)
fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg 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))) ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
calendar.hide()
calendar.id = naughty.notify({ calendar.id = naughty.notify({
replaces_id = calendar.id, replaces_id = calendar.id,
preset = calendar.notification_preset, preset = calendar.notification_preset,
@ -77,9 +78,23 @@ function calendar.show(t_out, inc_offset, scr)
end) end)
end end
function calendar.attach(widget, args) 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),
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
local function worker(args)
local args = args or {} local args = args or {}
calendar.cal = args.cal or "/usr/bin/cal --color=always" calendar.cal = args.cal or "/usr/bin/cal --color=always"
calendar.attach_to = args.attach_to or {}
calendar.followtag = args.followtag or false calendar.followtag = args.followtag or false
calendar.icons = args.icons or helpers.icons_dir .. "cal/white/" calendar.icons = args.icons or helpers.icons_dir .. "cal/white/"
calendar.notification_preset = args.notification_preset calendar.notification_preset = args.notification_preset
@ -92,18 +107,7 @@ function calendar.attach(widget, args)
} }
end end
if widget then for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
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 end
return calendar return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })

2
wiki

@ -1 +1 @@
Subproject commit 2fb160f6c19483150110cb6fa2d6567cc3581a85 Subproject commit b7585bf6af0c68ed17ec35e880d963ba4e307620