small fixes

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index f9bbe72df725ce3da6b9b37e9a3c8b8b361d0858..96e0d3b3a38315496c32e9cc628377bc25435786 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -31,7 +31,7 @@ local function worker(args)
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 

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

 
     function update()
         -- Read the amount of time the CPUs have spent performing
 
     function update()
         -- Read the amount of time the CPUs have spent performing


@@ -43,9 +43,9 @@ local function worker(args)
         local total = 0
         for field in string.gmatch(times, "[%s]+([^%s]+)")
         do
         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.
             -- nothing during these times.

-            if at == 3 or at == 4
+            if at == 4 or at == 5

             then
                 idle = idle + field
             end
             then
                 idle = idle + field
             end


@@ -58,8 +58,10 @@ local function worker(args)
         local dactive = active - cpu.last_active
         local dtotal = total - cpu.last_total
 
         local dactive = active - cpu.last_active
         local dtotal = total - cpu.last_total
 

-        usage = tostring(math.ceil((dactive / dtotal) * 100))
+        cpu_noj = {}
+        cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))

 
 

+        widget = cpu.widget

         settings()
 
         -- Save current data for the next run.
         settings()
 
         -- Save current data for the next run.


@@ -69,7 +71,7 @@ local function worker(args)
 
     newtimer("cpu", timeout, update)
 
 
     newtimer("cpu", timeout, update)
 

-    return widget
+    return cpu.widget

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