widgets: no global tables, but one instance per call; closes #336; closes #337

[etc/awesome.git] / widget / cpu.lua

diff --git a/widget/cpu.lua b/widget/cpu.lua
index 3e3b3a3c973802d9bd16443a9e7706ee770bbe0d..9a5a9648f01e679c5cdf7992fd5cb45eb03b3c3e 100644 (file)
--- a/widget/cpu.lua
+++ b/widget/cpu.lua
@@ -7,25 +7,22 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
-local wibox        = require("wibox")
-local math         = { ceil   = math.ceil }
-local string       = { format = string.format,
-                       gmatch = string.gmatch }
-local tostring     = tostring
-local setmetatable = setmetatable
+local helpers  = require("lain.helpers")
+local wibox    = require("wibox")
+local math     = { ceil   = math.ceil }
+local string   = { format = string.format,
+                   gmatch = string.gmatch }
+local tostring = tostring
 
 -- CPU usage
 -- lain.widget.cpu
-local cpu = { core = {} }
 
-local function worker(args)
+local function factory(args)
+    local cpu      = { core = {}, widget = wibox.widget.textbox() }
     local args     = args or {}
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
-    cpu.widget = wibox.widget.textbox()
-
     function cpu.update()
         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
@@ -79,4 +76,4 @@ local function worker(args)
     return cpu
 end
 
-return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })
+return factory