X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b92942b0e07f4491cf5d96fecee94b1e82675e52..c7000b78cf6087308bcd8624cb03febaac0b3d29:/widgets/alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 2639aa4..b20bc40 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 }
@@ -25,9 +26,8 @@ local setmetatable = setmetatable
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
-    card    = "0",
     channel = "Master",
-    step    = "2%",
+    step    = "1%",
 
     colors = {
         background = beautiful.bg_normal,
@@ -56,7 +56,7 @@ function alsabar.notify()
     local preset = {
         title   = "",
         text    = "",
-        timeout = 4,
+        timeout = 5,
         screen  = alsabar.notifications.screen,
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
@@ -76,6 +76,10 @@ function alsabar.notify()
                 .. string.rep(" ", alsabar.notifications.bar_size - int)
                 .. "]"
 
+    if alsabar.followmouse then
+        preset.screen = mouse.screen
+    end
+
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
@@ -90,7 +94,7 @@ end
 
 local function worker(args)
     local args       = args or {}
-    local timeout    = args.timeout or 4
+    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
@@ -100,9 +104,11 @@ local function worker(args)
 
     alsabar.cmd           = args.cmd or "amixer"
     alsabar.channel       = args.channel or alsabar.channel
+    alsabar.togglechannel = args.togglechannel
     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()
 
@@ -117,58 +123,63 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
-        local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))
-        local mixer = f:read("*a")
-        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]*)")
 
-        if volu == nil then
-            volu = 0
-            mute = "off"
+        -- HDMIs can have a channel different from Master for toggling mute
+        if alsabar.togglechannel then
+            mute = string.match(read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.togglechannel)), "%[(%a+)%]")
         end
 
-        alsabar._current_level = tonumber(volu)
-        alsabar.bar:set_value(alsabar._current_level / 100)
-        if not mute and tonumber(volu) == 0 or mute == "off"
+        if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
         then
-            alsabar._muted = true
-            alsabar.tooltip:set_text (" [Muted] ")
-            alsabar.bar:set_color(alsabar.colors.mute)
-        else
-            alsabar._muted = false
-            alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
-            alsabar.bar:set_color(alsabar.colors.unmute)
+            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
+                alsabar._muted = true
+                alsabar.tooltip:set_text (" [Muted] ")
+                alsabar.bar:set_color(alsabar.colors.mute)
+            else
+                alsabar._muted = false
+                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
-
-        volume_now = {}
-        volume_now.level = tonumber(volu)
-        volume_now.status = mute
-        settings()
     end
 
-    alsabar.bar:buttons (awful.util.table.join (
-          awful.button ({}, 1, function()
+    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 -c %s set %s toggle", alsabar.card, alsabar.channel))
+          awful.button({}, 2, function()
+						awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
+            pulsebar.update()
+          end),
+          awful.button({}, 3, function()
+            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 -c %s set %s %s+", alsabar.card, alsabar.channel, alsabar.step))
+          awful.button({}, 4, function()
+            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 -c %s set %s %s-", alsabar.card, alsabar.channel, alsabar.step))
+          awful.button({}, 5, function()
+            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, alsa.update)
+    newtimer(timer_id, timeout, alsabar.update)
 
     return alsabar
 end