]> 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:

set card
[etc/awesome.git] / widgets / sysload.lua
index eb0682852888d85fa0d9632d15f2fef307962444..b15b1bf8d80f848f8223dc2e7df292cd8c137a48 100644 (file)
@@ -7,14 +7,11 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
-local helpers      = require("lain.helpers")
+local newtimer     = require("lain.helpers").newtimer
 
-local awful        = require("awful")
-local beautiful    = require("beautiful")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { open = io.open }
 local string       = { format = string.format,
                        match  = string.match }
 
@@ -24,47 +21,26 @@ local setmetatable = setmetatable
 -- lain.widgets.sysload
 local sysload = {}
 
-function worker(args)
+local function worker(args)
     local args = args or {}
-    local refresh_timeout = args.refresh_timeout or 5
-    local show_all = args.show_all or false
-    local header = args.header or " Load "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or "#FFFFFF" 
-    local app = args.app or "top"
+    local timeout = args.timeout or 5
+    local settings = args.settings or function() end
 
-    local mysysload = wibox.widget.textbox()
+    sysload.widget = wibox.widget.textbox('')
 
-    local mysysloadupdate = function()
+    function update()
         local f = io.open("/proc/loadavg")
-        local ret = f:read("*all")
+        local ret = f:read("*a")
         f:close()
 
-        if show_all
-        then
-            local a, b, c = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
-            mysysload:set_text(string.format("%s %s %s", a, b, c))
-        else
-            local a = string.match(ret, "([^%s]+) ")
-            mysysload:set_text(string.format("%s", a))
-        end
-        mysysload:set_markup(markup(header_color, header) ..
-                             markup(color, mysysload._layout.text .. " "))
-    end
-
-    local mysysloadtimer = timer({ timeout = refresh_timeout })
-    mysysloadtimer:connect_signal("timeout", mysysloadupdate)
-    mysysloadtimer:start()
-    mysysloadtimer:emit_signal("timeout")
+        load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
-    mysysload:buttons(awful.util.table.join(
-        awful.button({}, 0,
-            function()
-                helpers.run_in_terminal(app)
-            end)
-    ))
+        widget = sysload.widget
+        settings()
+    end
 
-    return mysysload
+    newtimer("sysload", timeout, update)
+    return sysload.widget
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })