apply #439 to alsabar as well

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

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index ea78ec5611b1b4eab4f308263b4f38bde4042412..b2f7b44ec6e84987d5d7216136abb5522254ada7 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -6,12 +6,14 @@
 
 --]]
 
 
 --]]
 

-local helpers = require("lain.helpers")
-local awful   = require("awful")
-local naughty = require("naughty")
-local wibox   = require("wibox")
-
-local math, string, type, tonumber = math, string, 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
 
 -- ALSA volume bar
 -- lain.widget.alsabar


@@ -37,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"


@@ -46,8 +52,7 @@ local function factory(args)
     alsabar.notification_preset = args.notification_preset
 
     if not alsabar.notification_preset then
     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_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
     end
 
     local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)


@@ -113,22 +118,32 @@ local function factory(args)
             end
 
             -- tot is the maximum number of ticks to display in the notification
             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
                 else

-                    tot = wib.height
+                    tot = 20

                 end
             end
 
             int = math.modf((alsabar._current_level / 100) * tot)
                 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
 
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end