#293: eradicate proxy widget

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 9fe5339da8f14d5caac645f397775fba66c96d06..628e8386fd527ccec7729cd9d08943116a7ddac4 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -8,59 +8,58 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-

 local awful        = require("awful")
 local awful        = require("awful")

-local beautiful    = require("beautiful")

 local naughty      = require("naughty")
 local wibox        = require("wibox")
 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 math         = { modf   = math.modf }
 local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }

+local type         = type

 local tonumber     = tonumber
 local tonumber     = tonumber

-

 local setmetatable = setmetatable
 
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
 local setmetatable = setmetatable
 
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {

-    channel = "Master",
-    step    = "1%",
-

     colors = {
     colors = {

-        background = beautiful.bg_normal,
+        background = "#000000",

         mute       = "#EB8F8F",
         unmute     = "#A4CE8A"
     },
 
         mute       = "#EB8F8F",
         unmute     = "#A4CE8A"
     },
 

-    notifications = {
-        font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
-        font_size = "11",
-        color     = beautiful.fg_normal,
-        screen    = 1
-    },
-

     _current_level = 0,
     _muted         = false
 }
 
 local function worker(args)
     _current_level = 0,
     _muted         = false
 }
 
 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
-
-    alsabar.cmd           = args.cmd or "amixer"
-    alsabar.channel       = args.channel or alsabar.channel
-    alsabar.step          = args.step or alsabar.step
-    alsabar.colors        = args.colors or alsabar.colors
-    alsabar.notifications = args.notifications or alsabar.notifications
-    alsabar.followtag     = args.followtag 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.height 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 "Master"
+    alsabar.togglechannel       = args.togglechannel
+    alsabar.colors              = args.colors or alsabar.colors
+    alsabar.followtag           = args.followtag or false
+    alsabar.notification_preset = args.notification_preset
+
+    if not alsabar.notification_preset then
+        alsabar.notification_preset      = {}
+        alsabar.notification_preset.font = "Monospace 10"
+    end
+
+    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+
+    if alsabar.togglechannel then
+        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,
 
     alsabar.bar = wibox.widget {
         forced_height    = height,


@@ -78,14 +77,12 @@ local function worker(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)

-        helpers.async(alsabar.cmd, function(mixer)
+        helpers.async(format_cmd, function(mixer)

             local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
             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
+            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
                 alsabar.bar:set_value(alsabar._current_level / 100)
                 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"
-                then
+                if (not mute and tonumber(volu) == 0) or mute == "off" then

                     alsabar._muted = true
                     alsabar.tooltip:set_text ("[Muted]")
                     alsabar.bar.color = alsabar.colors.mute
                     alsabar._muted = true
                     alsabar.tooltip:set_text ("[Muted]")
                     alsabar.bar.color = alsabar.colors.mute


@@ -101,22 +98,14 @@ local function worker(args)
 
                 settings()
 
 
                 settings()
 

-                if callback then callback() end
+                if type(callback) == "function" then callback() end

             end
         end)
     end
 
     function alsabar.notify()
         alsabar.update(function()
             end
         end)
     end
 
     function alsabar.notify()
         alsabar.update(function()

-            local preset = {
-                title   = "",
-                text    = "",
-                timeout = 5,
-                screen  = alsabar.notifications.screen,
-                font    = string.format("%s %s", alsabar.notifications.font,
-                          alsabar.notifications.font_size),
-                fg      = alsabar.notifications.color
-            }
+            local preset = alsabar.notification_preset

 
             if alsabar._muted then
                 preset.title = string.format("%s - Muted", alsabar.channel)
 
             if alsabar._muted then
                 preset.title = string.format("%s - Muted", alsabar.channel)


@@ -130,19 +119,18 @@ local function worker(args)
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 

-            if alsabar._notify then
-                alsabar._notify = naughty.notify ({
-                    replaces_id = alsabar._notify.id,
-                    preset      = preset,
-                })
+            if not alsabar.notification then
+                alsabar.notification = naughty.notify {
+                    preset  = preset,
+                    destroy = function() alsabar.notification = nil end
+                }

             else
             else

-                alsabar._notify = naughty.notify ({ preset = preset })
+                naughty.replace_text(alsabar.notification, preset.title, preset.text)

             end
         end)
     end
 
             end
         end)
     end
 

-    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
-    helpers.newtimer(timer_id, timeout, alsabar.update)
+    helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)

 
     return alsabar
 end
 
     return alsabar
 end