reverted bb3a0c1 and fixed scr_pos pointers in calendar widget

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index f307b26b3bcc021218555ca0f65ef7e800183209..ec84101f6d0be1bf1ed07b8b6dfe015f4b916208 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -28,12 +28,12 @@ local cpu = {
 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

-    local timeout  = args.timeout or 5
+    local timeout  = args.timeout or 2

     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')
 
     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')
 

-    function cpu.update()
+    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.
         -- 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.


@@ -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,7 +58,8 @@ 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_now = {}
+        cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))

 
         widget = cpu.widget
         settings()
 
         widget = cpu.widget
         settings()


@@ -68,7 +69,7 @@ local function worker(args)
         cpu.last_total = total
     end
 
         cpu.last_total = total
     end
 

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

 
     return cpu.widget
 end
 
     return cpu.widget
 end