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

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index d0ff223966549c845dd48d9440ee3a2db3d1ffe0..ff5816c660a2f01b1f51672fcb60a73be363ad8a 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -1,62 +1,54 @@
 
 --[[
 
 --[[

-                                                           
-     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 newtimer        = require("lain.helpers").newtimer
-
-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
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem

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

 
 

-function worker(args)
+local function worker(args)

     local args     = args or {}
     local args     = args or {}

-    local timeout  = args.timeout or 3
+    local timeout  = args.timeout or 2

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

-    widget = wibox.widget.textbox('')
-

     function update()
     function update()

-        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)
+        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
 
                 end
             end
         end
 

-        used = mem.total - (mem.free + mem.buf + mem.cache)
-        swapused = mem.swap - mem.swapf
+        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)

 
 

+        widget = mem.widget

         settings()
     end
 
         settings()
     end
 

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

 
 

-    return widget
+    return mem

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