X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/52a50fafa078c4fb715c7d274d875ff37e6d96f8..ae4b9b272802c0690b711644508d63a538a3e1cd:/widgets/mem.lua

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 3034e89..7b717ef 100644
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -1,87 +1,56 @@
 
 --[[
-                                                           
-     Licensed under GNU General Public License v2          
-      * (c) 2013,      Luke Bonham                         
-      * (c) 2010-2012, Peter Hofmann                       
-      * (c) 2010,      Adrian C.      <anrxc@sysphere.org> 
-      * (c) 2009,      Lucas de Vries <lucas@glacicle.com> 
-                                                           
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013,      Luke Bonham                
+      * (c) 2010-2012, Peter Hofmann              
+                                                  
 --]]
 
-local markup          = require("lain.util.markup")
-local run_in_terminal = require("lain.helpers").run_in_terminal
-
-local beautiful       = require("beautiful")
-local wibox           = require("wibox")
-
-local io              = { lines  = io.lines }
-local math            = { floor  = math.floor }
-local string          = { format = string.format,
-                          gmatch = string.gmatch,
-                          len    = string.len }
-
-local setmetatable    = setmetatable
+local helpers      = require("lain.helpers")
+local wibox        = require("wibox")
+local gmatch       = string.gmatch
+local lines        = io.lines
+local floor        = math.floor
+local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 -- 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 widg = wibox.widget.textbox()
-
-    local upd = function()
-        local mem = {}
-        for line in io.lines("/proc/meminfo")
-        do
-            for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
-            do
-                if     k == "MemTotal"  then mem.total = math.floor(v / 1024)
-                elseif k == "MemFree"   then mem.free  = math.floor(v / 1024)
-                elseif k == "Buffers"   then mem.buf   = math.floor(v / 1024)
-                elseif k == "Cached"    then mem.cache = math.floor(v / 1024)
-                elseif k == "SwapTotal" then mem.swap  = math.floor(v / 1024)
-                elseif k == "SwapFree"  then mem.swapf = math.floor(v / 1024)
+local function worker(args)
+    local args     = args or {}
+    local timeout  = args.timeout or 2
+    local settings = args.settings or function() end
+
+    mem.widget = wibox.widget.textbox()
+
+    function mem.update()
+        mem_now = {}
+        for line in lines("/proc/meminfo") do
+            for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
+                if     k == "MemTotal"     then mem_now.total = floor(v / 1024 + 0.5)
+                elseif k == "MemFree"      then mem_now.free  = floor(v / 1024 + 0.5)
+                elseif k == "Buffers"      then mem_now.buf   = floor(v / 1024 + 0.5)
+                elseif k == "Cached"       then mem_now.cache = floor(v / 1024 + 0.5)
+                elseif k == "SwapTotal"    then mem_now.swap  = floor(v / 1024 + 0.5)
+                elseif k == "SwapFree"     then mem_now.swapf = floor(v / 1024 + 0.5)
+                elseif k == "SReclaimable" then mem_now.srec  = floor(v / 1024 + 0.5)
                 end
             end
         end
 
-        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
+        mem_now.used = mem_now.total - mem_now.free - mem_now.buf - mem_now.cache - mem_now.srec
+        mem_now.swapused = mem_now.swap - mem_now.swapf
+        mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)
 
-        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")
+    helpers.newtimer("mem", timeout, mem.update)
 
-    return widg
+    return mem
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })