pull #239; better implementation

[etc/awesome.git] / widgets / alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index b7c66b7798365daf1e89ca63dab0f922467da3a1..b20bc4025b1287712bb1929e182aa7e7ebb2481f 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -135,7 +135,7 @@ local function worker(args)
 
         if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
         then
-            alsabar._current_level = tonumber(volu)
+            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
@@ -155,19 +155,23 @@ local function worker(args)
         end
     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.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.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.button({}, 5, function()
             awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end)