widgets: no global tables, but one instance per call; closes #336; closes #337

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

diff --git a/widget/mem.lua b/widget/mem.lua
index 74ebad01a5132f3a5c18640b7f91848675477da7..50fff3bb7d62f78cd4bbfd6c5cd84987223d1786 100644 (file)
--- a/widget/mem.lua
+++ b/widget/mem.lua
@@ -7,24 +7,19 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
-local wibox        = require("wibox")
-local gmatch       = string.gmatch
-local lines        = io.lines
-local floor        = math.floor
-local setmetatable = setmetatable
+local helpers              = require("lain.helpers")
+local wibox                = require("wibox")
+local gmatch, lines, floor = string.gmatch, io.lines, math.floor
 
 -- Memory usage (ignoring caches)
 -- lain.widget.mem
-local mem = {}
 
-local function worker(args)
+local function factory(args)
+    local mem      = { widget = wibox.widget.textbox() }
     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
@@ -53,4 +48,4 @@ local function worker(args)
     return mem
 end
 
-return setmetatable(mem, { __call = function(_, ...) return worker(...) end })
+return factory