X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/bc574619fe7a9dd077d8fe6f972f1763b6936df0..50a07a1ec18aaeeab356de56254dfdf592bd9c9b:/widgets/alsabar.lua?ds=sidebyside diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 8331c54..90d3a0d 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -15,7 +15,7 @@ local naughty = require("naughty") local io = { popen = io.popen } local math = { modf = math.modf } -local string = { format = string.format, +local string = { format = string.format, match = string.match, rep = string.rep } local tonumber = tonumber @@ -43,8 +43,8 @@ local alsabar = { font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")), font_size = "11", - color = beautiful.fg_focus, - bar_size = 18 + color = beautiful.fg_normal, + bar_size = 18 }, _current_level = 0, @@ -92,6 +92,7 @@ end local function worker(args) local args = args or {} local timeout = args.timeout or 4 + local settings = args.settings or function() end local width = args.width or 63 local height = args.heigth or 1 local ticks = args.ticks or true @@ -122,7 +123,7 @@ local function worker(args) f:close() -- Capture mixer control state: [5%] ... ... [on] - local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") if volu == nil then volu = 0 @@ -142,6 +143,11 @@ local function worker(args) alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu)) alsabar.bar:set_color(alsabar.colors.unmute) end + + volume_now = {} + volume_now.level = tonumber(volu) + volume_now.status = mute + settings() end newtimer("alsabar", timeout, alsabar.update)