reverted bb3a0c1 and fixed scr_pos pointers in calendar widget

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 0431d03a8891f15696ff674aa47e501cf7a86b2a..2a7bf1027545bcc32a1be73dbb7ebaa502a292ba 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -9,14 +9,14 @@
 local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 
 local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 

-local io           = io
+local io           = { popen = io.popen }

 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 

--- Basic template for simple widgets 
+-- Basic template for custom widgets

 -- lain.widgets.base
 -- lain.widgets.base

-local base = {}

 
 local function worker(args)
 
 local function worker(args)

+    local base     = {}

     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""


@@ -24,14 +24,17 @@ local function worker(args)
 
     base.widget = wibox.widget.textbox('')
 
 
     base.widget = wibox.widget.textbox('')
 

-    function update()
-        output = io.popen(cmd):read("*all")
+    function base.update()
+        local f = assert(io.popen(cmd))
+        output = f:read("*all")
+        f:close()

         widget = base.widget
         settings()
     end
 
         widget = base.widget
         settings()
     end
 

-    newtimer(cmd, timeout, update)
-    return base.widget
+    newtimer(cmd, timeout, base.update)
+
+    return setmetatable(base, { __index = base.widget })

 end
 
 end
 

-return setmetatable(base, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })