X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/98977a1888c57a00dbefcbf83c4e598daeab33aa..f63a7fd098e3826e397c16938968a1a840150abe:/widgets/cpu.lua

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 1554443..6019f32 100644
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,36 +7,34 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
+local first_line   = require("lain.helpers").first_line
+local newtimer     = require("lain.helpers").newtimer
+
 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 = {
-    last_total = 0,
-    last_active = 0
-}
+local cpu = { last_total = 0, last_active = 0 }
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 1
+    local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')
-    helpers.set_map("cpuactive", 0)
-    helpers.set_map("cputotal", 0)
 
     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 = helpers.first_line("/proc/stat")
+        local times = first_line("/proc/stat")
         local at = 1
         local idle = 0
         local total = 0
@@ -52,10 +50,8 @@ local function worker(args)
             at = at + 1
         end
         local active = total - idle
-
-        if helpers.get_map("cpuactive") ~= active
-           or helpers.get_map("cputotal") ~= total
-        then
+        
+        if cpu.last_active ~= active or cpu.last_total ~= total then
             -- Read current data and calculate relative values.
             local dactive = active - cpu.last_active
             local dtotal = total - cpu.last_total
@@ -67,12 +63,12 @@ local function worker(args)
             settings()
 
             -- Save current data for the next run.
-            helpers.set_map("cpuactive", active)
-            helpers.set_map("cputotal", total)
+            cpu.last_active = active
+            cpu.last_total = total
         end
     end
 
-    helpers.newtimer("cpu", timeout, update)
+    newtimer("cpu", timeout, update)
 
     return cpu.widget
 end