util: magnify_client/mc: added width and height factors as optional args

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index c2945664f045f09377d13b818959572a08039deb..076b692c80279aac98b6035e8f5b74537d7f708d 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,8 +7,7 @@
                                                   
 --]]
 
                                                   
 --]]
 

-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,
 local wibox        = require("wibox")
 local math         = { ceil   = math.ceil }
 local string       = { format = string.format,


@@ -25,13 +24,13 @@ local function worker(args)
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 

-    cpu.widget = wibox.widget.textbox('')
+    cpu.widget = wibox.widget.textbox()

 
 

-    function update()
+    function cpu.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.
         -- 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
 
         for index,time in pairs(times) do
             local coreid = index - 1


@@ -68,16 +67,16 @@ local function worker(args)
             end
         end
 
             end
         end
 

-        widget = cpu.widget

         cpu_now = cpu.core
         cpu_now.usage = cpu_now[0].usage
         cpu_now = cpu.core
         cpu_now.usage = cpu_now[0].usage

+        widget = cpu.widget

 
         settings()
     end
 
 
         settings()
     end
 

-    newtimer("cpu", timeout, update)
+    helpers.newtimer("cpu", timeout, cpu.update)

 
 

-    return cpu.widget
+    return cpu

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