X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..912bd26ede8901c98fd8d7a35f8493ee448109ad:/widgets/cpu.lua

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index cf0b76c..1554443 100644
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,16 +7,13 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
-local first_line   = require("lain.helpers").first_line
-
-local beautiful    = require("beautiful")
+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
@@ -26,29 +23,28 @@ local cpu = {
     last_active = 0
 }
 
-function worker(args)
-    local args = args or {}
-    local refresh_timeout = args.refresh_timeout or 5
-    local header = args.header or " Cpu "
-    local header_color = args.header or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or "#FFFFFF"
-    local footer = args.footer or "%"
+local function worker(args)
+    local args     = args or {}
+    local timeout  = args.timeout or 1
+    local settings = args.settings or function() end
 
-    local w = wibox.widget.textbox()
+    cpu.widget = wibox.widget.textbox('')
+    helpers.set_map("cpuactive", 0)
+    helpers.set_map("cputotal", 0)
 
-    local cpuusageupdate = function()
+    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 = first_line("/proc/stat")
+        local times = helpers.first_line("/proc/stat")
         local at = 1
         local idle = 0
         local total = 0
         for field in string.gmatch(times, "[%s]+([^%s]+)")
         do
-            -- 3 = idle, 4 = ioWait. Essentially, the CPUs have done
+            -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done
             -- nothing during these times.
-            if at == 3 or at == 4
+            if at == 4 or at == 5
             then
                 idle = idle + field
             end
@@ -57,24 +53,28 @@ function worker(args)
         end
         local active = total - idle
 
-        -- Read current data and calculate relative values.
-        local dactive = active - cpu.last_active
-        local dtotal = total - cpu.last_total
-        local dta = math.ceil((dactive / dtotal) * 100)
+        if helpers.get_map("cpuactive") ~= active
+           or helpers.get_map("cputotal") ~= total
+        then
+            -- Read current data and calculate relative values.
+            local dactive = active - cpu.last_active
+            local dtotal = total - cpu.last_total
 
-        w:set_markup(markup(header_color, header) .. markup(color, dta .. footer) .. " ")
+            cpu_now = {}
+            cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))
 
-        -- Save current data for the next run.
-        cpu.last_active = active
-        cpu.last_total = total
+            widget = cpu.widget
+            settings()
+
+            -- Save current data for the next run.
+            helpers.set_map("cpuactive", active)
+            helpers.set_map("cputotal", total)
+        end
     end
 
-    local cpuusagetimer = timer({ timeout = refresh_timeout })
-    cpuusagetimer:connect_signal("timeout", cpuusageupdate)
-    cpuusagetimer:start()
-    cpuusagetimer:emit_signal("timeout")
+    helpers.newtimer("cpu", timeout, update)
 
-    return w
+    return cpu.widget
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })