--[[
Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
+ * (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,
- gmatch = string.gmatch,
- rep = string.rep }
-local type, tonumber = type, tonumber
-
--- Pulseaudio volume bar
+local helpers = require("lain.helpers")
+local awful = require("awful")
+local naughty = require("naughty")
+local wibox = require("wibox")
+
+local math, string, type, tonumber = math, string, type, tonumber
+
+-- PulseAudio volume bar
-- lain.widget.pulsebar
local function factory(args)
_current_level = 0,
_mute = "no",
+ device = "N/A"
}
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 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 scallback = args.scallback
- pulsebar.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
- pulsebar.sink = args.sink or 0
pulsebar.colors = args.colors or pulsebar.colors
pulsebar.followtag = args.followtag or false
pulsebar.notification_preset = args.notification_preset
- pulsebar.device = "N/A"
+ pulsebar.devicetype = args.devicetype or "sink"
+ pulsebar.cmd = args.cmd or "pacmd list-" .. pulsebar.devicetype .. "s | sed -n -e '/*/,$!d' -e '/index/p' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
if not pulsebar.notification_preset then
- pulsebar.notification_preset = {}
- pulsebar.notification_preset.font = "Monospace 10"
+ pulsebar.notification_preset = {
+ font = "Monospace 10"
+ }
end
pulsebar.bar = wibox.widget {
- forced_height = height,
- forced_width = width,
color = pulsebar.colors.unmute,
background_color = pulsebar.colors.background,
- margins = 1,
- paddings = 1,
+ forced_height = height,
+ forced_width = width,
+ margins = margins,
+ paddings = paddings,
ticks = ticks,
ticks_size = ticks_size,
widget = wibox.widget.progressbar,
pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
function pulsebar.update(callback)
- if scallback then pulsebar.cmd = scallback() end
-
- helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
+ helpers.async({ awful.util.shell, "-c", type(pulsebar.cmd) == "string" and pulsebar.cmd or pulsebar.cmd() },
+ function(s)
volume_now = {
- index = string.match(s, "index: (%S+)") or "N/A",
- sink = string.match(s, "device.string = \"(%S+)\"") or "N/A",
- muted = string.match(s, "muted: (%S+)") or "N/A"
+ index = string.match(s, "index: (%S+)") or "N/A",
+ device = string.match(s, "device.string = \"(%S+)\"") or "N/A",
+ muted = string.match(s, "muted: (%S+)") or "N/A"
}
pulsebar.device = volume_now.index
pulsebar.bar:set_value(pulsebar._current_level / 100)
if pulsebar._current_level == 0 or mute == "yes" then
pulsebar._mute = mute
- pulsebar.tooltip:set_text ("[Muted]")
+ pulsebar.tooltip:set_text ("[muted]")
pulsebar.bar.color = pulsebar.colors.mute
else
pulsebar._mute = "no"
- pulsebar.tooltip:set_text(string.format("%s: %s", pulsebar.sink, volu))
+ pulsebar.tooltip:set_text(string.format("%s %s: %s", pulsebar.devicetype, pulsebar.device, volu))
pulsebar.bar.color = pulsebar.colors.unmute
end
pulsebar.update(function()
local preset = pulsebar.notification_preset
- preset.title = string.format("Sink %s - %s%%", pulsebar.sink, pulsebar._current_level)
+ preset.title = string.format("%s %s - %s%%", pulsebar.devicetype, pulsebar.device, pulsebar._current_level)
if pulsebar._mute == "yes" then
- preset.title = preset.title .. " Muted"
+ preset.title = preset.title .. " muted"
+ end
+
+ -- tot is the maximum number of ticks to display in the notification
+ -- fallback: default horizontal wibox height
+ local wib, tot = awful.screen.focused().mywibox, 20
+
+ -- 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
end
- int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height)
+ int = math.modf((pulsebar._current_level / 100) * tot)
preset.text = string.format("[%s%s]", string.rep("|", int),
- string.rep(" ", awful.screen.focused().mywibox.height - int))
+ string.rep(" ", tot - int))
if pulsebar.followtag then preset.screen = awful.screen.focused() end
projects / etc / awesome.git / blobdiff