{alsa,pulse}bar: remove reset_timeout due to (timer already started) issue

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 763ac4b4925b83a7695c9290862472197795b140..ff5816c660a2f01b1f51672fcb60a73be363ad8a 100644 (file)
--- 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 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 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
 
 
 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
     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
                 end
             end
         end


@@ -48,9 +46,9 @@ local function worker(args)
         settings()
     end
 
         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 })
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })