util.markup: fixed typos

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

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index b253d4b3ed8d6754e8ce9e46350352acd09d9d58..9601f09242f5426ece53cb431714f7f6f08f92be 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -36,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"
@@ -51,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
 
@@ -63,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
@@ -73,7 +79,7 @@ local function factory(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)
-        helpers.async(format_cmd, function(mixer)
+        helpers.async(format_get_cmd, function(mixer)
             local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
             if not vol or not playback then return end
@@ -113,11 +119,18 @@ local function factory(args)
                 preset.title = preset.title .. " Muted"
             end
 
-            local wib = awful.screen.focused().mywibox
+            -- 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
 
-            local tot = wib.height
-            if wib.position == "left" or wib.position == "right" then
-                tot = wib.width
+            -- 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)
@@ -139,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