Merge pull request #338 from klaernie/master

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

diff --git a/widget/cpu.lua b/widget/cpu.lua
index e8a6c9c1bbade3550f884f61a6fd6f5cfdeb498f..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
 
 -- CPU usage
 -- lain.widget.cpu

-local cpu = { core = {} }

 
 local function factory(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
 
     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
     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 factory(args)
     return cpu
 end
 
     return cpu
 end
 

-return setmetatable(cpu, { __call = function(_, ...) return factory(...) end })
+return factory