]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/cpu.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Updated Layouts (markdown)
[etc/awesome.git] / widgets / cpu.lua
index cf0b76c911296596c172654a74c6eaf93f045349..0b21edc142fcdff284eb979d6b151712237fb450 100644 (file)
@@ -7,15 +7,15 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
 local first_line   = require("lain.helpers").first_line
+local newtimer     = require("lain.helpers").newtimer
 
-local beautiful    = require("beautiful")
 local wibox        = require("wibox")
 
 local math         = { ceil   = math.ceil }
 local string       = { format = string.format,
                        gmatch = string.gmatch }
+local tostring     = tostring
 
 local setmetatable = setmetatable
 
@@ -26,17 +26,14 @@ 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 5
+    local settings = args.settings or function() end
 
-    local w = wibox.widget.textbox()
+    cpu.widget = wibox.widget.textbox('')
 
-    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.
@@ -60,21 +57,21 @@ function worker(args)
         -- 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)
 
-        w:set_markup(markup(header_color, header) .. markup(color, dta .. footer) .. " ")
+        cpu_now = {}
+        cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))
+
+        widget = cpu.widget
+        settings()
 
         -- Save current data for the next run.
         cpu.last_active = active
         cpu.last_total = total
     end
 
-    local cpuusagetimer = timer({ timeout = refresh_timeout })
-    cpuusagetimer:connect_signal("timeout", cpuusageupdate)
-    cpuusagetimer:start()
-    cpuusagetimer:emit_signal("timeout")
+    newtimer("cpu", timeout, update)
 
-    return w
+    return cpu.widget
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })