From b92942b0e07f4491cf5d96fecee94b1e82675e52 Mon Sep 17 00:00:00 2001 From: Luke Bonham Date: Thu, 9 Jul 2015 12:52:18 +0200 Subject: [PATCH] enhancement: unique timers for widgets; #114 --- widgets/alsa.lua | 4 +++- widgets/alsabar.lua | 6 ++++-- widgets/bat.lua | 2 +- widgets/contrib/tpbat/init.lua | 2 +- widgets/fs.lua | 12 ++++++------ widgets/weather.lua | 4 ++-- wiki | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/widgets/alsa.lua b/widgets/alsa.lua index a356892..979d9fd 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -60,7 +60,9 @@ local function worker(args) settings() 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 }) end diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 1421975..2639aa4 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -148,8 +148,6 @@ local function worker(args) settings() end - newtimer("alsabar", timeout, alsabar.update) - alsabar.bar:buttons (awful.util.table.join ( awful.button ({}, 1, function() awful.util.spawn(alsabar.mixer) @@ -168,6 +166,10 @@ local function worker(args) end) )) + timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel) + + newtimer(timer_id, timeout, alsa.update) + return alsabar end diff --git a/widgets/bat.lua b/widgets/bat.lua index 572d099..626239b 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -141,7 +141,7 @@ local function worker(args) end end - newtimer("bat", timeout, update) + newtimer(battery, timeout, update) return bat.widget end diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua index 782bf35..0a22526 100644 --- a/widgets/contrib/tpbat/init.lua +++ b/widgets/contrib/tpbat/init.lua @@ -159,7 +159,7 @@ function tpbat.register(args) settings() end - newtimer("tpbat", timeout, update) + newtimer("tpbat-" .. bat.name, timeout, update) widget:connect_signal('mouse::enter', function () tpbat:show() end) widget:connect_signal('mouse::leave', function () tpbat:hide() end) diff --git a/widgets/fs.lua b/widgets/fs.lua index 8b51178..fab61bd 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -61,7 +61,7 @@ local function worker(args) fs.widget = wibox.widget.textbox('') - helpers.set_map("fs", false) + helpers.set_map(partition, false) function update() fs_info = {} @@ -91,7 +91,7 @@ local function worker(args) widget = fs.widget settings() - if fs_now.used >= 99 and not helpers.get_map("fs") + if fs_now.used >= 99 and not helpers.get_map(partition) then naughty.notify({ title = "warning", @@ -100,17 +100,17 @@ local function worker(args) fg = "#000000", bg = "#FFFFFF", }) - helpers.set_map("fs", true) + helpers.set_map(partition, true) else - helpers.set_map("fs", false) + helpers.set_map(partition, false) end end - helpers.newtimer(partition, timeout, update) - widget:connect_signal('mouse::enter', function () fs:show(0) end) widget:connect_signal('mouse::leave', function () fs:hide() end) + helpers.newtimer(partition, timeout, update) + return setmetatable(fs, { __index = fs.widget }) end diff --git a/widgets/weather.lua b/widgets/weather.lua index d1624fa..77d9b9b 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -121,8 +121,8 @@ local function worker(args) weather.attach(weather.widget) - newtimer("weather", timeout, weather.update) - newtimer("weather_forecast", timeout, weather.forecast_update) + newtimer("weather-" .. city_id, timeout, weather.update) + newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update) return setmetatable(weather, { __index = weather.widget }) end diff --git a/wiki b/wiki index b260e93..54b3a71 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit b260e938c83f1339b0b4b3b003f33f302f9a47b1 +Subproject commit 54b3a717b2f7069264ce5a20018ae4abf153e7b2 -- 2.39.5