Merge branch 'trap000d-master'

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

diff --git a/widgets/abase.lua b/widgets/abase.lua
index 7eef754d5732033eed4a6f1f75f058af771318a1..300cc1b54d6832274fcfe8e87aca04d05843951c 100644 (file)
--- a/widgets/abase.lua
+++ b/widgets/abase.lua
@@ -7,20 +7,22 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-local wibox        = require("wibox")
+local textbox      = require("wibox.widget.textbox")

 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 

--- Basic template for custom widgets (asynchronous version)
+-- Template for custom asynchronous widgets

 -- lain.widgets.abase
 
 local function worker(args)
 -- lain.widgets.abase
 
 local function worker(args)

-    local abase     = helpers.make_widget_textbox()
+    local abase     = {}

     local args      = args or {}
     local timeout   = args.timeout or 5
     local nostart   = args.nostart or false
     local stoppable = args.stoppable or false
     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
+    local cmd       = args.cmd
+    local settings  = args.settings or function() widget:set_text(output) end
+
+    abase.widget = args.widget or textbox()

 
     function abase.update()
         helpers.async(cmd, function(f)
 
     function abase.update()
         helpers.async(cmd, function(f)


@@ -35,7 +37,7 @@ local function worker(args)
 
     abase.timer = helpers.newtimer(cmd, timeout, abase.update, nostart, stoppable)
 
 
     abase.timer = helpers.newtimer(cmd, timeout, abase.update, nostart, stoppable)
 

-    return setmetatable(abase, { __index = abase.widget })
+    return abase

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