X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b3e4d796d0aa6e2f697aa61b6d89f5e754703d01..42070bba6e69b17cf6db4eae3456ff65a159924b:/widgets/alsabar.lua?ds=sidebyside diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 4ae12e5..c7498d2 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -8,13 +8,14 @@ --]] local newtimer = require("lain.helpers").newtimer +local read_pipe = require("lain.helpers").read_pipe local awful = require("awful") local beautiful = require("beautiful") local naughty = require("naughty") -local io = { popen = io.popen } local math = { modf = math.modf } +local mouse = mouse local string = { format = string.format, match = string.match, rep = string.rep } @@ -24,87 +25,89 @@ 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_normal, - bar_size = 18 - }, - - _current_level = 0, - _muted = false +local alsabar = { + channel = "Master", + step = "2%", + + 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, + screen = 1 + }, + + _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 + alsabar.update() + + local preset = { + title = "", + text = "", + timeout = 5, + screen = alsabar.notifications.screen, + font = alsabar.notifications.font .. " " .. + alsabar.notifications.font_size, + fg = alsabar.notifications.color } if alsabar._muted - then + then preset.title = alsabar.channel .. " - Muted" else - preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%" + preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%" end - int = math.modf(alsabar._current_level * alsabar.notifications.bar_size) - preset.text = "[" + 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 + if alsabar.followmouse then + preset.screen = mouse.screen + end + + if alsabar._notify ~= nil then alsabar._notify = naughty.notify ({ - replaces_id = alsabar._notify.id, - preset = preset, - screen = client.focus and client.focus.screen or 1 - }) + replaces_id = alsabar._notify.id, + preset = preset, + }) else alsabar._notify = naughty.notify ({ - preset = preset, - screen = client.focus and client.focus.screen or 1 - }) + 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 false + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local width = args.width or 63 + local height = args.heigth or 1 + local ticks = args.ticks or false local ticks_size = args.ticks_size or 7 - local vertical = args.vertical or false + local vertical = args.vertical or false - alsabar.channel = args.channel or alsabar.channel - alsabar.step = args.step or alsabar.step - alsabar.colors = args.colors or alsabar.colors + alsabar.cmd = args.cmd or "amixer" + alsabar.channel = args.channel or alsabar.channel + alsabar.step = args.step or alsabar.step + alsabar.colors = args.colors or alsabar.colors alsabar.notifications = args.notifications or alsabar.notifications + alsabar.followmouse = args.followmouse or false alsabar.bar = awful.widget.progressbar() @@ -119,9 +122,7 @@ local function worker(args) function alsabar.update() -- Get mixer control contents - local f = io.popen("amixer get " .. alsabar.channel) - local mixer = f:read("*all") - f:close() + local mixer = read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.channel)) -- Capture mixer control state: [5%] ... ... [on] local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") @@ -131,9 +132,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 alsabar._muted = true @@ -151,26 +151,28 @@ local function worker(args) settings() end - newtimer("alsabar", timeout, alsabar.update) - alsabar.bar:buttons (awful.util.table.join ( awful.button ({}, 1, function() awful.util.spawn(alsabar.mixer) end), awful.button ({}, 3, function() - awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel)) + awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.channel)) alsabar.update() end), awful.button ({}, 4, function() - awful.util.spawn(string.format("amixer set %s %s+", alsabar.channel, alsabar.step)) + awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step)) alsabar.update() end), awful.button ({}, 5, function() - awful.util.spawn(string.format("amixer set %s %s-", alsabar.channel, alsabar.step)) + awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step)) alsabar.update() end) )) + timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel) + + newtimer(timer_id, timeout, alsabar.update) + return alsabar end