X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8f948b52ebd1ce35a20bf43708444a2bc01ad673..be69daf9644b137784789878f91b2479c09afc69:/widget/alsabar.lua

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 2ad0210..9601f09 100644
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -1,10 +1,9 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-      * (c) 2013, Rman                            
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+      * (c) 2013, Rman
+
 --]]
 
 local helpers        = require("lain.helpers")
@@ -29,7 +28,7 @@ local function factory(args)
         },
 
         _current_level = 0,
-        _muted         = false
+        _playback      = "off"
     }
 
     local args       = args or {}
@@ -37,8 +36,11 @@ local function factory(args)
     local settings   = args.settings or function() end
     local width      = args.width or 63
     local height     = args.height or 1
+    local margins    = args.margins or 1
+    local paddings   = args.paddings or 1
     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7
+    local step       = args.step or '5%'
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
@@ -52,10 +54,13 @@ local function factory(args)
         alsabar.notification_preset.font = "Monospace 10"
     end
 
-    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+    local format_get_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+    local format_inc_cmd = string.format("%s sset %s %s+", alsabar.cmd, alsabar.channel, step)
+    local format_dec_cmd = string.format("%s sset %s %s-" , alsabar.cmd, alsabar.channel, step)
+    local format_tog_cmd = string.format("%s sset %s toggle", alsabar.cmd, alsabar.channel)
 
     if alsabar.togglechannel then
-        format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        format_get_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
         alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
     end
 
@@ -64,8 +69,8 @@ local function factory(args)
         forced_width     = width,
         color            = alsabar.colors.unmute,
         background_color = alsabar.colors.background,
-        margins          = 1,
-        paddings         = 1,
+        margins          = margins,
+        paddings         = paddings,
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar
@@ -74,24 +79,28 @@ local function factory(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     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
+        helpers.async(format_get_cmd, function(mixer)
+            local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+
+            if not vol or not playback then return end
+
+            if vol ~= alsabar._current_level or playback ~= alsabar._playback then
+                alsabar._current_level = tonumber(vol)
                 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]")
+                if alsabar._current_level == 0 or playback == "off" then
+                    alsabar._playback = playback
+                    alsabar.tooltip:set_text("[Muted]")
                     alsabar.bar.color = alsabar.colors.mute
                 else
-                    alsabar._muted = false
-                    alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
+                    alsabar._playback = "on"
+                    alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, vol))
                     alsabar.bar.color = alsabar.colors.unmute
                 end
 
-                volume_now = {}
-                volume_now.level = tonumber(volu)
-                volume_now.status = mute
+                volume_now = {
+                    level  = alsabar._current_level,
+                    status = alsabar._playback
+                }
 
                 settings()
 
@@ -104,15 +113,29 @@ local function factory(args)
         alsabar.update(function()
             local preset = alsabar.notification_preset
 
-            if alsabar._muted then
-                preset.title = string.format("%s - Muted", alsabar.channel)
-            else
-                preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+            preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+
+            if alsabar._playback == "off" then
+                preset.title = preset.title .. " Muted"
             end
 
-            int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
+            -- tot is the maximum number of ticks to display in the notification
+            -- fallback: default horizontal wibox height
+            local wib, tot = awful.screen.focused().mywibox, 20
+
+            -- if we can grab mywibox, tot is defined as its height if
+            -- horizontal, or width otherwise
+            if wib then
+                if wib.position == "left" or wib.position == "right" then
+                    tot = wib.width
+                else
+                    tot = wib.height
+                end
+            end
+
+            int = math.modf((alsabar._current_level / 100) * tot)
             preset.text = string.format("[%s%s]", string.rep("|", int),
-                          string.rep(" ", awful.screen.focused().mywibox.height - int))
+                          string.rep(" ", tot - int))
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 
@@ -129,6 +152,14 @@ local function factory(args)
 
     helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 
+    alsabar.bar:connect_signal("button::press", function(_,_,_,button)
+    if (button == 4)     then awful.spawn(format_inc_cmd)
+    elseif (button == 5) then awful.spawn(format_dec_cmd)
+    elseif (button == 1) then awful.spawn(format_tog_cmd)
+    end
+    alsabar.update()
+end)
+
     return alsabar
 end