X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ba91548161e39d383fe909a7d10ee56d2a5e5183..312947f46eea9273279e1be9f1b80a1d66cc545a:/widgets/alsabar.lua?ds=inline diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 3ade35c..219ad96 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -1,67 +1,62 @@ + --[[ - Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - * (c) 2013, Rman + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2013, Rman + --]] local helpers = require("lain.helpers") local awful = require("awful") -local beautiful = require("beautiful") local naughty = require("naughty") local wibox = require("wibox") local math = { modf = math.modf } local string = { format = string.format, match = string.match, rep = string.rep } -local tonumber = tonumber local type = type +local tonumber = tonumber local setmetatable = setmetatable -local terminal = "urxvtc" or "xterm" -- ALSA volume bar -- lain.widgets.alsabar local alsabar = { - channel = "Master", - step = "1%", - mixer = "amixer", - colors = { - background = beautiful.bg_normal, + background = "#000000", mute = "#EB8F8F", unmute = "#A4CE8A" }, - notifications = { - font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")), - font_size = "11", - color = beautiful.fg_normal, - screen = 1 - }, - _current_level = 0, _muted = false } local function worker(args) - 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.height or 1 - local ticks = args.ticks or false - local ticks_size = args.ticks_size or 7 - local vertical = args.vertical or false - - alsabar.mixer = args.mixer or alsabar.mixer - alsabar.channel = args.channel or alsabar.channel - alsabar.togglechannel = args.togglechannel or alsabar.togglechannel - alsabar.cmd = args.cmd or {"bash", "-c", string.format("%s get %s", alsabar.mixer, alsabar.channel)} - alsabar.step = args.step or alsabar.step - alsabar.colors = args.colors or alsabar.colors - alsabar.notifications = args.notifications or alsabar.notifications - alsabar.followtag = args.followtag 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.height or 1 + local ticks = args.ticks or false + local ticks_size = args.ticks_size or 7 + local vertical = args.vertical or false + + alsabar.cmd = args.cmd or "amixer" + alsabar.channel = args.channel or "Master" + alsabar.togglechannel = args.togglechannel + alsabar.colors = args.colors or alsabar.colors + alsabar.followtag = args.followtag or false + alsabar.notification_preset = args.notification_preset + + if not alsabar.notification_preset then + alsabar.notification_preset = naughty.config.defaults + alsabar.notification_preset.font = "Monospace 11" + end + if alsabar.togglechannel then - alsabar.cmd = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)} + alsabar.cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s", + alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) } end alsabar.bar = wibox.widget { @@ -77,38 +72,15 @@ local function worker(args) layout = vertical and wibox.container.rotate } - alsabar.bar:buttons (awful.util.table.join( - awful.button({}, 1, function() - awful.spawn(string.format('%s -e alsamixer', terminal)) - end), - awful.button({}, 2, function() - awful.spawn(string.format("%s set %s 100%%", alsabar.mixer, alsabar.channel)) - alsabar.update() - end), - awful.button({}, 3, function() - awful.spawn(string.format("%s set %s toggle", alsabar.mixer, alsabar.togglechannel or alsabar.channel)) - alsabar.update() - end), - awful.button({}, 4, function() - awful.spawn(string.format("%s set %s %s+", alsabar.mixer, alsabar.channel, alsabar.step)) - alsabar.update() - end), - awful.button({}, 5, function() - awful.spawn(string.format("%s set %s %s-", alsabar.mixer, alsabar.channel, alsabar.step)) - alsabar.update() - end))) - alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) function alsabar.update(callback) helpers.async(alsabar.cmd, function(mixer) local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") - if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) - then + if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) then alsabar._current_level = tonumber(volu) or alsabar._current_level alsabar.bar:set_value(alsabar._current_level / 100) - if (not mute and tonumber(volu) == 0) or mute == "off" - then + if (not mute and tonumber(volu) == 0) or mute == "off" then alsabar._muted = true alsabar.tooltip:set_text ("[Muted]") alsabar.bar.color = alsabar.colors.mute @@ -131,15 +103,7 @@ local function worker(args) function alsabar.notify() alsabar.update(function() - local preset = { - title = "", - text = "", - timeout = 5, - screen = alsabar.notifications.screen, - font = string.format("%s %s", alsabar.notifications.font, - alsabar.notifications.font_size), - fg = alsabar.notifications.color - } + local preset = alsabar.notification_preset if alsabar._muted then preset.title = string.format("%s - Muted", alsabar.channel) @@ -153,18 +117,15 @@ local function worker(args) if alsabar.followtag then preset.screen = awful.screen.focused() end - if alsabar._notify then - alsabar._notify = naughty.notify ({ - replaces_id = alsabar._notify.id, - preset = preset, - }) - else - alsabar._notify = naughty.notify ({ preset = preset }) - end + alsabar.id = naughty.notify ({ + replaces_id = alsabar.id, + preset = preset + }).id end) end timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel) + helpers.newtimer(timer_id, timeout, alsabar.update) return alsabar