awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

show notification window in focused screen

This commit is contained in:
WooParadog 2014-07-19 22:36:15 +08:00
parent 0f5ce4dd76
commit 4b634be781
10 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
widgets/alsabar.lua
View File

@ -54,22 +54,22 @@ local alsabar =
function alsabar.notify()
alsabar.update()
local preset =
{
local preset =
{
title = "",
text = "",
timeout = 4,
font = alsabar.notifications.font .. " " ..
alsabar.notifications.font_size,
fg = alsabar.notifications.color
}
}
if alsabar._muted
if alsabar._muted
then
preset.title = alsabar.channel .. " - Muted"
else
preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
end
preset.title = alsabar.channel .. " - Muted"
else
preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
end
int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
preset.text = "["
@ -78,15 +78,17 @@ function alsabar.notify()
.. "]"
if alsabar._notify ~= nil then
alsabar._notify = naughty.notify ({
alsabar._notify = naughty.notify ({
replaces_id = alsabar._notify.id,
preset = preset
preset = preset,
screen = client.focus and client.focus.screen or 1
})
else
alsabar._notify = naughty.notify ({
preset = preset
else
alsabar._notify = naughty.notify ({
preset = preset,
screen = client.focus and client.focus.screen or 1
})
end
end
end
local function worker(args)

6
widgets/bat.lua
View File

@ -129,13 +129,15 @@ local function worker(args)
then
bat.id = naughty.notify({
preset = bat_notification_critical_preset,
replaces_id = bat.id
replaces_id = bat.id,
screen = client.focus and client.focus.screen or 1
}).id
elseif nperc <= 15
then
bat.id = naughty.notify({
preset = bat_notification_low_preset,
replaces_id = bat.id
replaces_id = bat.id,
screen = client.focus and client.focus.screen or 1
}).id
end
end

3
widgets/calendar.lua
View File

@ -98,7 +98,8 @@ function calendar:show(t_out, inc_offset)
position = calendar.position,
fg = calendar.fg,
bg = calendar.bg,
timeout = tims
timeout = tims,
screen = client.focus and client.focus.screen or 1
})
end

10
widgets/contrib/task.lua
View File

@ -51,7 +51,9 @@ function task:show()
position = task.position,
fg = task.fg,
bg = task.bg,
timeout = task.timeout })
timeout = task.timeout,
screen = client.focus and client.focus.screen or 1
})
end
function task:prompt_add()
@ -72,7 +74,8 @@ function task:prompt_add()
position = task.position,
fg = task.fg,
bg = task.bg,
timeout = task.timeout
timeout = task.timeout,
screen = client.focus and client.focus.screen or 1
})
end,
nil,
@ -105,7 +108,8 @@ function task:prompt_search()
position = task.position,
fg = task.fg,
bg = task.bg,
timeout = task.timeout
timeout = task.timeout,
screen = client.focus and client.focus.screen or 1
})
end,
nil,

12
widgets/contrib/tpbat/init.lua
View File

@ -75,7 +75,8 @@ function tpbat:show(t_out)
tpbat_notification = naughty.notify({
preset = { fg = beautiful.fg_normal },
text = str,
timeout = t_out
timeout = t_out,
screen = client.focus and client.focus.screen or 1
})
end
@ -111,7 +112,8 @@ function tpbat.register(args)
local n = naughty.notify({
preset = bat_notification_low_preset,
title = "SMAPI Battery Warning: Unable to read battery state!",
text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths."
text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
screen = client.focus and client.focus.screen or 1
})
end
@ -137,13 +139,15 @@ function tpbat.register(args)
then
tpbat.id = naughty.notify({
preset = bat_notification_critical_preset,
replaces_id = tpbat.id
replaces_id = tpbat.id,
screen = client.focus and client.focus.screen or 1
}).id
elseif bat_now.perc <= 15
then
tpbat.id = naughty.notify({
preset = bat_notification_low_preset,
replaces_id = tpbat.id
replaces_id = tpbat.id,
screen = client.focus and client.focus.screen or 1
}).id
end
end

7
widgets/fs.lua
View File

@ -46,7 +46,8 @@ function fs:show(t_out)
notification = naughty.notify({
preset = fs_notification_preset,
text = ws,
timeout = t_out
timeout = t_out,
screen = client.focus and client.focus.screen or 1
})
end
@ -66,7 +67,6 @@ local function worker(args)
function update()
fs_info = {}
fs_now = {}
local f = io.popen("LC_ALL=C df -kP " .. partition)
for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
@ -99,7 +99,8 @@ local function worker(args)
text = partition .. " ran out!\nmake some room",
timeout = 8,
fg = "#000000",
bg = "#FFFFFF"
bg = "#FFFFFF",
screen = client.focus and client.focus.screen or 1
})
helpers.set_map("fs", true)
else

6
widgets/imap.lua
View File

@ -74,7 +74,11 @@ local function worker(args)
else
nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
end
naughty.notify({ preset = mail_notification_preset, text = nt })
naughty.notify({
preset = mail_notification_preset,
text = nt,
screen = client.focus and client.focus.screen or 1
})
end
helpers.set_map(mail, mailcount)

3
widgets/mpd.lua
View File

@ -92,7 +92,8 @@ local function worker(args)
mpd.id = naughty.notify({
preset = mpd_notification_preset,
icon = "/tmp/mpdcover.png",
replaces_id = mpd.id
replaces_id = mpd.id,
screen = client.focus and client.focus.screen or 1
}).id
end
elseif mpd_now.state ~= "pause"

3
widgets/net.lua
View File

@ -87,7 +87,8 @@ local function worker(args)
timeout = 7,
position = "top_left",
icon = helpers.icons_dir .. "no_net.png",
fg = notify_fg or "#FFFFFF"
fg = notify_fg or "#FFFFFF",
screen = client.focus and client.focus.screen or 1
})
helpers.set_map(iface, false)
end

3
widgets/yawn/init.lua
View File

@ -161,7 +161,8 @@ function yawn.show(t_out)
preset = yawn_notification_preset,
text = weather_data,
icon = sky,
timeout = t_out
timeout = t_out,
screen = client.focus and client.focus.screen or 1
})
end