From: luke bonham Date: Thu, 13 Feb 2014 17:17:48 +0000 (+0100) Subject: base: update subfuction added; contrib/brightness removed because now redundant X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/342df3ab43dfe857195c3a5921781895718533b8?ds=inline;hp=-c base: update subfuction added; contrib/brightness removed because now redundant --- 342df3ab43dfe857195c3a5921781895718533b8 diff --git a/widgets/base.lua b/widgets/base.lua index 0431d03..198b6f7 100644 --- a/widgets/base.lua +++ b/widgets/base.lua @@ -12,7 +12,7 @@ local wibox = require("wibox") local io = io local setmetatable = setmetatable --- Basic template for simple widgets +-- Basic template for custom widgets -- lain.widgets.base local base = {} @@ -24,14 +24,17 @@ local function worker(args) 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 newtimer(cmd, timeout, update) - return base.widget + + return setmetatable(base, { __index = base.widget }) end return setmetatable(base, { __call = function(_, ...) return worker(...) end }) diff --git a/widgets/contrib/brightness.lua b/widgets/contrib/brightness.lua deleted file mode 100644 index 04b8d2b..0000000 --- a/widgets/contrib/brightness.lua +++ /dev/null @@ -1,42 +0,0 @@ - ---[[ - - Licensed under GNU General Public License v2 - * (c) 2013, yawnt - ---]] - -local newtimer = require("lain.helpers").newtimer - -local wibox = require("wibox") -local io = { popen = io.popen } - -local setmetatable = setmetatable - --- Brightness level --- lain.widgets.contrib.brightness -local brightness = {} - -local function worker(args) - local args = args or {} - local backlight = args.backlight or "acpi_video0" - local timeout = args.timeout or 5 - local settings = args.settings or function() end - - brightness.widget = wibox.widget.textbox('') - - function brightness.update() - local f = assert(io.popen('cat /sys/class/backlight/' .. backlight .. "/brightness")) - brightness_now = f:read("*a") - f:close() - - widget = brightness.widget - settings() - end - - newtimer("brightness", timeout, brightness.update) - - return setmetatable(brightness, { __index = brightness.widget }) -end - -return setmetatable(brightness, { __call = function(_, ...) return worker(...) end }) diff --git a/wiki b/wiki index 6075408..b56a779 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 60754084cf7bb69d7387484e12fa686c73cfe1bc +Subproject commit b56a779e276987cb9f8f8d81785d35633db047d1