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

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 272163c067f22d1e517a8ba27507a3cafb785b3a..9d7b71097326fba0aaa99218bb54350b4c74c0a4 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -6,37 +6,34 @@
                                                   
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
-local read_pipe    = require("lain.helpers").read_pipe
-
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
-
 local setmetatable = setmetatable
 
 -- Basic template for custom widgets
 -- lain.widgets.base
 
 local function worker(args)
-    local base     = {}
-    local args     = args or {}
-    local timeout  = args.timeout or 5
-    local cmd      = args.cmd or ""
-    local settings = args.settings or function() end
-
-    base.widget = wibox.widget.textbox('')
+    local base      = helpers.make_widget_textbox()
+    local args      = args or {}
+    local timeout   = args.timeout or 5
+    local nostart   = args.nostart or false
+    local stoppable = args.stoppable or false
+    local cmd       = args.cmd or ""
+    local settings  = args.settings or function() end
 
     function base.update()
-        if output ~= abase.prev then
-            output = read_pipe(cmd)
+        output = helpers.read_pipe(cmd)
+        if output ~= base.prev then
             widget = base.widget
             settings()
-            abase.prev = output
+            base.prev = output
         end
     end
 
-    newtimer(cmd, timeout, base.update)
+    base.timer = helpers.newtimer(cmd, timeout, base.update, nostart, stoppable)
 
-    return setmetatable(base, { __index = base.widget })
+    return base
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })