X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/19b510cfc4ab3843f974aa494c58a477bb8ce508..87b323bd06e0d7e4f6e4eca3dee9990d3662b7c5:/widgets/alsabar.lua?ds=inline

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index b7c66b7..cdbefd2 100644
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -13,9 +13,9 @@ local read_pipe    = require("lain.helpers").read_pipe
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
+local wibox        = require("wibox")
 
 local math         = { modf   = math.modf }
-local mouse        = mouse
 local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }
@@ -36,13 +36,12 @@ local alsabar = {
     },
 
     terminal = terminal or "xterm",
-    mixer    = terminal .. " -e alsamixer",
+    mixer    = string.format("%s -e alsamixer", terminal),
 
     notifications = {
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,
-        bar_size  = 18,
         screen    = 1
     },
 
@@ -58,26 +57,24 @@ function alsabar.notify()
         text    = "",
         timeout = 5,
         screen  = alsabar.notifications.screen,
-        font    = alsabar.notifications.font .. " " ..
-                  alsabar.notifications.font_size,
+        font    = string.format("%s %s", alsabar.notifications.font,
+                  alsabar.notifications.font_size),
         fg      = alsabar.notifications.color
     }
 
     if alsabar._muted
     then
-        preset.title = alsabar.channel .. " - Muted"
+        preset.title = string.format("%s - Muted", alsabar.channel)
     else
-        preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
+        preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
     end
 
-    int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
-    preset.text = "["
-                .. string.rep("|", int)
-                .. string.rep(" ", alsabar.notifications.bar_size - int)
-                .. "]"
+    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))
 
-    if alsabar.followmouse then
-        preset.screen = mouse.screen
+    if alsabar.followtag then
+        preset.screen = awful.screen.focused()
     end
 
     if alsabar._notify ~= nil then
@@ -93,14 +90,14 @@ function alsabar.notify()
 end
 
 local function worker(args)
-    local args       = args or {}
-    local timeout    = args.timeout or 5
-    local settings   = args.settings or function() end
-    local width      = args.width or 63
-    local height     = args.heigth or 1
-    local ticks      = args.ticks or false
-    local ticks_size = args.ticks_size or 7
-    local vertical   = args.vertical or false
+    local args         = args or {}
+    local timeout      = args.timeout or 5
+    local settings     = args.settings or function() end
+    local width        = args.width or 63
+    local height       = args.heigth or 1
+    local ticks        = args.ticks or false
+    local ticks_size   = args.ticks_size or 7
+    local vertical     = args.vertical or false
 
     alsabar.cmd           = args.cmd or "amixer"
     alsabar.channel       = args.channel or alsabar.channel
@@ -108,18 +105,22 @@ local function worker(args)
     alsabar.step          = args.step or alsabar.step
     alsabar.colors        = args.colors or alsabar.colors
     alsabar.notifications = args.notifications or alsabar.notifications
-    alsabar.followmouse   = args.followmouse or false
-
-    alsabar.bar = awful.widget.progressbar()
+    alsabar.followtag     = args.followtag or false
+
+    alsabar.bar = wibox.widget {
+        forced_height    = height,
+        forced_width     = width,
+        color            = alsabar.colors.unmute,
+        background_color = alsabar.colors.background,
+        margins          = 1,
+        paddings         = 1,
+        ticks            = ticks,
+        ticks_size       = ticks_size,
+        widget           = wibox.widget.progressbar,
+        layout           = vertical and wibox.container.rotate
+    }
 
-    alsabar.bar:set_background_color(alsabar.colors.background)
-    alsabar.bar:set_color(alsabar.colors.unmute)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
-    alsabar.bar:set_width(width)
-    alsabar.bar:set_height(height)
-    alsabar.bar:set_ticks(ticks)
-    alsabar.bar:set_ticks_size(ticks_size)
-    alsabar.bar:set_vertical(vertical)
 
     function alsabar.update()
         -- Get mixer control contents
@@ -135,39 +136,44 @@ local function worker(args)
 
         if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
         then
-            alsabar._current_level = tonumber(volu)
+            alsabar._current_level = tonumber(volu) or alsabar._current_level
             alsabar.bar:set_value(alsabar._current_level / 100)
-            if not mute and tonumber(volu) == 0 or mute == "off"
+            if (not mute and tonumber(volu) == 0) or mute == "off"
             then
                 alsabar._muted = true
-                alsabar.tooltip:set_text (" [Muted] ")
-                alsabar.bar:set_color(alsabar.colors.mute)
+                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.bar:set_color(alsabar.colors.unmute)
+                alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
+                alsabar.bar.color = alsabar.colors.unmute
             end
 
             volume_now = {}
             volume_now.level = tonumber(volu)
             volume_now.status = mute
+
             settings()
         end
     end
 
-    alsabar.bar:buttons (awful.util.table.join (
-          awful.button ({}, 1, function()
+    alsabar.bar:buttons(awful.util.table.join (
+          awful.button({}, 1, function()
             awful.util.spawn(alsabar.mixer)
           end),
-          awful.button ({}, 3, function()
-            awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.channel))
+          awful.button({}, 2, function()
+						awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
+            alsabar.update()
+          end),
+          awful.button({}, 3, function()
+            awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.togglechannel or alsabar.channel))
             alsabar.update()
           end),
-          awful.button ({}, 4, function()
+          awful.button({}, 4, function()
             awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end),
-          awful.button ({}, 5, function()
+          awful.button({}, 5, function()
             awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end)