]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsabar.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
layout: fixed useless_gap retrieval
[etc/awesome.git] / widgets / alsabar.lua
diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index b12e55cbb88608eeed7ec20980efecfd5ebab77d..cdbefd26590dca83a7acc318f886782cf3285a14 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -8,12 +8,13 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
+local read_pipe    = require("lain.helpers").read_pipe
 
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
+local wibox        = require("wibox")
 
 
-local io           = { popen  = io.popen }
 local math         = { modf   = math.modf }
 local string       = { format = string.format,
                        match  = string.match,
 local math         = { modf   = math.modf }
 local string       = { format = string.format,
                        match  = string.match,
@@ -25,9 +26,8 @@ local setmetatable = setmetatable
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
-    card    = "0",
     channel = "Master",
     channel = "Master",
-    step    = "2%",
+    step    = "1%",
 
     colors = {
         background = beautiful.bg_normal,
 
     colors = {
         background = beautiful.bg_normal,
@@ -36,13 +36,12 @@ local alsabar = {
     },
 
     terminal = terminal or "xterm",
     },
 
     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,
 
     notifications = {
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,
-        bar_size  = 18,
         screen    = 1
     },
 
         screen    = 1
     },
 
@@ -56,25 +55,27 @@ function alsabar.notify()
     local preset = {
         title   = "",
         text    = "",
     local preset = {
         title   = "",
         text    = "",
-        timeout = 4,
+        timeout = 5,
         screen  = alsabar.notifications.screen,
         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
         fg      = alsabar.notifications.color
     }
 
     if alsabar._muted
     then
-        preset.title = alsabar.channel .. " - Muted"
+        preset.title = string.format("%s - Muted", alsabar.channel)
     else
     else
-        preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
+        preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
     end
 
     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.followtag then
+        preset.screen = awful.screen.focused()
+    end
 
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
 
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
@@ -89,85 +90,99 @@ function alsabar.notify()
 end
 
 local function worker(args)
 end
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 4
-    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.card = args.card or alsabar.card
-    alsabar.channel = args.channel or alsabar.channel
-    alsabar.step = args.step or alsabar.step
-    alsabar.colors = args.colors or alsabar.colors
+    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.togglechannel = args.togglechannel
+    alsabar.step          = args.step or alsabar.step
+    alsabar.colors        = args.colors or alsabar.colors
     alsabar.notifications = args.notifications or alsabar.notifications
     alsabar.notifications = args.notifications or alsabar.notifications
+    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 = awful.widget.progressbar()
-
-    alsabar.bar:set_background_color(alsabar.colors.background)
-    alsabar.bar:set_color(alsabar.colors.unmute)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
     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
 
     function alsabar.update()
         -- Get mixer control contents
-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel)))
-        local mixer = f:read("*a")
-        f:close()
+        local mixer = read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.channel))
 
         -- Capture mixer control state:          [5%] ... ... [on]
         local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
 
         -- Capture mixer control state:          [5%] ... ... [on]
         local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
-        if volu == nil then
-            volu = 0
-            mute = "off"
+        -- HDMIs can have a channel different from Master for toggling mute
+        if alsabar.togglechannel then
+            mute = string.match(read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.togglechannel)), "%[(%a+)%]")
         end
 
         end
 
-        alsabar._current_level = tonumber(volu)
-        alsabar.bar:set_value(alsabar._current_level / 100)
-        if not mute and tonumber(volu) == 0 or mute == "off"
+        if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
         then
         then
-            alsabar._muted = true
-            alsabar.tooltip:set_text (" [Muted] ")
-            alsabar.bar:set_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._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
+                alsabar._muted = true
+                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.color = alsabar.colors.unmute
+            end
+
+            volume_now = {}
+            volume_now.level = tonumber(volu)
+            volume_now.status = mute
+
+            settings()
         end
         end
-
-        volume_now = {}
-        volume_now.level = tonumber(volu)
-        volume_now.status = mute
-        settings()
     end
 
     end
 
-    newtimer("alsabar", timeout, alsabar.update)
-
-    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.util.spawn(alsabar.mixer)
           end),
-          awful.button ({}, 3, function()
-            awful.util.spawn(string.format("amixer -c %s set %s toggle", alsabar.card, 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),
             alsabar.update()
           end),
-          awful.button ({}, 4, function()
-            awful.util.spawn(string.format("amixer -c %s set %s %s+", alsabar.card, alsabar.channel, alsabar.step))
+          awful.button({}, 4, function()
+            awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end),
             alsabar.update()
           end),
-          awful.button ({}, 5, function()
-            awful.util.spawn(string.format("amixer -c %s set %s %s-", alsabar.card, alsabar.channel, alsabar.step))
+          awful.button({}, 5, function()
+            awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end)
     ))
 
             alsabar.update()
           end)
     ))
 
+    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
+
+    newtimer(timer_id, timeout, alsabar.update)
+
     return alsabar
 end
 
     return alsabar
 end
 
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.