]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/sysload.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:

Merge pull request #213 from rohieb/feature/task-cmdline
[etc/awesome.git] / widgets / sysload.lua
index 6167d82838f12dd0c83df2459762730ac1d21aa1..d8e4713a77371088c2ac14693b1183b97ef4517a 100644 (file)
@@ -11,9 +11,8 @@ local newtimer     = require("lain.helpers").newtimer
 
 local wibox        = require("wibox")
 
 
 local wibox        = require("wibox")
 
-local io           = io
-local string       = { format = string.format,
-                       match  = string.match }
+local io           = { open = io.open }
+local string       = { match  = string.match }
 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 
@@ -21,26 +20,26 @@ local setmetatable = setmetatable
 -- lain.widgets.sysload
 local sysload = {}
 
 -- lain.widgets.sysload
 local sysload = {}
 
-function worker(args)
+local function worker(args)
     local args = args or {}
     local args = args or {}
-    local timeout = args.timeout or 5
+    local timeout = args.timeout or 2
     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 
-    widget = wibox.widget.textbox('')
+    sysload.widget = wibox.widget.textbox('')
 
     function update()
         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()
 
     function update()
         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()
-        
-        a, b, c = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
 
+        load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
+
+        widget = sysload.widget
         settings()
     end
 
     newtimer("sysload", timeout, update)
         settings()
     end
 
     newtimer("sysload", timeout, update)
-
-    return widget
+    return sysload.widget
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })