]> 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:

wiki updated
[etc/awesome.git] / widgets / alsabar.lua
index 4ae12e563bf170fb9c38dab9f39e49e5e63ee139..5a54829be77b6f33cc15a2400d345576e4ca8ba4 100644 (file)
@@ -8,12 +8,13 @@
 --]]
 
 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 wibox        = require("wibox")
 
-local io           = { popen  = io.popen }
 local math         = { modf   = math.modf }
 local string       = { format = string.format,
                        match  = string.match,
@@ -24,153 +25,164 @@ local setmetatable = setmetatable
 
 -- ALSA volume bar
 -- lain.widgets.alsabar
-local alsabar =
-{
-  channel = "Master",
-  step    = "5%",
-
-  colors =
-  {
-     background = beautiful.bg_normal,
-     mute       = "#EB8F8F",
-     unmute     = "#A4CE8A"
-  },
-
-  terminal = terminal or "xterm",
-  mixer    = terminal .. " -e alsamixer",
-
-  notifications =
-  {
-     font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
-     font_size = "11",
-     color     = beautiful.fg_normal,
-     bar_size  = 18
-  },
-
-  _current_level = 0,
-  _muted         = false
+local alsabar = {
+    channel = "Master",
+    step    = "1%",
+
+    colors = {
+        background = beautiful.bg_normal,
+        mute       = "#EB8F8F",
+        unmute     = "#A4CE8A"
+    },
+
+    terminal = terminal or "xterm",
+    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,
+        screen    = 1
+    },
+
+    _current_level = 0,
+    _muted         = false
 }
 
 function alsabar.notify()
-  alsabar.update()
-
-    local preset =
-    {
-      title   = "",
-      text    = "",
-      timeout = 4,
-      font    = alsabar.notifications.font .. " " ..
-                alsabar.notifications.font_size,
-      fg      = alsabar.notifications.color
+    alsabar.update()
+
+    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
     }
 
     if alsabar._muted
-  then
-        preset.title = alsabar.channel .. " - Muted"
+    then
+        preset.title = string.format("%s - Muted", alsabar.channel)
     else
-        preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
+        preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
     end
 
-  int = math.modf(alsabar._current_level * 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._notify ~= nil then
+    if alsabar.followtag then
+        preset.screen = awful.screen.focused()
+    end
+
+    if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
-        replaces_id = alsabar._notify.id,
-        preset      = preset,
-        screen = client.focus and client.focus.screen or 1
-    })
+            replaces_id = alsabar._notify.id,
+            preset      = preset,
+        })
     else
         alsabar._notify = naughty.notify ({
-        preset = preset,
-        screen = client.focus and client.focus.screen or 1
-    })
+            preset = preset,
+        })
     end
 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.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.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.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
-        local f = io.popen("amixer get " .. alsabar.channel)
-        local mixer = f:read("*all")
-        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]*)")
 
-        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
 
-        alsabar._current_level = tonumber(volu) / 100
-        alsabar.bar:set_value(alsabar._current_level)
-
-        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
-            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
-
-        volume_now = {}
-        volume_now.level = tonumber(volu)
-        volume_now.status = mute
-        settings()
     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.button ({}, 3, function()
-            awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel))
+          awful.button({}, 2, function()
+                                               awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
+            pulsebar.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.util.spawn(string.format("amixer set %s %s+", 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),
-          awful.button ({}, 5, function()
-            awful.util.spawn(string.format("amixer set %s %s-", 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)
     ))
 
+    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
+
+    newtimer(timer_id, timeout, alsabar.update)
+
     return alsabar
 end