enhancement: unique timers for widgets; #114

This commit is contained in:
Luke Bonham 2015-07-09 12:52:18 +02:00
parent e165a3c289
commit b9bca04108
7 changed files with 18 additions and 14 deletions

View File

@ -60,7 +60,9 @@ local function worker(args)
settings() settings()
end end
newtimer("alsa", timeout, alsa.update) timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
newtimer(timer_id, timeout, alsa.update)
return setmetatable(alsa, { __index = alsa.widget }) return setmetatable(alsa, { __index = alsa.widget })
end end

View File

@ -148,8 +148,6 @@ local function worker(args)
settings() settings()
end end
newtimer("alsabar", timeout, alsabar.update)
alsabar.bar:buttons (awful.util.table.join ( alsabar.bar:buttons (awful.util.table.join (
awful.button ({}, 1, function() awful.button ({}, 1, function()
awful.util.spawn(alsabar.mixer) awful.util.spawn(alsabar.mixer)
@ -168,6 +166,10 @@ local function worker(args)
end) end)
)) ))
timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
newtimer(timer_id, timeout, alsa.update)
return alsabar return alsabar
end end

View File

@ -141,7 +141,7 @@ local function worker(args)
end end
end end
newtimer("bat", timeout, update) newtimer(battery, timeout, update)
return bat.widget return bat.widget
end end

View File

@ -159,7 +159,7 @@ function tpbat.register(args)
settings() settings()
end end
newtimer("tpbat", timeout, update) newtimer("tpbat-" .. bat.name, timeout, update)
widget:connect_signal('mouse::enter', function () tpbat:show() end) widget:connect_signal('mouse::enter', function () tpbat:show() end)
widget:connect_signal('mouse::leave', function () tpbat:hide() end) widget:connect_signal('mouse::leave', function () tpbat:hide() end)

View File

@ -61,7 +61,7 @@ local function worker(args)
fs.widget = wibox.widget.textbox('') fs.widget = wibox.widget.textbox('')
helpers.set_map("fs", false) helpers.set_map(partition, false)
function update() function update()
fs_info = {} fs_info = {}
@ -91,7 +91,7 @@ local function worker(args)
widget = fs.widget widget = fs.widget
settings() settings()
if fs_now.used >= 99 and not helpers.get_map("fs") if fs_now.used >= 99 and not helpers.get_map(partition)
then then
naughty.notify({ naughty.notify({
title = "warning", title = "warning",
@ -100,17 +100,17 @@ local function worker(args)
fg = "#000000", fg = "#000000",
bg = "#FFFFFF", bg = "#FFFFFF",
}) })
helpers.set_map("fs", true) helpers.set_map(partition, true)
else else
helpers.set_map("fs", false) helpers.set_map(partition, false)
end end
end end
helpers.newtimer(partition, timeout, update)
widget:connect_signal('mouse::enter', function () fs:show(0) end) widget:connect_signal('mouse::enter', function () fs:show(0) end)
widget:connect_signal('mouse::leave', function () fs:hide() end) widget:connect_signal('mouse::leave', function () fs:hide() end)
helpers.newtimer(partition, timeout, update)
return setmetatable(fs, { __index = fs.widget }) return setmetatable(fs, { __index = fs.widget })
end end

View File

@ -121,8 +121,8 @@ local function worker(args)
weather.attach(weather.widget) weather.attach(weather.widget)
newtimer("weather", timeout, weather.update) newtimer("weather-" .. city_id, timeout, weather.update)
newtimer("weather_forecast", timeout, weather.forecast_update) newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update)
return setmetatable(weather, { __index = weather.widget }) return setmetatable(weather, { __index = weather.widget })
end end

2
wiki

@ -1 +1 @@
Subproject commit b260e938c83f1339b0b4b3b003f33f302f9a47b1 Subproject commit 54b3a717b2f7069264ce5a20018ae4abf153e7b2