no need to set naughty.config.defaults as preset, because it's implicit; closes #290

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index c33c7eb68736692b9eede3e456b0cf616b474e8d..f61e2ccf794ae7974abb5fdbf38d8f7f0b5bff5e 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,34 +7,30 @@
                                                   
 --]]
 
-local lines_match  = require("lain.helpers").lines_match
-local newtimer     = require("lain.helpers").newtimer
-
+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
 
 -- CPU usage
 -- lain.widgets.cpu
-local cpu = { core = {} }
+local cpu = helpers.make_widget_textbox()
 
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
-    cpu.widget = wibox.widget.textbox('')
+    cpu.core = {}
 
     function update()
         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
         -- which is the sum of all CPUs.
-        local times = lines_match("cpu","/proc/stat")
+        local times = helpers.lines_match("cpu","/proc/stat")
 
         for index,time in pairs(times) do
             local coreid = index - 1
@@ -78,9 +74,9 @@ local function worker(args)
         settings()
     end
 
-    newtimer("cpu", timeout, update)
+    helpers.newtimer("cpu", timeout, update)
 
-    return cpu.widget
+    return cpu
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })