X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/23318f8eeafaedcb77d2ee1850dc4606dea7dcaf..58b2a122dd20cc4d1d15a29a27e618c9c88050cc:/widgets/mem.lua?ds=sidebyside

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 763ac4b..ff5816c 100644
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -7,35 +7,33 @@
                                                   
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
 local gmatch       = string.gmatch
 local lines        = io.lines
-local math         = { ceil = math.ceil, floor = math.floor }
+local floor        = math.floor
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem
-local mem = {}
+local mem = helpers.make_widget_textbox()
 
 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 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 = math.ceil(v / 1024)
-                elseif k == "MemFree"      then mem_now.free  = math.ceil(v / 1024)
-                elseif k == "Buffers"      then mem_now.buf   = math.ceil(v / 1024)
-                elseif k == "Cached"       then mem_now.cache = math.ceil(v / 1024)
-                elseif k == "SwapTotal"    then mem_now.swap  = math.ceil(v / 1024)
-                elseif k == "SwapFree"     then mem_now.swapf = math.ceil(v / 1024)
-                elseif k == "SReclaimable" then mem_now.srec  = math.ceil(v / 1024)
+                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
@@ -48,9 +46,9 @@ local function worker(args)
         settings()
     end
 
-    newtimer("mem", timeout, update)
+    helpers.newtimer("mem", timeout, update)
 
-    return mem.widget
+    return mem
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })