end
-- Magnify a client: set it to "float" and resize it.
-function util.magnify_client(c)
+function util.magnify_client(c, width_f, height_f)
if c and not c.floating then
- util.mc(c)
util.magnified_client = c
+ util.mc(c, width_f, height_f)
else
- c.floating = false
util.magnified_client = nil
+ c.floating = false
end
end
-- https://github.com/copycat-killer/lain/issues/195
-function util.mc(c)
+function util.mc(c, width_f, height_f)
c = c or util.magnified_client
if not c then return end
c.floating = true
local s = awful.screen.focused()
- local mg = s.geometry
- local mwfact = s.selected_tag.master_width_factor or 0.5
+ local mg = s.workarea
local g = {}
+ local mwfact = width_f or s.selected_tag.master_width_factor or 0.5
g.width = sqrt(mwfact) * mg.width
- g.height = sqrt(mwfact) * mg.height
+ g.height = sqrt(height_f or mwfact) * mg.height
g.x = mg.x + (mg.width - g.width) / 2
g.y = mg.y + (mg.height - g.height) / 2
end
function calendar.show(t_out, inc_offset, scr)
- local today = os.date("%e")
- local offs = inc_offset or 0
- local f
+ local f, offs = nil, inc_offset or 0
calendar.offset = calendar.offset + offs
if current_month then -- today highlighted
calendar.offset = 0
- calendar.notify_icon = string.format("%s%s.png", calendar.icons, tonumber(today))
+ calendar.icon = string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
f = calendar.cal
else -- no current month showing, no day to highlight
local month = tonumber(os.date("%m"))
year = year - 1
end
- calendar.notify_icon = nil
+ calendar.icon = nil
f = string.format("%s %s %s", calendar.cal, month, year)
end
calendar.notification_preset.screen = src or 1
end
- helpers.async(f, function(ws)
- fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
- ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+ if f == calendar then
+ calendar.update(f, false)
calendar.hide()
calendar.notification = naughty.notify({
preset = calendar.notification_preset,
- text = ws:gsub("\n*$", ""),
- icon = calendar.notify_icon,
+ icon = calendar.icon,
timeout = t_out or calendar.notification_preset.timeout or 5
})
+ else
+ calendar.update(f, true, t_out)
+ end
+end
+
+function calendar.update(f, show, t_out)
+ local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
+
+ helpers.async(f, function(ws)
+ ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?",
+ markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "")
+
+ if f == calendar.cal then
+ calendar.notification_preset.text = ws
+ end
+
+ if show then
+ calendar.hide()
+ calendar.notification = naughty.notify({
+ preset = calendar.notification_preset,
+ text = ws,
+ icon = calendar.icon,
+ timeout = t_out or calendar.notification_preset.timeout or 5
+ })
+ end
end)
end
end
for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end
+
+ calendar.update(calendar.cal, false)
end
return setmetatable(calendar, { __call = function(_, ...) return worker(...) end })