X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0180aa3bc348520c01479c40cdf6343e36ce3e59..bf3a9ba5efb874ad6370a3083afd409361e2912a:/widgets/alsabar.lua diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 6a03a10..628e838 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -15,6 +15,7 @@ local math = { modf = math.modf } local string = { format = string.format, match = string.match, rep = string.rep } +local type = type local tonumber = tonumber local setmetatable = setmetatable @@ -43,14 +44,21 @@ local function worker(args) 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._notify = args.notify or "on" alsabar.notification_preset = args.notification_preset if not alsabar.notification_preset then - alsabar.notification_preset = naughty.config.defaults - alsabar.notification_preset.font = "Monospace 11" + alsabar.notification_preset = {} + alsabar.notification_preset.font = "Monospace 10" + end + + local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel) + + if alsabar.togglechannel then + format_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 { @@ -68,8 +76,8 @@ local function worker(args) alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) - function alsabar.update() - helpers.async(alsabar.cmd, function(mixer) + function alsabar.update(callback) + helpers.async(format_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 alsabar._current_level = tonumber(volu) or alsabar._current_level @@ -89,6 +97,8 @@ local function worker(args) volume_now.status = mute settings() + + if type(callback) == "function" then callback() end end end) end @@ -109,16 +119,18 @@ local function worker(args) if alsabar.followtag then preset.screen = awful.screen.focused() end - alsabar.id = naughty.notify ({ - replaces_id = alsabar.id, - preset = preset - }).id + if not alsabar.notification then + alsabar.notification = naughty.notify { + preset = preset, + destroy = function() alsabar.notification = nil end + } + else + naughty.replace_text(alsabar.notification, preset.title, preset.text) + end end) end - timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel) - - helpers.newtimer(timer_id, timeout, alsabar.update) + helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update) return alsabar end