X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/00a2951166f61cbbfe1d6e042fe0e53427c001cd..a6965bed5eea11416503e17fb1b419724dff7b84:/widgets/mem.lua?ds=inline

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 09be00f..f014149 100644
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -9,10 +9,8 @@
                                                            
 --]]
 
-local markup          = require("lain.util.markup")
-local run_in_terminal = require("lain.helpers").run_in_terminal
+local newtimer        = require("lain.helpers").newtimer
 
-local beautiful       = require("beautiful")
 local wibox           = require("wibox")
 
 local io              = { lines  = io.lines }
@@ -27,20 +25,15 @@ local setmetatable    = setmetatable
 -- lain.widgets.mem
 local mem = {}
 
-function worker(args)
-    local args = args or {}
-    local refresh_timeout = args.refresh_timeout or 10
-    local show_swap = args.show_swap or false
-    local show_total = args.show_total or false
-    local header = args.header or " Mem "
-    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 "MB"
+local function worker(args)
+    local args     = args or {}
+    local timeout  = args.timeout or 3
+    local settings = args.settings or function() end
 
-    local widg = wibox.widget.textbox()
+    mem.widget = wibox.widget.textbox('')
 
-    local upd = function()
-        local mem = {}
+    function mem.update()
+        mem = {}
         for line in io.lines("/proc/meminfo")
         do
             for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
@@ -58,30 +51,13 @@ function worker(args)
         used = mem.total - (mem.free + mem.buf + mem.cache)
         swapused = mem.swap - mem.swapf
 
-        if show_total
-        then
-            local fmt = "%" .. string.len(mem.total) .. ".0f/%.0f"
-            widg:set_markup(markup(header_color, header) ..
-                            markup(color, string.format(fmt, used, mem.total) .. footer .. " "))
-        else
-            widg:set_markup(markup(header_color, header) ..
-                            markup(color, used .. footer .. " "))
-        end
-
-        if show_swap
-        then
-            widg:set_markup(widg._layout.text .. ' ('
-                            .. string.format('%.0f '.. footer, swapused)
-                            .. ') ')
-        end
+        widget = mem.widget
+        settings()
     end
 
-    local tmr = timer({ timeout = refresh_timeout })
-    tmr:connect_signal("timeout", upd)
-    tmr:start()
-    tmr:emit_signal("timeout")
+    newtimer("mem", timeout, mem.update)
 
-    return widg
+    return mem.widget
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })