#293: eradicate proxy widget

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

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index 6167d82838f12dd0c83df2459762730ac1d21aa1..49f640ce85e6242eeff3ad335ede38de8b417b06 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -7,40 +7,37 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer     = require("lain.helpers").newtimer
-
+local helpers      = require("lain.helpers")

 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
 
 -- System load
 -- lain.widgets.sysload
 local sysload = {}
 
 local setmetatable = setmetatable
 
 -- System load
 -- lain.widgets.sysload
 local sysload = {}
 

-function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 5
+local function worker(args)
+    local args     = args or {}
+    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
 
         settings()
     end
 

-    newtimer("sysload", timeout, update)
+    helpers.newtimer("sysload", timeout, update)

 
 

-    return widget
+    return sysload

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