Merge pull request #420 from sim590/unpack-lua51-compat

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

diff --git a/widget/cpu.lua b/widget/cpu.lua
index 3e3b3a3c973802d9bd16443a9e7706ee770bbe0d..81638c280eda1c2539ef9923db8cd2bb76b8ce6e 100644 (file)
--- a/widget/cpu.lua
+++ b/widget/cpu.lua
@@ -1,31 +1,26 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013,      Luke Bonham                
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013,      Luca CPZ
+      * (c) 2010-2012, Peter Hofmann
+

 --]]
 
 --]]
 

-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     = math
+local string   = string
+local tostring = tostring

 
 -- CPU usage
 -- lain.widget.cpu
 
 -- 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
 
     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 +74,4 @@ local function worker(args)
     return cpu
 end
 
     return cpu
 end
 

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