X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8af4a03c754fa1bcac24736633f1b3be8ce8888c..99db3d7ac26154bc6a87f68cb5922010fce7aa04:/widgets/alsabar.lua diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index d8f1731..96d57b0 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -24,77 +24,74 @@ local setmetatable = setmetatable -- ALSA volume bar -- lain.widgets.alsabar -local alsabar = -{ - channel = "Master", - step = "5%", - - colors = - { - background = beautiful.bg_normal, - mute = "#EB8F8F", - unmute = "#A4CE8A" - }, - - terminal = terminal or "xterm", - mixer = terminal .. " -e alsamixer", - - notifications = - { - font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")), - font_size = "11", - color = beautiful.fg_focus, - bar_size = 18 - }, - - _current_level = 0, - _muted = false +local alsabar = { + channel = "Master", + step = "5%", + + colors = { + background = beautiful.bg_normal, + mute = "#EB8F8F", + unmute = "#A4CE8A" + }, + + terminal = terminal or "xterm", + mixer = terminal .. " -e alsamixer", + + notifications = { + font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")), + font_size = "11", + color = beautiful.fg_normal, + bar_size = 18 + }, + + _current_level = 0, + _muted = false } function alsabar.notify() - alsabar.update() - - local preset = - { - title = "", - text = "", - timeout = 4, - font = alsabar.notifications.font .. " " .. - alsabar.notifications.font_size, - fg = alsabar.notifications.color - } - - if alsabar._muted - then - preset.title = alsabar.channel .. " - Muted" - else - preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%" - end - - int = math.modf(alsabar._current_level * alsabar.notifications.bar_size) - preset.text = "[" + alsabar.update() + + local preset = { + title = "", + text = "", + timeout = 4, + font = alsabar.notifications.font .. " " .. + alsabar.notifications.font_size, + fg = alsabar.notifications.color + } + + if alsabar._muted + then + preset.title = alsabar.channel .. " - Muted" + else + preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%" + end + + int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size) + preset.text = "[" .. string.rep("|", int) .. string.rep(" ", alsabar.notifications.bar_size - int) .. "]" - if alsabar._notify ~= nil then - alsabar._notify = naughty.notify ({ - replaces_id = alsabar._notify.id, - preset = preset - }) - else - alsabar._notify = naughty.notify ({ - preset = preset - }) - end + if alsabar._notify ~= nil then + alsabar._notify = naughty.notify ({ + replaces_id = alsabar._notify.id, + preset = preset, + }) + else + alsabar._notify = naughty.notify ({ + preset = preset, + }) + end 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 + local ticks = args.ticks or false local ticks_size = args.ticks_size or 7 local vertical = args.vertical or false @@ -112,13 +109,12 @@ local function worker(args) alsabar.bar:set_height(height) alsabar.bar:set_ticks(ticks) alsabar.bar:set_ticks_size(ticks_size) - - if vertical then alsabar.bar:set_vertical(true) end + alsabar.bar:set_vertical(vertical) function alsabar.update() -- Get mixer control contents - local f = io.popen("amixer get " .. alsabar.channel) - local mixer = f:read("*all") + local f = io.popen("amixer -M get " .. alsabar.channel) + local mixer = f:read("*a") f:close() -- Capture mixer control state: [5%] ... ... [on] @@ -129,8 +125,8 @@ local function worker(args) mute = "off" end - alsabar._current_level = tonumber(volu) / 100 - alsabar.bar:set_value(alsabar._current_level) + alsabar._current_level = tonumber(volu) + alsabar.bar:set_value(alsabar._current_level / 100) if not mute and tonumber(volu) == 0 or mute == "off" then @@ -142,6 +138,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)