no need to set naughty.config.defaults as preset, because it's implicit; closes #290

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

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index 868398c9f6b593855b67a6f47fd7785f54dd93a8..148319dd22c5f84b71a6ac58d4e0f65c04bc7bc8 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -7,40 +7,35 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

-local sysload = {}
+local sysload = helpers.make_widget_textbox()

 
 local function worker(args)
 
 local function worker(args)

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

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

-    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()

-        
+

         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
         widget = sysload.widget
         settings()
     end
 
         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
         widget = sysload.widget
         settings()
     end
 

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

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