Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3'

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

diff --git a/.config/awesome/lain/widget/alsabar.lua b/.config/awesome/lain/widget/alsabar.lua
index 2ad021048a82880e6e79717ce38f2384ff05aab4..b2f7b44ec6e84987d5d7216136abb5522254ada7 100644 (file)
--- a/.config/awesome/lain/widget/alsabar.lua
+++ b/.config/awesome/lain/widget/alsabar.lua
@@ -1,21 +1,19 @@
-
 --[[
-                                                  
-     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")
-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
@@ -29,7 +27,7 @@ local function factory(args)
         },
 
         _current_level = 0,
-        _muted         = false
+        _playback      = "off"
     }
 
     local args       = args or {}
@@ -37,8 +35,14 @@ 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 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"
@@ -48,8 +52,7 @@ 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_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
@@ -60,12 +63,12 @@ local function factory(args)
     end
 
     alsabar.bar = wibox.widget {
-        forced_height    = height,
-        forced_width     = width,
         color            = alsabar.colors.unmute,
         background_color = alsabar.colors.background,
-        margins          = 1,
-        paddings         = 1,
+        forced_height    = height,
+        forced_width     = width,
+        margins          = margins,
+        paddings         = margins,
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar
@@ -75,23 +78,27 @@ local function factory(args)
 
     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
+            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 +111,39 @@ 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
+
+            -- tot is the maximum number of ticks to display in the notification
+            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 = 20
+                end
             end
 
-            int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
-            preset.text = string.format("[%s%s]", string.rep("|", int),
-                          string.rep(" ", awful.screen.focused().mywibox.height - int))
+            int = math.modf((alsabar._current_level / 100) * tot)
+            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