X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/be69daf9644b137784789878f91b2479c09afc69..71ca1bd76739f5d4f11cc065f2943f1cb87627ab:/widget/alsabar.lua?ds=sidebyside

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 9601f09..b2f7b44 100644
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -6,15 +6,14 @@
 
 --]]
 
-local helpers        = require("lain.helpers")
-local awful          = require("awful")
-local naughty        = require("naughty")
-local wibox          = require("wibox")
-local math           = { modf   = math.modf }
-local string         = { format = string.format,
-                         match  = string.match,
-                         rep    = string.rep }
-local type, tonumber = type, tonumber
+local helpers  = require("lain.helpers")
+local awful    = require("awful")
+local naughty  = require("naughty")
+local wibox    = require("wibox")
+local math     = math
+local string   = string
+local type     = type
+local tonumber = tonumber
 
 -- ALSA volume bar
 -- lain.widget.alsabar
@@ -40,7 +39,10 @@ local function factory(args)
     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%'
+    local tick       = args.tick or "|"
+    local tick_pre   = args.tick_pre or "["
+    local tick_post  = args.tick_post or "]"
+    local tick_none  = args.tick_none or " "
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
@@ -50,27 +52,23 @@ local function factory(args)
     alsabar.notification_preset = args.notification_preset
 
     if not alsabar.notification_preset then
-        alsabar.notification_preset      = {}
-        alsabar.notification_preset.font = "Monospace 10"
+        alsabar.notification_preset = { font = "Monospace 10" }
     end
 
-    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)
+    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
 
     if alsabar.togglechannel then
-        format_get_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        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 {
-        forced_height    = height,
-        forced_width     = width,
         color            = alsabar.colors.unmute,
         background_color = alsabar.colors.background,
+        forced_height    = height,
+        forced_width     = width,
         margins          = margins,
-        paddings         = paddings,
+        paddings         = margins,
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar
@@ -79,7 +77,7 @@ local function factory(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)
-        helpers.async(format_get_cmd, function(mixer)
+        helpers.async(format_cmd, function(mixer)
             local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
             if not vol or not playback then return end
@@ -120,22 +118,32 @@ local function factory(args)
             end
 
             -- 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
+            local tot = alsabar.notification_preset.max_ticks
+
+            if not tot then
+                local wib = awful.screen.focused().mywibox
+                -- 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
+                -- fallback: default horizontal wibox height
                 else
-                    tot = wib.height
+                    tot = 20
                 end
             end
 
             int = math.modf((alsabar._current_level / 100) * tot)
-            preset.text = string.format("[%s%s]", string.rep("|", int),
-                          string.rep(" ", tot - int))
+            preset.text = string.format(
+                "%s%s%s%s",
+                tick_pre,
+                string.rep(tick, int),
+                string.rep(tick_none, tot - int),
+                tick_post
+            )
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 
@@ -152,14 +160,6 @@ 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