apply #439 to alsabar as well

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index b86c085aae1e7bf8df191932a883ee64c68665e8..b2f7b44ec6e84987d5d7216136abb5522254ada7 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -39,6 +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 paddings   = args.paddings or 1
     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7

+    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"
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"


@@ -133,8 +137,13 @@ local function factory(args)
             end
 
             int = math.modf((alsabar._current_level / 100) * tot)
             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
 
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 

diff --git a/wiki b/wiki
index e37a9eb41b37cccdd307b4e88d4fcdecb920dcaa..8b3ab9e38a9876cc2e29766c6ecafffbc1c6ff34 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e37a9eb41b37cccdd307b4e88d4fcdecb920dcaa
+Subproject commit 8b3ab9e38a9876cc2e29766c6ecafffbc1c6ff34